From 9e4c681beae5a7a223cf84d411a12a1ccb3daa6f Mon Sep 17 00:00:00 2001 From: gmaurice Date: Wed, 22 Jun 2011 19:27:21 +0200 Subject: add basic support of riaksearch (need to see what is missed) --- lib/Net/Riak/Search.pm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 lib/Net/Riak/Search.pm (limited to 'lib/Net/Riak/Search.pm') diff --git a/lib/Net/Riak/Search.pm b/lib/Net/Riak/Search.pm new file mode 100644 index 0000000..ac9f059 --- /dev/null +++ b/lib/Net/Riak/Search.pm @@ -0,0 +1,15 @@ +package Net::Riak::Search; + +# ABSTRACT: the riaklink object represents a link from one Riak object to another + +use Moose; + +with 'Net::Riak::Role::Base' => {classes => + [{name => 'client', required => 0},]}; + +sub search { + my ($self, $params) = @_; + $self->client->search($params); +}; + +1; -- cgit 1.4.1 From ade1fc13ec613d2318a9c3517bc40837d99f4d99 Mon Sep 17 00:00:00 2001 From: gmaurice Date: Sat, 2 Jul 2011 00:03:55 +0200 Subject: allow to setup indexing on a bucket via precommit add tests for riaksearch --- lib/Net/Riak.pm | 2 +- lib/Net/Riak/Role/REST/Search.pm | 59 ++++++++++++++++++++++++++++++++++------ lib/Net/Riak/Search.pm | 7 +++-- t/20_search.t | 30 ++++++++++++++++++++ 4 files changed, 86 insertions(+), 12 deletions(-) create mode 100644 t/20_search.t (limited to 'lib/Net/Riak/Search.pm') diff --git a/lib/Net/Riak.pm b/lib/Net/Riak.pm index 3210007..dbfc6a5 100644 --- a/lib/Net/Riak.pm +++ b/lib/Net/Riak.pm @@ -14,7 +14,7 @@ has client => ( is => 'rw', isa => Client_T, required => 1, - handles => [qw/is_alive all_buckets server_info stats search/] + handles => [qw/is_alive all_buckets server_info stats search setup_indexing/] ); sub BUILDARGS { diff --git a/lib/Net/Riak/Role/REST/Search.pm b/lib/Net/Riak/Role/REST/Search.pm index 161acf5..642964b 100644 --- a/lib/Net/Riak/Role/REST/Search.pm +++ b/lib/Net/Riak/Role/REST/Search.pm @@ -3,17 +3,18 @@ use Moose::Role; use JSON; sub search { - my ( $self, $params) = @_; - + my $self = shift; + my %params = @_; my $request; + $request = $self->new_request( 'GET', - [ $self->search_prefix, "select" ], $params ) unless $params->{index}; - if ( $params->{index} ){ - my $index = delete $params->{index}; + [ $self->search_prefix, "select" ], \%params ) unless $params{index}; + if ( $params{index} ){ + my $index = delete $params{index}; $request = $self->new_request( 'GET', - [ $self->search_prefix, $index, "select" ], $params ); + [ $self->search_prefix, $index, "select" ], \%params ); } my $http_response = $self->send_request($request); @@ -24,10 +25,50 @@ sub search { if ($status == 404) { return; } -use YAML::Syck; -warn Dump $http_response; - JSON::decode_json($http_response->content); + + return JSON::decode_json($http_response->content) if $params{wt} =~ /json/i; + $http_response->content; }; +sub setup_indexing { + my ( $self, $bucket ) = @_; + my $request = + $self->new_request( 'GET', + [ $self->prefix, $bucket ] ); + + my $http_response = $self->send_request($request); + + return if (!$http_response); + my $status = $http_response->code; + if ($status == 404) { + return; + } + + my $precommits = JSON::decode_json($http_response->content)->{props}->{precommit}; + + for (@$precommits){ + return JSON::decode_json($http_response->content) if $_->{mod} eq "riak_search_kv_hook"; + } + push ( @$precommits, { mod => "riak_search_kv_hook" , fun => "precommit" } ); + + $request = $self->new_request( 'PUT', [ $self->prefix, $bucket ] ); + $request->content( JSON::encode_json({ props => { precommit => $precommits } } ) ); + $request->header('Content-Type' => "application/json" ); + + $http_response = $self->send_request($request); + + return if (!$http_response); + $status = $http_response->code; + if ($status == 404) { + return; + } + $request = + $self->new_request( 'GET', + [ $self->prefix, $bucket ] ); + + $http_response = $self->send_request($request); + + JSON::decode_json($http_response->content); +} 1; diff --git a/lib/Net/Riak/Search.pm b/lib/Net/Riak/Search.pm index ac9f059..8cf42b7 100644 --- a/lib/Net/Riak/Search.pm +++ b/lib/Net/Riak/Search.pm @@ -1,7 +1,5 @@ package Net::Riak::Search; -# ABSTRACT: the riaklink object represents a link from one Riak object to another - use Moose; with 'Net::Riak::Role::Base' => {classes => @@ -12,4 +10,9 @@ sub search { $self->client->search($params); }; +sub setup_indexing { + my ($self, $bucket) = @_; + $self->client->setup_indexing($bucket); +}; + 1; diff --git a/t/20_search.t b/t/20_search.t new file mode 100644 index 0000000..b25e811 --- /dev/null +++ b/t/20_search.t @@ -0,0 +1,30 @@ +use lib 't/lib'; +use Test::More; +use Test::Riak; + +test_riak_rest { + my ($client, $bucket_name) = @_; + ok $client->setup_indexing($bucket_name), 'setup indexing ok'; + + ok my $bucket = $client->bucket($bucket_name), 'got bucket test'; + my $content = { field => "indexed" }; + + ok my $obj = $bucket->new_object(undef, $content), + 'created a new riak object without a key'; + ok $obj->store, 'store object without key'; + ok $obj->key, 'key created'; + + is $client->search( + index => $bucket_name, + wt => "json", + q => "field:indexed")->{response}->{docs}[0]->{id}, + $obj->key, + 'search with index in path'; + + is $client->search( + wt => "json", + q => "$bucket_name.field:indexed")->{response}->{docs}[0]->{id}, + $obj->key, + 'search with index prefixes in query'; + $obj->delete; +} -- cgit 1.4.1 From 08cf0c72671e94086352b03683e1ad57348bee1f Mon Sep 17 00:00:00 2001 From: gmaurice Date: Thu, 7 Jul 2011 13:19:06 +0200 Subject: documentation added for search --- lib/Net/Riak.pm | 20 ++++++++++++ lib/Net/Riak/Role/REST/Search.pm | 4 ++- lib/Net/Riak/Search.pm | 69 +++++++++++++++++++++++++++++++++++++++- 3 files changed, 91 insertions(+), 2 deletions(-) (limited to 'lib/Net/Riak/Search.pm') diff --git a/lib/Net/Riak.pm b/lib/Net/Riak.pm index dbfc6a5..49a4d0f 100644 --- a/lib/Net/Riak.pm +++ b/lib/Net/Riak.pm @@ -58,6 +58,14 @@ sub bucket { $obj = $bucket->get('new_post'); say "title for ".$obj->key." is ".$obj->data->{title}; + + # Indexing and searching (REST interface) + $client->setup_indexing("bucket_name"); + ...adding documents to riak... + my $response = $client->search( + index => 'bucket_name', + q => 'field:value' + ); =head1 DESCRIPTION @@ -173,6 +181,18 @@ Start assembling a Map/Reduce operation say Dumper $client->stats; +=head2 search (REST only) + + $client->search( index => 'bucket_name', q => 'field:value' ); + +Makes a query to the index (see L for more details on parameters) + +=head2 setup_indexing (REST only) + + $client->setup_indexing('bucket_name'); + +Define precommit hook in order to enable indexing documents written into the given bucket + =head1 SEE ALSO L diff --git a/lib/Net/Riak/Role/REST/Search.pm b/lib/Net/Riak/Role/REST/Search.pm index 642964b..6748b20 100644 --- a/lib/Net/Riak/Role/REST/Search.pm +++ b/lib/Net/Riak/Role/REST/Search.pm @@ -2,6 +2,8 @@ package Net::Riak::Role::REST::Search; use Moose::Role; use JSON; +#ABSTRACT: Search interface + sub search { my $self = shift; my %params = @_; @@ -71,4 +73,4 @@ sub setup_indexing { JSON::decode_json($http_response->content); } -1; +1; \ No newline at end of file diff --git a/lib/Net/Riak/Search.pm b/lib/Net/Riak/Search.pm index 8cf42b7..a6282de 100644 --- a/lib/Net/Riak/Search.pm +++ b/lib/Net/Riak/Search.pm @@ -1,7 +1,8 @@ package Net::Riak::Search; - use Moose; +#ABSTRACT: Search interface + with 'Net::Riak::Role::Base' => {classes => [{name => 'client', required => 0},]}; @@ -16,3 +17,69 @@ sub setup_indexing { }; 1; + + +=head1 SYNOPSIS + + my $client = Net::Riak->new(...); + my $bucket = $client->bucket('foo'); + + # retrieve an existing object + my $obj1 = $bucket->get('foo'); + + # create/store a new object + my $obj2 = $bucket->new_object('foo2', {...}); + $object->store; + + $bucket->delete_object($key, 3); # optional w val + +=head1 DESCRIPTION + +L allows you to enable indexing documents for a given bucket and querying/searching the index. + +=head2 METHODS + +=head3 setup_indexing + + $client->setup_indexing('bucket_name'); + +Does the same as : + + curl -X PUT -H "content-type:application/json" http://localhost:8098/riak/bucket_name -d '{"props":{"precommit":[{"mod":"riak_search_kv_hook","fun":"precommit"}]}' + +but takes in account previouses precommits. + +=head3 search + + my $response = $client->search( + index => 'bucket_name', + q => 'field:value' + ); + # is the same as : + my $response = $client->search( + q => 'bucket_name.field:value' + ); + +Search the index + +=over 4 + +=item wt => 'XML|JSON' + +defines the response format (XML is the default value as for Solr/Lucene) + +=item q + +the query string + +=item index + +is the default index you want to query, if no index is provided you have to add it as a prefix of the fields in the query string + +=item rows + +is the number of documents you want to be returned in the response + +=back + +More parameters are available, just check at L \ No newline at end of file -- cgit 1.4.1 From 94209555eaa12357b177f36be40497a9b0d83ed6 Mon Sep 17 00:00:00 2001 From: franck cuny Date: Thu, 7 Jul 2011 13:23:39 +0200 Subject: perltidy + whitespaces removed Signed-off-by: franck cuny --- lib/Net/Riak/Search.pm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'lib/Net/Riak/Search.pm') diff --git a/lib/Net/Riak/Search.pm b/lib/Net/Riak/Search.pm index a6282de..ee2ed57 100644 --- a/lib/Net/Riak/Search.pm +++ b/lib/Net/Riak/Search.pm @@ -1,4 +1,5 @@ -package Net::Riak::Search; +package +Net::Riak::Search; use Moose; #ABSTRACT: Search interface @@ -18,7 +19,6 @@ sub setup_indexing { 1; - =head1 SYNOPSIS my $client = Net::Riak->new(...); @@ -45,8 +45,8 @@ L allows you to enable indexing documents for a given bucket Does the same as : - curl -X PUT -H "content-type:application/json" http://localhost:8098/riak/bucket_name -d '{"props":{"precommit":[{"mod":"riak_search_kv_hook","fun":"precommit"}]}' - + curl -X PUT -H "content-type:application/json" http://localhost:8098/riak/bucket_name -d '{"props":{"precommit":[{"mod":"riak_search_kv_hook","fun":"precommit"}]}' + but takes in account previouses precommits. =head3 search @@ -82,4 +82,4 @@ is the number of documents you want to be returned in the response =back -More parameters are available, just check at L \ No newline at end of file +More parameters are available, just check at L -- cgit 1.4.1