Merge pull request #113 from basho/bk-yokozuna

Riak 2 Feature: Yokozuna

Author: bkerley

.gitignore

@@ -38,3 +38,4 @@ Gemfile.lock
 vendor/erlang
 vendor/riak
 .ruby-version
+tmp

Rakefile

@@ -70,3 +70,38 @@ RSpec::Core::RakeTask.new(:ci) do |spec|
  spec.rspec_opts = %w[--profile]
 end
 task :default => :ci
+
+
+desc "Generate Protocol Buffers message definitions from riak_pb"
+task :pb_defs => 'beefcake:pb_defs'
+
+namespace :beefcake do
+ task :pb_defs => 'lib/riak/client/beefcake/messages.rb'
+
+ task :clean do
+ sh "rm -rf tmp/riak_pb"
+ sh "rm -rf tmp/riak_kv.pb.rb tmp/riak_search.pb.rb tmp/riak_yokozuna.pb.rb"
+ end
+
+ file 'lib/riak/client/beefcake/messages.rb' => %w{tmp/riak_kv.pb.rb tmp/riak_search.pb.rb tmp/riak_yokozuna.pb.rb} do |t|
+ sh "cat lib/riak/client/beefcake/header tmp/riak.pb.rb #{t.prerequisites.join ' '} lib/riak/client/beefcake/footer > #{t.name}"
+ end
+
+ file 'tmp/riak_kv.pb.rb' => 'tmp/riak_pb' do |t|
+ sh "protoc --beefcake_out tmp -I tmp/riak_pb/src tmp/riak_pb/src/riak_kv.proto"
+ end
+
+ file 'tmp/riak_search.pb.rb' => 'tmp/riak_pb' do |t|
+ sh "protoc --beefcake_out tmp -I tmp/riak_pb/src tmp/riak_pb/src/riak_search.proto"
+ end
+
+ file 'tmp/riak_yokozuna.pb.rb' => 'tmp/riak_pb' do |t|
+ sh "protoc --beefcake_out tmp -I tmp/riak_pb/src tmp/riak_pb/src/riak_yokozuna.proto"
+ end
+
+ directory 'tmp/riak_pb' do
+ cd 'tmp' do
+ sh "git clone -b develop https://github.com/basho/riak_pb.git"
+ end
+ end
+end

lib/riak/client.rb

@@ -8,6 +8,7 @@
 require 'riak/client/decaying'
 require 'riak/client/node'
 require 'riak/client/search'
+require 'riak/client/yokozuna'
 require 'riak/client/http_backend'
 require 'riak/client/net_http_backend'
 require 'riak/client/excon_backend'

lib/riak/client/beefcake/footer

@@ -0,0 +1,4 @@
+
+ end
+ end
+end

lib/riak/client/beefcake/header

@@ -0,0 +1,6 @@
+require 'beefcake'
+
+module Riak
+ class Client
+ # @private
+ class BeefcakeProtobuffsBackend

lib/riak/client/beefcake/message_codes.rb

@@ -39,6 +39,13 @@ module BeefcakeMessageCodes
  :CounterUpdateResp => 51,
  :CounterGetReq => 52,
  :CounterGetResp => 53,
+ :YokozunaIndexGetReq => 54,
+ :YokozunaIndexGetResp => 55,
+ :YokozunaIndexPutReq => 56,
+ :YokozunaIndexDeleteReq => 57,
+ :YokozunaSchemaGetReq => 58,
+ :YokozunaSchemaGetResp => 59,
+ :YokozunaSchemaPutReq => 60,
  }
 
  CODE_TO_MESSAGE = MESSAGE_TO_CODE.invert

lib/riak/client/beefcake/message_overlay.rb

@@ -0,0 +1,49 @@
+module Riak
+ class Client
+ # @private
+ class BeefcakeProtobuffsBackend
+ class RpbIndexReq
+ module IndexQueryType
+ EQ = 0
+ RANGE = 1
+ end
+ end
+
+ class RpbBucketProps
+
+ # "repeated" elements with zero items are indistinguishable
+ # from a nil, so we have to manage has_precommit/has_postcommit
+ # flags.
+ def precommit=(newval)
+ @precommit = newval
+ @has_precommit = !!newval
+ end
+
+ def has_precommit=(newval)
+ @has_precommit = newval
+ @precommit ||= [] if newval
+ end
+
+ def postcommit=(newval)
+ @postcommit = newval
+ @has_postcommit = !!newval
+ end
+
+ def has_postcommit=(newval)
+ @has_postcommit = newval
+ @postcommit ||= [] if newval
+ end
+ end
+
+ class RpbSearchDoc
+ # rebuild the fields instance method since the
+ # generated :fields field overwrote this
+ def fields
+ self.class.fields
+ end
+ repeated :properties, RpbPair, 1
+ end
+
+ end
+ end
+end