find ESXM types via model rather than index

haarg · haarg · commit 2f5b7d1396fd · 2024-10-27T23:06:51.000+01:00
Rather than using the same index to find other types, find them via the
model. This means the types don't need to be in the same index.
diff --git a/lib/MetaCPAN/Document/Distribution.pm b/lib/MetaCPAN/Document/Distribution.pm
@@ -40,7 +40,7 @@ has river => (
 
 sub releases {
     my $self = shift;
-    return $self->index->type("release")
+    return $self->index->model->doc("release")
         ->query( { term => { "distribution" => $self->name } } );
 }
 
diff --git a/lib/MetaCPAN/Document/Release.pm b/lib/MetaCPAN/Document/Release.pm
@@ -278,7 +278,7 @@ sub _build_download_url {
 
 sub set_first {
     my $self     = shift;
-    my $is_first = $self->index->type('release')->query( {
+    my $is_first = $self->index->model->doc('release')->query( {
         bool => {
             must => [
                 { term => { distribution => $self->distribution } },
diff --git a/lib/MetaCPAN/Model/Release.pm b/lib/MetaCPAN/Model/Release.pm
@@ -84,7 +84,7 @@ has date => (
     },
 );
 
-has index => ( is => 'ro' );
+has model => ( is => 'ro' );
 
 has metadata => (
     is      => 'ro',
@@ -222,8 +222,7 @@ sub _build_document {
         || $document->{abstract} eq 'null' );
 
     $document
-        = $self->index->type('release')
-        ->put( $document, { refresh => true } );
+        = $self->model->doc('release')->put( $document, { refresh => true } );
 
     # create distribution if doesn't exist
     my $dist_count = $self->es->count(
@@ -232,7 +231,7 @@ sub _build_document {
         body  => { query => { term => { name => $self->distribution } } },
     );
     if ( !$dist_count->{count} ) {
-        $self->index->type('distribution')
+        $self->model->doc('distribution')
             ->put( { name => $self->distribution }, { create => 1 } );
     }
     return $document;
@@ -333,7 +332,7 @@ sub _build_files {
 
     my @files;
     log_debug { 'Indexing ', scalar @{ $self->archive->files }, ' files' };
-    my $file_set = $self->index->type('file');
+    my $file_set = $self->model->doc('file');
 
     my $extract_dir = $self->extract;
     File::Find::find(
diff --git a/lib/MetaCPAN/Model/User/Account.pm b/lib/MetaCPAN/Model/User/Account.pm
@@ -121,8 +121,8 @@ after add_identity => sub {
     my ( $self, $identity ) = @_;
     if ( $identity->{name} eq 'pause' ) {
         $self->clear_looks_human;
-        my $profile = $self->index->model->index('cpan')->type('author')
-            ->get( $identity->{key} );
+        my $profile
+            = $self->index->model->doc('author')->get( $identity->{key} );
 
         # Not every user is an author
         if ($profile) {
@@ -157,8 +157,7 @@ sub remove_identity {
     @$ids = grep { $_->{name} ne $identity } @$ids;
 
     if ( $identity eq 'pause' ) {
-        my $profile = $self->index->model->index('cpan')->type('author')
-            ->get( $id->{key} );
+        my $profile = $self->index->model->doc('author')->get( $id->{key} );
 
         if ( $profile && $profile->user eq $self->id ) {
             $profile->_clear_user;
diff --git a/lib/MetaCPAN/Script/First.pm b/lib/MetaCPAN/Script/First.pm
@@ -17,7 +17,7 @@ has distribution => (
 
 sub run {
     my $self          = shift;
-    my $distributions = $self->index->type("distribution");
+    my $distributions = $self->model->doc("distribution");
     $distributions
         = $distributions->query( { term => { name => $self->distribution } } )
         if $self->distribution;
diff --git a/lib/MetaCPAN/Script/Latest.pm b/lib/MetaCPAN/Script/Latest.pm
@@ -263,7 +263,7 @@ sub reindex {
     my ( $self, $bulk, $source, $status ) = @_;
 
     # Update the status on the release.
-    my $release = $self->index->type('release')->get( {
+    my $release = $self->model->doc('release')->get( {
         author => $source->{author},
         name   => $source->{release},
     } );
diff --git a/lib/MetaCPAN/Script/Mirrors.pm b/lib/MetaCPAN/Script/Mirrors.pm
@@ -20,7 +20,7 @@ sub index_mirrors {
     log_info { 'Getting mirrors.json file from ' . $self->cpan };
 
     my $json = $self->cpan->child( 'indices', 'mirrors.json' )->slurp;
-    my $type = $self->index->type('mirror');
+    my $type = $self->model->doc('mirror');
 
     # Clear out everything in the index
     # so don't end up with old mirrors
diff --git a/lib/MetaCPAN/Script/Release.pm b/lib/MetaCPAN/Script/Release.pm
@@ -270,7 +270,7 @@ sub _get_release_model {
         bulk     => $bulk,
         distinfo => $d,
         file     => $archive_path,
-        index    => $self->index,
+        model    => $self->model,
         level    => $self->level,
         logger   => $self->logger,
         status   => $self->detect_status( $d->cpanid, $d->filename ),
@@ -285,7 +285,7 @@ sub import_archive {
     my $self         = shift;
     my $archive_path = shift;
 
-    my $bulk  = $self->index->bulk( size => $self->_bulk_size );
+    my $bulk  = $self->model->bulk( size => $self->_bulk_size );
     my $model = $self->_get_release_model( $archive_path, $bulk );
 
     log_debug {'Gathering modules'};
diff --git a/lib/MetaCPAN/Script/Role/Contributor.pm b/lib/MetaCPAN/Script/Role/Contributor.pm
@@ -10,7 +10,7 @@ sub get_cpan_author_contributors {
     my @ret;
     my $es = $self->es;
 
-    my $type = $self->index->type('release');
+    my $type = $self->model->doc('release');
     my $data;
     eval {
         $data = $type->get_contributors( $author, $release );
diff --git a/lib/MetaCPAN/Script/Role/External/Debian.pm b/lib/MetaCPAN/Script/Role/External/Debian.pm
@@ -98,7 +98,7 @@ sub dist_for_debian {
         my $query
             = { term => { 'distribution.lowercase' => $alias{$1} // $1 } };
 
-        my $res = $self->index->type('release')->query($query)
+        my $res = $self->model->doc('release')->query($query)
             ->sort( [ { date => { order => "desc" } } ] )->raw->first;
 
         return $res->{_source}{distribution}
diff --git a/lib/MetaCPAN/Script/Tickets.pm b/lib/MetaCPAN/Script/Tickets.pm
@@ -108,7 +108,7 @@ sub index_github_bugs {
     log_debug {'Fetching GitHub issues'};
 
     my $scroll
-        = $self->index->type('release')->find_github_based->scroll('5m');
+        = $self->model->doc('release')->find_github_based->scroll('5m');
     log_debug { sprintf( "Found %s repos", $scroll->total ) };
 
     my %summary;
diff --git a/lib/MetaCPAN/Script/Watcher.pm b/lib/MetaCPAN/Script/Watcher.pm
@@ -126,7 +126,7 @@ sub backpan_changes {
 sub latest_release {
     my $self = shift;
     return undef if ( $self->backpan );
-    return $self->index->type('release')
+    return $self->model->doc('release')
         ->sort( [ { 'date' => { order => "desc" } } ] )->first;
 }
 
@@ -157,7 +157,7 @@ sub index_release {
 sub reindex_release {
     my ( $self, $release ) = @_;
     my $info = CPAN::DistnameInfo->new( $release->{path} );
-    $release = $self->index->type('release')->query( {
+    $release = $self->model->doc('release')->query( {
         bool => {
             must => [
                 { term => { author  => $info->cpanid } },
diff --git a/t/lib/MetaCPAN/Tests/Model.pm b/t/lib/MetaCPAN/Tests/Model.pm
@@ -40,24 +40,13 @@ has _type => (
     builder => '_build_type',
 );
 
-has _model => (
+has model => (
     is      => 'ro',
     isa     => 'MetaCPAN::Model',
     lazy    => 1,
     default => sub { MetaCPAN::Server::Test::model() },
 );
 
-has _es_index_name => (
-    is      => 'ro',
-    isa     => Str,
-    default => 'cpan',
-);
-
-sub index {
-    my ($self) = @_;
-    return $self->_model->index( $self->_es_index_name );
-}
-
 has search => (
     is      => 'ro',
     isa     => ArrayRef,
@@ -68,7 +57,7 @@ has search => (
 sub _do_search {
     my ($self) = @_;
     my ( $method, @params ) = @{ $self->search };
-    return $self->index->type( $self->_type )->$method(@params);
+    return $self->model->doc( $self->_type )->$method(@params);
 }
 
 has data => (
diff --git a/t/lib/MetaCPAN/Tests/Release.pm b/t/lib/MetaCPAN/Tests/Release.pm
@@ -118,7 +118,7 @@ sub filter_files {
 
     my $release = $self->data;
     return [
-        $self->index->type('file')->query( {
+        $self->model->doc('file')->query( {
             bool => {
                 must => [
                     { term => { 'author'  => $release->author } },
diff --git a/t/release/documentation-hide.t b/t/release/documentation-hide.t
@@ -6,8 +6,7 @@ use MetaCPAN::Server::Test qw( model );
 use Test::More;
 
 my $model   = model();
-my $idx     = $model->index('cpan');
-my $release = $idx->type('release')->get( {
+my $release = $model->doc('release')->get( {
     author => 'MO',
     name   => 'Documentation-Hide-0.01'
 } );
@@ -21,7 +20,7 @@ is( $release->main_module, 'Documentation::Hide', 'main_module ok' );
 ok( $release->first, 'Release is first' );
 
 {
-    my @files = $idx->type('file')->query( {
+    my @files = $model->doc('file')->query( {
         bool => {
             must => [
                 { term   => { author  => $release->author } },
@@ -45,7 +44,7 @@ ok( $release->first, 'Release is first' );
 }
 
 {
-    my @files = $idx->type('file')->query( {
+    my @files = $model->doc('file')->query( {
         bool => {
             must => [
                 { term   => { author  => $release->author } },
diff --git a/t/release/file-changes.t b/t/release/file-changes.t
@@ -6,8 +6,7 @@ use MetaCPAN::Server::Test qw( model );
 use Test::More;
 
 my $model   = model();
-my $idx     = $model->index('cpan');
-my $release = $idx->type('release')->get( {
+my $release = $model->doc('release')->get( {
     author => 'LOCAL',
     name   => 'File-Changes-1.0'
 } );
@@ -20,7 +19,7 @@ is( $release->changes_file, 'Changes',          'changes_file ok' );
 
 {
     my @files
-        = $idx->type('file')
+        = $model->doc('file')
         ->query( { term => { release => 'File-Changes-1.0' } } )->all;
 
     my ($changes) = grep { $_->name eq 'Changes' } @files;
diff --git a/t/release/meta-provides.t b/t/release/meta-provides.t
@@ -21,7 +21,7 @@ test_release(
             my ($self) = @_;
             my $release = $self->data;
 
-            my @files = $self->index->type('file')->query( {
+            my @files = $self->model->doc('file')->query( {
                 bool => {
                     must => [
                         { term   => { 'author'    => $release->author } },
diff --git a/t/release/moose.t b/t/release/moose.t
@@ -7,10 +7,9 @@ use MetaCPAN::Util         qw( true false hit_total );
 use Test::More;
 
 my $model = model();
-my $idx   = $model->index('cpan');
 my @moose
-    = $idx->type('release')->query( { term => { distribution => 'Moose' } } )
-    ->all;
+    = $model->doc('release')
+    ->query( { term => { distribution => 'Moose' } } )->all;
 
 my $first = 0;
 map { $first++ } grep { $_->first } @moose;
@@ -23,7 +22,7 @@ is( $moose[1]->main_module, 'Moose', 'main_module ok' );
 
 ok(
     my $faq
-        = $idx->type('file')
+        = $model->doc('file')
         ->query( { match_phrase => { documentation => 'Moose::FAQ' } } )
         ->first,
     'get Moose::FAQ'
@@ -37,29 +36,29 @@ ok( !$faq->binary, 'is not binary' );
 
 ok(
     my $binary
-        = $idx->type('file')->query( { term => { name => 't' } } )->first,
+        = $model->doc('file')->query( { term => { name => 't' } } )->first,
     'get a t/ directory'
 );
 
 ok( $binary->binary, 'is binary' );
 
 ok(
     my $ppport
-        = $idx->type('file')
+        = $model->doc('file')
         ->query( { match_phrase => { documentation => 'ppport.h' } } )->first,
     'get ppport.h'
 );
 
 is( $ppport->name, 'ppphdoc', 'name doesn\'t contain a dot' );
 
-ok( my $moose = $idx->type('file')->find('Moose'), 'find Moose module' );
+ok( my $moose = $model->doc('file')->find('Moose'), 'find Moose module' );
 
 is( $moose->name, 'Moose.pm', 'defined in Moose.pm' );
 
 is( $moose->module->[0]->associated_pod, 'DOY/Moose-0.02/lib/Moose.pm' );
 
 my $signature;
-$signature = $idx->type('file')->query( {
+$signature = $model->doc('file')->query( {
     bool => {
         must => [
             { term => { mime => 'text/x-script.perl' } },
@@ -69,7 +68,7 @@ $signature = $idx->type('file')->query( {
 } )->first;
 ok( !$signature, 'SIGNATURE is not perl code' );
 
-$signature = $idx->type('file')->query( {
+$signature = $model->doc('file')->query( {
     bool => {
         must => [
             { term => { documentation => 'SIGNATURE' } },
@@ -80,7 +79,7 @@ $signature = $idx->type('file')->query( {
 } )->first;
 ok( !$signature, 'SIGNATURE is not documentation' );
 
-$signature = $idx->type('file')->query( {
+$signature = $model->doc('file')->query( {
     bool => {
         must => [
             { term   => { name    => 'SIGNATURE' } },
@@ -92,7 +91,7 @@ $signature = $idx->type('file')->query( {
 ok( !$signature, 'SIGNATURE is not pod' );
 
 {
-    my $files  = $idx->type('file');
+    my $files  = $model->doc('file');
     my $module = $files->history( module => 'Moose' )->raw->all;
     my $file   = $files->history( file => 'Moose', 'lib/Moose.pm' )->raw->all;
 
diff --git a/t/release/multiple-modules.t b/t/release/multiple-modules.t
@@ -7,8 +7,7 @@ use MetaCPAN::Util         qw(true false);
 use Test::More;
 
 my $model   = model();
-my $idx     = $model->index('cpan');
-my $release = $idx->type('release')->get( {
+my $release = $model->doc('release')->get( {
     author => 'LOCAL',
     name   => 'Multiple-Modules-1.01'
 } );
@@ -35,7 +34,7 @@ is_deeply(
 ok( !$release->first, 'Release is not first' );
 
 {
-    my @files = $idx->type('file')->query( {
+    my @files = $model->doc('file')->query( {
         bool => {
             must => [
                 { term   => { author  => $release->author } },
@@ -101,15 +100,15 @@ ok( !$release->first, 'Release is not first' );
     }
 }
 
-$release = $idx->type('release')->get( {
+$release = $model->doc('release')->get( {
     author => 'LOCAL',
     name   => 'Multiple-Modules-0.1'
 } );
 ok $release,        'got older version of release';
 ok $release->first, 'this version was first';
 
 ok(
-    my $file = $idx->type('file')->query( {
+    my $file = $model->doc('file')->query( {
         bool => {
             must => [
                 { term         => { release => 'Multiple-Modules-0.1' } },
diff --git a/t/release/perl-changes-file.t b/t/release/perl-changes-file.t
@@ -6,8 +6,7 @@ use MetaCPAN::Server::Test qw( model );
 use Test::More;
 
 my $model   = model();
-my $idx     = $model->index('cpan');
-my $release = $idx->type('release')->get( {
+my $release = $model->doc('release')->get( {
     author => 'RWSTAUNER',
     name   => 'perl-1'
 } );
diff --git a/t/release/pm-PL.t b/t/release/pm-PL.t
diff --git a/t/release/pod-pm.t b/t/release/pod-pm.t
diff --git a/t/release/prefer-meta-json.t b/t/release/prefer-meta-json.t
diff --git a/t/release/scripts.t b/t/release/scripts.t
diff --git a/t/release/some-trial.t b/t/release/some-trial.t
diff --git a/t/release/versions.t b/t/release/versions.t

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ has river => (`
`40`	`40`
`41`	`41`	`sub releases {`
`42`	`42`	`my $self = shift;`
`43`		`- return $self->index->type("release")`
	`43`	`+ return $self->index->model->doc("release")`
`44`	`44`	`->query( { term => { "distribution" => $self->name } } );`
`45`	`45`	`}`
`46`	`46`