You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucy.apache.org by ma...@apache.org on 2011/11/13 20:28:16 UTC
[lucy-commits] svn commit: r1201483 - in /incubator/lucy/trunk/perl/lib/LucyX/Remote:
ClusterSearcher.pm SearchClient.pm
Author: marvin
Date: Sun Nov 13 19:28:16 2011
New Revision: 1201483
URL: http://svn.apache.org/viewvc?rev=1201483&view=rev
Log:
Refactor internal arg passing.
Change argument passing conventions so that downstream subroutines don't mess
with the supplied args hashref.
Modified:
incubator/lucy/trunk/perl/lib/LucyX/Remote/ClusterSearcher.pm
incubator/lucy/trunk/perl/lib/LucyX/Remote/SearchClient.pm
Modified: incubator/lucy/trunk/perl/lib/LucyX/Remote/ClusterSearcher.pm
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/perl/lib/LucyX/Remote/ClusterSearcher.pm?rev=1201483&r1=1201482&r2=1201483&view=diff
==============================================================================
--- incubator/lucy/trunk/perl/lib/LucyX/Remote/ClusterSearcher.pm (original)
+++ incubator/lucy/trunk/perl/lib/LucyX/Remote/ClusterSearcher.pm Sun Nov 13 19:28:16 2011
@@ -62,7 +62,7 @@ sub new {
}
# Derive doc_max and relative start offsets.
- my $doc_max_responses = $self->_multi_rpc( 'doc_max', {} );
+ my $doc_max_responses = $self->_multi_rpc( { _action => 'doc_max' } );
my $doc_max = 0;
my @starts;
for my $shard_doc_max (@$doc_max_responses) {
@@ -89,16 +89,16 @@ sub DESTROY {
# Send a remote procedure call to all shards.
sub _multi_rpc {
- my ( $self, $method, $args ) = @_;
+ my ( $self, $args ) = @_;
my $num_shards = $num_shards{$$self};
- my $request = $self->_serialize_request( $method, $args );
+ my $request = $self->_serialize_request($args);
for ( my $i = 0; $i < $num_shards; $i++ ) {
$self->_send_request_to_shard( $i, $request );
}
# Bail out if we're either closing or shutting down the server remotely.
- return if $method eq 'done';
- return if $method eq 'terminate';
+ return if $args->{_action} eq 'done';
+ return if $args->{_action} eq 'terminate';
my @responses;
for ( my $i = 0; $i < $num_shards; $i++ ) {
@@ -110,8 +110,8 @@ sub _multi_rpc {
# Send a remote procedure call to one shard.
sub _single_rpc {
- my ( $self, $method, $args, $shard_num ) = @_;
- my $request = $self->_serialize_request( $method, $args );
+ my ( $self, $args, $shard_num ) = @_;
+ my $request = $self->_serialize_request($args);
$self->_send_request_to_shard( $shard_num, $request );
my $response = $self->_retrieve_response_from_shard($shard_num);
return $response->{retval};
@@ -120,8 +120,7 @@ sub _single_rpc {
# Serialize a method name and hash-style parameters using the conventions
# understood by SearchServer.
sub _serialize_request {
- my ( $self, $method, $args ) = @_;
- $args->{_action} = $method;
+ my ( $self, $args ) = @_;
my $serialized = nfreeze($args);
my $packed_len = pack( 'N', length($serialized) );
my $request = "$packed_len$serialized";
@@ -177,7 +176,8 @@ sub top_docs {
}
# Gather remote responses and aggregate.
- my $responses = $self->_multi_rpc( 'top_docs', \%args );
+ $args{_action} = 'top_docs';
+ my $responses = $self->_multi_rpc( \%args );
my $total_hits = 0;
for ( my $i = 0; $i < $num_shards; $i++ ) {
my $base = $starts->get($i);
@@ -201,7 +201,7 @@ sub top_docs {
sub terminate {
my $self = shift;
- $self->_multi_rpc( 'terminate', {} );
+ $self->_multi_rpc( { _action => 'terminate' } );
return;
}
@@ -210,8 +210,8 @@ sub fetch_doc {
my $starts = $starts{$$self};
my $tick = Lucy::Index::PolyReader::sub_tick( $starts, $doc_id );
my $start = $starts->get($tick);
- my %params = ( doc_id => $doc_id - $start );
- return $self->_single_rpc( 'fetch_doc', \%params, $tick );
+ my %args = ( doc_id => $doc_id - $start, _action => 'fetch_doc' );
+ return $self->_single_rpc( \%args, $tick );
}
sub fetch_doc_vec {
@@ -219,9 +219,8 @@ sub fetch_doc_vec {
my $starts = $starts{$$self};
my $tick = Lucy::Index::PolyReader::sub_tick( $starts, $doc_id );
my $start = $starts->get($tick);
- my %params = ( doc_id => $doc_id - $start );
- return $self->_single_rpc( 'fetch_doc_vec', { doc_id => $doc_id },
- $tick );
+ my %args = ( doc_id => $doc_id - $start, _action => 'fetch_doc_vec' );
+ return $self->_single_rpc( \%args, $tick );
}
sub doc_max {
@@ -231,7 +230,8 @@ sub doc_max {
sub doc_freq {
my $self = shift;
- my $responses = $self->_multi_rpc( 'doc_freq', {@_} );
+ my %args = ( @_, _action => 'doc_freq' );
+ my $responses = $self->_multi_rpc( \%args );
my $doc_freq = 0;
$doc_freq += $_ for @$responses;
return $doc_freq;
@@ -239,7 +239,7 @@ sub doc_freq {
sub close {
my $self = shift;
- $self->_multi_rpc( 'done', {} );
+ $self->_multi_rpc( { _action => 'done' } );
for my $sock ( @{ $socks{$$self} } ) {
close $sock or confess("Error when closing socket: $!");
}
Modified: incubator/lucy/trunk/perl/lib/LucyX/Remote/SearchClient.pm
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/perl/lib/LucyX/Remote/SearchClient.pm?rev=1201483&r1=1201482&r2=1201483&view=diff
==============================================================================
--- incubator/lucy/trunk/perl/lib/LucyX/Remote/SearchClient.pm (original)
+++ incubator/lucy/trunk/perl/lib/LucyX/Remote/SearchClient.pm Sun Nov 13 19:28:16 2011
@@ -70,17 +70,16 @@ Storable.
=cut
sub _rpc {
- my ( $self, $method, $args ) = @_;
+ my ( $self, $args ) = @_;
my $sock = $sock{$$self};
- $args->{_action} = $method;
my $serialized = nfreeze($args);
my $packed_len = pack( 'N', length($serialized) );
print $sock $packed_len, $serialized;
# Bail out if we're either closing or shutting down the server remotely.
- return if $method eq 'done';
- return if $method eq 'terminate';
+ return if $args->{_action} eq 'done';
+ return if $args->{_action} eq 'terminate';
# Decode response.
$sock->read( $packed_len, 4 );
@@ -97,37 +96,43 @@ sub _rpc {
sub top_docs {
my $self = shift;
- return $self->_rpc( 'top_docs', {@_} );
+ my %args = ( @_, _action => 'top_docs' );
+ return $self->_rpc( \%args );
}
sub terminate {
my $self = shift;
- return $self->_rpc( 'terminate', {} );
+ my %args = ( _action => 'terminate' );
+ return $self->_rpc( \%args );
}
sub fetch_doc {
my ( $self, $doc_id ) = @_;
- return $self->_rpc( 'fetch_doc', { doc_id => $doc_id } );
+ my %args = ( doc_id => $doc_id, _action => 'fetch_doc' );
+ return $self->_rpc( \%args );
}
sub fetch_doc_vec {
my ( $self, $doc_id ) = @_;
- return $self->_rpc( 'fetch_doc_vec', { doc_id => $doc_id } );
+ my %args = ( doc_id => $doc_id, _action => 'fetch_doc_vec' );
+ return $self->_rpc( \%args );
}
sub doc_max {
my $self = shift;
- return $self->_rpc( 'doc_max', {} );
+ my %args = ( _action => 'doc_max' );
+ return $self->_rpc( { _action => 'doc_max' } );
}
sub doc_freq {
my $self = shift;
- return $self->_rpc( 'doc_freq', {@_} );
+ my %args = ( @_, _action => 'doc_freq' );
+ return $self->_rpc( \%args );
}
sub close {
my $self = shift;
- $self->_rpc( 'done', {} );
+ $self->_rpc( { _action => 'done' } );
my $sock = $sock{$$self};
close $sock or confess("Error when closing socket: $!");
delete $sock{$$self};