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/Role/REST/Search.pm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 lib/Net/Riak/Role/REST/Search.pm (limited to 'lib/Net/Riak/Role/REST') diff --git a/lib/Net/Riak/Role/REST/Search.pm b/lib/Net/Riak/Role/REST/Search.pm new file mode 100644 index 0000000..c75b84b --- /dev/null +++ b/lib/Net/Riak/Role/REST/Search.pm @@ -0,0 +1,28 @@ +package Net::Riak::Role::REST::Search; +use Moose::Role; +use JSON; + +sub search { + my ( $self, $params) = @_; + + my $request; + $request = + $self->new_request( 'GET', + [ $self->search_prefix, "select" ], $params ) unless $params->{index}; + $request = + $self->new_request( 'GET', + [ $self->search_prefix, $params->{index}, "select" ], $params ) if $params->{index}; + + my $http_response = $self->send_request($request); + + return if (!$http_response); + + my $status = $http_response->code; + if ($status == 404) { + return; + } + JSON::decode_json($http_response->content); +}; + + +1; -- cgit v1.2.3 From 4fe4d90d96b77a2265be5f808f9ed0c2612d28d1 Mon Sep 17 00:00:00 2001 From: gmaurice Date: Sat, 25 Jun 2011 20:52:38 +0200 Subject: remove index param from being added to query params --- lib/Net/Riak/Role/REST/Search.pm | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'lib/Net/Riak/Role/REST') diff --git a/lib/Net/Riak/Role/REST/Search.pm b/lib/Net/Riak/Role/REST/Search.pm index c75b84b..161acf5 100644 --- a/lib/Net/Riak/Role/REST/Search.pm +++ b/lib/Net/Riak/Role/REST/Search.pm @@ -9,10 +9,13 @@ sub search { $request = $self->new_request( 'GET', [ $self->search_prefix, "select" ], $params ) unless $params->{index}; - $request = - $self->new_request( 'GET', - [ $self->search_prefix, $params->{index}, "select" ], $params ) if $params->{index}; - + if ( $params->{index} ){ + my $index = delete $params->{index}; + $request = + $self->new_request( 'GET', + [ $self->search_prefix, $index, "select" ], $params ); + } + my $http_response = $self->send_request($request); return if (!$http_response); @@ -21,6 +24,8 @@ sub search { if ($status == 404) { return; } +use YAML::Syck; +warn Dump $http_response; JSON::decode_json($http_response->content); }; -- cgit v1.2.3 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/Role/REST/Search.pm | 59 ++++++++++++++++++++++++++++++++++------ 1 file changed, 50 insertions(+), 9 deletions(-) (limited to 'lib/Net/Riak/Role/REST') 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; -- cgit v1.2.3 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/Role/REST/Search.pm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'lib/Net/Riak/Role/REST') 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 -- cgit v1.2.3 From 61ec75a67b45b696c8e078c89f44139117e8360f Mon Sep 17 00:00:00 2001 From: franck cuny Date: Thu, 7 Jul 2011 13:24:24 +0200 Subject: removed more white spaces Signed-off-by: franck cuny --- lib/Net/Riak/Role/REST/Search.pm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'lib/Net/Riak/Role/REST') diff --git a/lib/Net/Riak/Role/REST/Search.pm b/lib/Net/Riak/Role/REST/Search.pm index 6748b20..b83e3d4 100644 --- a/lib/Net/Riak/Role/REST/Search.pm +++ b/lib/Net/Riak/Role/REST/Search.pm @@ -18,7 +18,7 @@ sub search { $self->new_request( 'GET', [ $self->search_prefix, $index, "select" ], \%params ); } - + my $http_response = $self->send_request($request); return if (!$http_response); @@ -34,23 +34,23 @@ sub search { sub setup_indexing { my ( $self, $bucket ) = @_; - my $request = + 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 ] ); @@ -58,19 +58,19 @@ sub setup_indexing { $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 = + $request = $self->new_request( 'GET', [ $self->prefix, $bucket ] ); $http_response = $self->send_request($request); JSON::decode_json($http_response->content); -} +} -1; \ No newline at end of file +1; -- cgit v1.2.3