riak-client 2.4.1 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 775e6ed1950061ebe5279c61fff8acf00bfa05a2
-  data.tar.gz: fc0faafd31a106b8b68efe324fd96f70f89989e4
+  metadata.gz: '080ae143f80944f8bc6dc8c5d52af3bb9705e418'
+  data.tar.gz: 846d1a48a1b3bdb6e8161d0302c3508e1c67417f
 SHA512:
-  metadata.gz: a8c7827313ac1b86e7224a54691c650252703c9b29036f69450a469ce924034cb1cf62e758af6d054c9b0a45646464273db4b0a16e57ad69c25c92cea8ce061c
-  data.tar.gz: 7d66559d01009bc676694f0d7807f01051f02d2cb80a08e86d46fe8cf25e21b2ed6daf6c8bd28ef9801fc1f6b759bf34a37b003abc37c8a592297961d83b0aa0
+  metadata.gz: e9cb1426cbd8d663f4e948e3d8ea08c09942f6702faab39975c77925e3af377a9cfe459c4d6e7777218df33cc19028ab13992f9bf47abf8bed82d23c7e12e8ee
+  data.tar.gz: 3f58c010d040ea7d4cc965e58594709fd22fe2e544c56936daaa69c890841d7a28213644fcefe17efce2992ec3dffedf88474bc113ff31841263a43a3d9ca30d

data/.document

@@ -1,5 +1,5 @@
-README.rdoc
-lib/**/*.rb
-bin/*
-features/**/*.feature
-LICENSE
+README.rdoc
+lib/**/*.rb
+bin/*
+features/**/*.feature
+LICENSE

data/.gitignore

@@ -17,6 +17,9 @@ tmtags
 ## VIM
 *.swp
 
+## VS Code
+.vscode/
+
 ## PROJECT::GENERAL
 coverage
 rdoc

data/Gemfile

@@ -1,17 +1,17 @@
-source "https://rubygems.org"
-
-gemspec
-
-group :guard do
-  gem 'guard-rspec'
-  gem 'rb-fsevent'
-  gem 'terminal-notifier-guard'
-end
-
-platforms :mri do
-  gem 'yajl-ruby'
-end
-
-platforms :jruby, :rbx do
-  gem 'json'
-end
+source "https://rubygems.org"
+
+gemspec
+
+group :guard do
+  gem 'guard-rspec'
+  gem 'rb-fsevent'
+  gem 'terminal-notifier-guard'
+end
+
+platforms :mri do
+  gem 'yajl-ruby'
+end
+
+platforms :jruby, :rbx do
+  gem 'json'
+end

data/Guardfile

@@ -1,20 +1,20 @@
-# A sample Guardfile
-# More info at https://github.com/guard/guard#readme
-
-# Note: The cmd option is now required due to the increasing number of ways
-#       rspec may be run, below are examples of the most common uses.
-#  * bundler: 'bundle exec rspec'
-#  * bundler binstubs: 'bin/rspec'
-#  * spring: 'bin/rsspec' (This will use spring if running and you have
-#                          installed the spring binstubs per the docs)
-#  * zeus: 'zeus rspec' (requires the server to be started separetly)
-#  * 'just' rspec: 'rspec'
-guard :rspec, cmd: 'bundle exec rspec', all_after_pass: true, all_on_start: true do
-  watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^lib/riak/(.+)\.rb$})     { |m| "spec/riak/#{m[1]}_spec.rb" }
-  watch(%r{^lib/riak/client/}) { 'spec/riak/beefcake_protobuffs_backend' }
-  watch('spec/spec_helper.rb')  { "spec" }
-
-  watch(/^spec\/integration/) { 'spec:integration' }
-end
-
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+# Note: The cmd option is now required due to the increasing number of ways
+#       rspec may be run, below are examples of the most common uses.
+#  * bundler: 'bundle exec rspec'
+#  * bundler binstubs: 'bin/rspec'
+#  * spring: 'bin/rsspec' (This will use spring if running and you have
+#                          installed the spring binstubs per the docs)
+#  * zeus: 'zeus rspec' (requires the server to be started separetly)
+#  * 'just' rspec: 'rspec'
+guard :rspec, cmd: 'bundle exec rspec', all_after_pass: true, all_on_start: true do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/riak/(.+)\.rb$})     { |m| "spec/riak/#{m[1]}_spec.rb" }
+  watch(%r{^lib/riak/client/}) { 'spec/riak/beefcake_protobuffs_backend' }
+  watch('spec/spec_helper.rb')  { "spec" }
+
+  watch(/^spec\/integration/) { 'spec:integration' }
+end
+

data/LICENSE.md

@@ -1,16 +1,16 @@
-Copyright 2010-2016 Sean Cribbs and Basho Technologies, Inc.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-All of the files in this project are under the project-wide license
-unless they are otherwise marked.
+Copyright 2010-2016 Sean Cribbs and Basho Technologies, Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+All of the files in this project are under the project-wide license
+unless they are otherwise marked.

data/RELNOTES.md

@@ -1,5 +1,9 @@
 # Riak Ruby Client Release Notes
 
+## [`2.5.0` Release - 2016-11-16](https://github.com/basho/riak-ruby-client/issues?q=milestone%3Ariak-ruby-client-2.5.0)
+
+Version `2.5.0` adds support for the HyperLogLog data type in Riak 2.2.0.
+
 ## [`2.4.1` Release - 2016-08-02](https://github.com/basho/riak-ruby-client/issues?q=milestone%3Ariak-ruby-client-2.4.1)
 
 Version `2.4.1` is a bugfix release that addresses some issues when using Ruby `1.9.3`.

data/Rakefile

@@ -75,6 +75,11 @@ namespace :spec do
   RSpec::Core::RakeTask.new(:time_series) do |spec|
     spec.rspec_opts = %w[--profile --tag time_series]
   end
+
+  desc "Run Security Specs Only"
+  RSpec::Core::RakeTask.new(:security) do |spec|
+    spec.rspec_opts = %w[--profile --tag yes_security --tag ~time_series]
+  end
 end
 
 desc "Run Unit Test Specs (excluding slow, integration and time_series)"
@@ -113,7 +118,7 @@ namespace :beefcake do
 
   directory 'tmp/riak_pb' => 'tmp' do
     cd 'tmp' do
-      sh "git clone -b 2.1.3.0 https://github.com/basho/riak_pb.git"
+      sh "git clone -b 2.2 https://github.com/basho/riak_pb.git"
     end
   end
 end

data/lib/riak/client/beefcake/crdt/counter_loader.rb

@@ -1,18 +1,18 @@
-class Riak::Client::BeefcakeProtobuffsBackend
-  class CrdtLoader
-    class CounterLoader
-      def self.for_value(resp)
-        return nil unless resp.counter_value
-        new resp.counter_value
-      end
-
-      def initialize(counter_value)
-        @value = counter_value
-      end
-
-      def rubyfy
-        @value
-      end
-    end
-  end
-end
+class Riak::Client::BeefcakeProtobuffsBackend
+  class CrdtLoader
+    class CounterLoader
+      def self.for_value(resp)
+        return nil unless resp.counter_value
+        new resp.counter_value
+      end
+
+      def initialize(counter_value)
+        @value = counter_value
+      end
+
+      def rubyfy
+        @value
+      end
+    end
+  end
+end

data/lib/riak/client/beefcake/crdt/hyper_log_log_loader.rb

@@ -0,0 +1,18 @@
+class Riak::Client::BeefcakeProtobuffsBackend
+  class CrdtLoader
+    class HyperLogLogLoader
+      def self.for_value(resp)
+        return nil unless resp.hll_value
+        new resp.hll_value
+      end
+
+      def initialize(hll_value)
+        @value = hll_value
+      end
+
+      def rubyfy
+        @value
+      end
+    end
+  end
+end

data/lib/riak/client/beefcake/crdt/map_loader.rb

@@ -1,64 +1,64 @@
-class Riak::Client::BeefcakeProtobuffsBackend
-  class CrdtLoader
-    class MapLoader
-      def self.for_value(resp)
-        return nil unless resp.map_value
-        new resp.map_value
-      end
-
-      def initialize(map_value)
-        @value = map_value
-      end
-
-      def rubyfy
-        accum = {
-          counters: {},
-          flags: {},
-          maps: {},
-          registers: {},
-          sets: {}
-        }
-
-        contents_loop @value, accum
-      end
-
-      private
-
-      def rubyfy_inner(accum, map_value)
-        destination = accum[:maps][map_value.field.name]
-        if destination.nil?
-          destination = accum[:maps][map_value.field.name] = {
-            counters: {},
-            flags: {},
-            maps: {},
-            registers: {},
-            sets: {}
-          }
-        end
-
-        contents_loop map_value.map_value, destination
-      end
-
-      def contents_loop(rolling_value, destination)
-        return destination if rolling_value.nil?
-
-        rolling_value.each do |inner|
-          case inner.field.type
-          when MapField::MapFieldType::COUNTER
-            destination[:counters][inner.field.name] = inner.counter_value
-          when MapField::MapFieldType::FLAG
-            destination[:flags][inner.field.name] = inner.flag_value
-          when MapField::MapFieldType::MAP
-            rubyfy_inner destination, inner
-          when MapField::MapFieldType::REGISTER
-            destination[:registers][inner.field.name] = inner.register_value
-          when MapField::MapFieldType::SET
-            destination[:sets][inner.field.name] = ::Set.new inner.set_value
-          end
-        end
-
-        return destination
-      end
-    end
-  end
-end
+class Riak::Client::BeefcakeProtobuffsBackend
+  class CrdtLoader
+    class MapLoader
+      def self.for_value(resp)
+        return nil unless resp.map_value
+        new resp.map_value
+      end
+
+      def initialize(map_value)
+        @value = map_value
+      end
+
+      def rubyfy
+        accum = {
+          counters: {},
+          flags: {},
+          maps: {},
+          registers: {},
+          sets: {}
+        }
+
+        contents_loop @value, accum
+      end
+
+      private
+
+      def rubyfy_inner(accum, map_value)
+        destination = accum[:maps][map_value.field.name]
+        if destination.nil?
+          destination = accum[:maps][map_value.field.name] = {
+            counters: {},
+            flags: {},
+            maps: {},
+            registers: {},
+            sets: {}
+          }
+        end
+
+        contents_loop map_value.map_value, destination
+      end
+
+      def contents_loop(rolling_value, destination)
+        return destination if rolling_value.nil?
+
+        rolling_value.each do |inner|
+          case inner.field.type
+          when MapField::MapFieldType::COUNTER
+            destination[:counters][inner.field.name] = inner.counter_value
+          when MapField::MapFieldType::FLAG
+            destination[:flags][inner.field.name] = inner.flag_value
+          when MapField::MapFieldType::MAP
+            rubyfy_inner destination, inner
+          when MapField::MapFieldType::REGISTER
+            destination[:registers][inner.field.name] = inner.register_value
+          when MapField::MapFieldType::SET
+            destination[:sets][inner.field.name] = ::Set.new inner.set_value
+          end
+        end
+
+        return destination
+      end
+    end
+  end
+end

data/lib/riak/client/beefcake/crdt_loader.rb

@@ -1,4 +1,5 @@
 require 'riak/client/beefcake/crdt/counter_loader'
+require 'riak/client/beefcake/crdt/hyper_log_log_loader'
 require 'riak/client/beefcake/crdt/map_loader'
 require 'riak/client/beefcake/crdt/set_loader'
 
@@ -47,7 +48,7 @@ module Riak
         def get_loader_for_value(value)
           return nil if value.nil?
 
-          [CounterLoader, MapLoader, SetLoader].map do |loader|
+          [CounterLoader, HyperLogLogLoader, MapLoader, SetLoader].map do |loader|
             loader.for_value value
           end.compact.first
         end
@@ -76,6 +77,8 @@ module Riak
               registers: {},
               sets: {},
             }
+          when DtFetchResp::DataType::HLL
+            0
           end
         end
       end

data/lib/riak/client/beefcake/crdt_operator.rb

@@ -68,6 +68,8 @@ module Riak
           case operations.first.type
           when :counter
             serialize_counter operations
+          when :hll
+            serialize_hyper_log_log operations
           when :set
             serialize_set operations
           when :map
@@ -170,6 +172,17 @@ module Riak
                     )
         end
 
+        def serialize_hyper_log_log(hyper_log_log_ops)
+          adds = ::Set.new
+          hyper_log_log_ops.each do |o|
+            adds.add [o.value[:add]] if o.value[:add]
+          end
+
+          HllOp.new(
+                    adds: adds.to_a.flatten
+                    )
+        end
+
         def serialize_inner_set(set_op)
           value = set_op.value or nil
 

data/lib/riak/client/beefcake/footer

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

data/lib/riak/client/beefcake/header

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

data/lib/riak/client/beefcake/messages.rb

@@ -1,9 +1,9 @@
-require 'beefcake'
-
-module Riak
-  class Client
-    # @private
-    class BeefcakeProtobuffsBackend
+require 'beefcake'
+
+module Riak
+  class Client
+    # @private
+    class BeefcakeProtobuffsBackend
 ## Generated from riak.proto
 require "beefcake"
 
@@ -150,6 +150,7 @@ class RpbBucketProps
   optional :datatype, :bytes, 26
   optional :consistent, :bool, 27
   optional :write_once, :bool, 28
+  optional :hll_precision, :uint32, 29
 end
 
 class RpbAuthReq
@@ -682,6 +683,7 @@ class DtFetchResp
     COUNTER = 1
     SET = 2
     MAP = 3
+    HLL = 4
   end
 end
 
@@ -693,6 +695,10 @@ class SetOp
   include Beefcake::Message
 end
 
+class HllOp
+  include Beefcake::Message
+end
+
 class MapUpdate
   include Beefcake::Message
 
@@ -750,6 +756,7 @@ class DtValue
   optional :counter_value, :sint64, 1
   repeated :set_value, :bytes, 2
   repeated :map_value, MapEntry, 3
+  optional :hll_value, :uint64, 4
 end
 
 class DtFetchResp
@@ -767,6 +774,10 @@ class SetOp
   repeated :removes, :bytes, 2
 end
 
+class HllOp
+  repeated :adds, :bytes, 1
+end
+
 class MapUpdate
   required :field, MapField, 1
   optional :counter_op, CounterOp, 2
@@ -785,6 +796,7 @@ class DtOp
   optional :counter_op, CounterOp, 1
   optional :set_op, SetOp, 2
   optional :map_op, MapOp, 3
+  optional :hll_op, HllOp, 4
 end
 
 class DtUpdateReq
@@ -809,6 +821,7 @@ class DtUpdateResp
   optional :counter_value, :sint64, 3
   repeated :set_value, :bytes, 4
   repeated :map_value, MapEntry, 5
+  optional :hll_value, :uint64, 6
 end
 ## Generated from riak_ts.proto
 require "beefcake"
@@ -878,9 +891,26 @@ class TsListKeysResp
   include Beefcake::Message
 end
 
+class TsCoverageReq
+  include Beefcake::Message
+end
+
+class TsCoverageResp
+  include Beefcake::Message
+end
+
+class TsCoverageEntry
+  include Beefcake::Message
+end
+
+class TsRange
+  include Beefcake::Message
+end
+
 class TsQueryReq
   optional :query, TsInterpolation, 1
   optional :stream, :bool, 2, :default => false
+  optional :cover_context, :bytes, 3
 end
 
 class TsQueryResp
@@ -950,7 +980,34 @@ class TsListKeysResp
   repeated :keys, TsRow, 1
   optional :done, :bool, 2
 end
-
-    end
-  end
-end
+
+class TsCoverageReq
+  optional :query, TsInterpolation, 1
+  required :table, :bytes, 2
+  optional :replace_cover, :bytes, 3
+  repeated :unavailable_cover, :bytes, 4
+end
+
+class TsCoverageResp
+  repeated :entries, TsCoverageEntry, 1
+end
+
+class TsCoverageEntry
+  required :ip, :bytes, 1
+  required :port, :uint32, 2
+  required :cover_context, :bytes, 3
+  optional :range, TsRange, 4
+end
+
+class TsRange
+  required :field_name, :bytes, 1
+  required :lower_bound, :sint64, 2
+  required :lower_bound_inclusive, :bool, 3
+  required :upper_bound, :sint64, 4
+  required :upper_bound_inclusive, :bool, 5
+  required :desc, :bytes, 6
+end
+
+    end
+  end
+end