aerospike 2.24.0 → 2.25.0

data/lib/aerospike/value/value.rb

@@ -17,12 +17,11 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-require 'aerospike/aerospike_exception'
+require "aerospike/aerospike_exception"
 
 module Aerospike
   # Polymorphic value classes used to efficiently serialize objects into the wire protocol.
   class Value #:nodoc:
-
     def self.of(value, allow_64bits = false)
       case value
       when Integer
@@ -83,12 +82,10 @@ module Aerospike
         raise Aerospike::Exceptions::Aerospike.new(Aerospike::ResultCode::TYPE_NOT_SUPPORTED, "Value type #{value.class} not supported as hash key.")
       end
     end
-
   end # Value
 
   # Empty value.
   class NullValue < Value #:nodoc:
-
     def initialize
       self
     end
@@ -102,7 +99,7 @@ module Aerospike
     end
 
     def to_s
-      ''
+      ""
     end
 
     def estimate_size
@@ -118,13 +115,12 @@ module Aerospike
     end
 
     def to_bytes
-      ''
+      ""
     end
   end
 
   NULL = NullValue.new.freeze
 
-
   # Infinity value.
   class InfinityValue < Value #:nodoc:
     def initialize
@@ -156,7 +152,7 @@ module Aerospike
     end
 
     def to_bytes
-      ''
+      ""
     end
 
     def to_msgpack_ext
@@ -197,7 +193,7 @@ module Aerospike
     end
 
     def to_bytes
-      ''
+      ""
     end
 
     def to_msgpack_ext
@@ -209,10 +205,9 @@ module Aerospike
 
   # Byte array value.
   class BytesValue < Value #:nodoc:
-
     def initialize(value)
       @bytes = value
-      @bytes.force_encoding('binary')
+      @bytes.force_encoding("binary")
 
       self
     end
@@ -244,16 +239,14 @@ module Aerospike
     def pack(packer)
       packer.write(Aerospike::ParticleType::BLOB.chr + @bytes)
     end
-
   end # BytesValue
 
   #######################################
 
   # value string.
   class StringValue < Value #:nodoc:
-
     def initialize(val)
-      @value = val || ''
+      @value = val || ""
       self
     end
 
@@ -289,14 +282,12 @@ module Aerospike
     def to_sym
       @value.to_sym
     end
-
   end # StringValue
 
   #######################################
 
   # Integer value.
   class IntegerValue < Value #:nodoc:
-
     def initialize(val)
       @value = val || 0
       self
@@ -326,20 +317,18 @@ module Aerospike
     def to_bytes
       # Convert integer to big endian unsigned 64 bits.
       # @see http://ruby-doc.org/core-2.3.0/Array.html#method-i-pack
-      [@value].pack('Q>')
+      [@value].pack("Q>")
     end
 
     def to_s
       @value.to_s
     end
-
   end # IntegerValue
 
   #######################################
 
   # Float value.
   class FloatValue < Value #:nodoc:
-
     def initialize(val)
       @value = val || 0.0
       self
@@ -367,13 +356,12 @@ module Aerospike
     end
 
     def to_bytes
-      [@value].pack('G')
+      [@value].pack("G")
     end
 
     def to_s
       @value.to_s
     end
-
   end # FloatValue
 
   #######################################
@@ -381,7 +369,6 @@ module Aerospike
   # List value.
   # Supported by Aerospike 3 servers only.
   class ListValue < Value #:nodoc:
-
     def initialize(list)
       @list = list || []
     end
@@ -415,7 +402,7 @@ module Aerospike
     end
 
     def to_s
-      @list.map{|v| v.to_s}.to_s
+      @list.map { |v| v.to_s }.to_s
     end
 
     private
@@ -430,15 +417,13 @@ module Aerospike
 
       @bytes
     end
-
   end
 
   # #######################################/
 
   # Map value.
-  # Supported by Aerospike 3 servers only.
+  # Supported by Aerospike 3+ servers only.
   class MapValue < Value #:nodoc:
-
     def initialize(vmap)
       @vmap = vmap || {}
     end
@@ -475,7 +460,7 @@ module Aerospike
     end
 
     def to_s
-      @vmap.map{|k, v| "#{k.to_s} => #{v.to_s}" }.to_s
+      @vmap.map { |k, v| "#{k.to_s} => #{v.to_s}" }.to_s
     end
 
     private
@@ -490,7 +475,6 @@ module Aerospike
 
       @bytes
     end
-
   end
 
   # #######################################/
@@ -498,7 +482,6 @@ module Aerospike
   # GeoJSON value.
   # Supported by Aerospike server version 3.7 and later.
   class GeoJSONValue < Value #:nodoc:
-
     def initialize(json)
       @json = json
       @bytes = json.to_json
@@ -535,7 +518,6 @@ module Aerospike
     def to_s
       @json
     end
-
   end
 
   # #######################################/
@@ -543,14 +525,19 @@ module Aerospike
   # HLLValue value. Encapsulates a HyperLogLog value.
   # Supported by Aerospike server version 4.9 and later.
   class HLLValue < Value #:nodoc:
+    attr_reader :bytes
 
     def initialize(value)
       @bytes = value
-      @bytes.force_encoding('binary')
+      @bytes.force_encoding("binary")
 
       self
     end
 
+    def ==(other)
+      @bytes.to_s == other.to_s
+    end
+
     def type
       Aerospike::ParticleType::HLL
     end
@@ -578,7 +565,6 @@ module Aerospike
     def pack(packer)
       packer.write(Aerospike::ParticleType::BLOB.chr + @bytes)
     end
-
   end
 
   #######################################
@@ -594,63 +580,49 @@ module Aerospike
   protected
 
   def self.bytes_to_particle(type, buf, offset, length) # :nodoc:
-
     case type
     when Aerospike::ParticleType::STRING
       bytes = buf.read(offset, length)
       bytes.force_encoding(Aerospike.encoding)
-
     when Aerospike::ParticleType::INTEGER
       buf.read_int64(offset)
-
     when Aerospike::ParticleType::DOUBLE
       buf.read_double(offset)
-
     when Aerospike::ParticleType::BOOL
       buf.read_bool(offset, length)
-
     when Aerospike::ParticleType::BLOB
-      buf.read(offset,length)
-
+      buf.read(offset, length)
     when Aerospike::ParticleType::LIST
       Unpacker.use do |unpacker|
         data = buf.read(offset, length)
         unpacker.unpack(data)
       end
-
     when Aerospike::ParticleType::MAP
       Unpacker.use do |unpacker|
         data = buf.read(offset, length)
         unpacker.unpack(data)
       end
-
     when Aerospike::ParticleType::GEOJSON
       # ignore the flags for now
       ncells = buf.read_int16(offset + 1)
       hdrsz = 1 + 2 + (ncells * 8)
       Aerospike::GeoJSON.new(buf.read(offset + hdrsz, length - hdrsz))
-
     when Aerospike::ParticleType::HLL
-      bytes = buf.read(offset,length)
+      bytes = buf.read(offset, length)
       Aerospike::HLLValue.new(bytes)
-
     else
       nil
     end
   end
 
   def self.bytes_to_key_value(type, buf, offset, len) # :nodoc:
-
     case type
     when Aerospike::ParticleType::STRING
       StringValue.new(buf.read(offset, len))
-
     when Aerospike::ParticleType::INTEGER
       IntegerValue.new(buf.read_var_int64(offset, len))
-
     when Aerospike::ParticleType::BLOB
-      BytesValue.new(buf.read(offset,len))
-
+      BytesValue.new(buf.read(offset, len))
     else
       nil
     end
@@ -663,7 +635,6 @@ module Aerospike
   # Boolean value.
   # Supported by Aerospike server 5.6+ only.
   class BoolValue < Value #:nodoc:
-
     def initialize(val)
       @value = val || false
       self
@@ -698,6 +669,5 @@ module Aerospike
     def to_s
       @value.to_s
     end
-
   end # BoolValue
 end # module

data/lib/aerospike/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Aerospike
-  VERSION = "2.24.0"
+  VERSION = "2.25.0"
 end

data/lib/aerospike.rb

@@ -19,163 +19,171 @@ require "logger"
 require "stringio"
 require "monitor"
 require "timeout"
-require 'resolv'
-require 'msgpack'
-require 'bcrypt'
-require 'zlib'
+require "resolv"
+require "msgpack"
+require "bcrypt"
+require "zlib"
 
-require 'aerospike/atomic/atomic'
+require "aerospike/atomic/atomic"
 
-require 'aerospike/client'
-require 'aerospike/features'
-require 'aerospike/utils/pool'
-require 'aerospike/utils/connection_pool'
-require 'aerospike/utils/packer'
-require 'aerospike/utils/unpacker'
-require 'aerospike/utils/buffer'
-require 'aerospike/utils/string_parser'
-require 'aerospike/host'
-require 'aerospike/host/parse'
-require 'aerospike/loggable'
-require 'aerospike/record'
-require 'aerospike/result_code'
-require 'aerospike/version'
-require 'aerospike/value/particle_type'
-require 'aerospike/value/value'
-require 'aerospike/command/single_command'
-require 'aerospike/command/batch_direct_node'
-require 'aerospike/command/batch_index_node'
-require 'aerospike/command/field_type'
-require 'aerospike/command/command'
-require 'aerospike/command/execute_command'
-require 'aerospike/command/write_command'
-require 'aerospike/command/batch_item'
-require 'aerospike/command/operate_command'
-require 'aerospike/command/exists_command'
-require 'aerospike/command/multi_command'
-require 'aerospike/command/batch_direct_command'
-require 'aerospike/command/batch_direct_exists_command'
-require 'aerospike/command/batch_index_command'
-require 'aerospike/command/batch_index_exists_command'
-require 'aerospike/command/read_header_command'
-require 'aerospike/command/touch_command'
-require 'aerospike/command/read_command'
-require 'aerospike/command/delete_command'
-require 'aerospike/command/admin_command'
-require 'aerospike/command/login_command'
-require 'aerospike/command/unsupported_particle_type_validator'
-require 'aerospike/key'
-require 'aerospike/operation'
-require 'aerospike/cdt/context'
-require 'aerospike/cdt/list_operation'
-require 'aerospike/cdt/list_order'
-require 'aerospike/cdt/list_return_type'
-require 'aerospike/cdt/list_sort_flags'
-require 'aerospike/cdt/list_write_flags'
-require 'aerospike/cdt/list_policy'
-require 'aerospike/cdt/map_operation'
-require 'aerospike/cdt/map_order'
-require 'aerospike/cdt/map_return_type'
-require 'aerospike/cdt/map_write_flags'
-require 'aerospike/cdt/map_write_mode'
-require 'aerospike/cdt/map_policy'
-require 'aerospike/cdt/hll_operation'
-require 'aerospike/cdt/hll_write_flags'
-require 'aerospike/cdt/hll_policy'
-require 'aerospike/cdt/bit_operation'
-require 'aerospike/cdt/bit_overflow_action'
-require 'aerospike/cdt/bit_resize_flags'
-require 'aerospike/cdt/bit_write_flags'
-require 'aerospike/cdt/bit_policy'
-require 'aerospike/geo_json'
-require 'aerospike/ttl'
+require "aerospike/client"
+require "aerospike/features"
+require "aerospike/utils/pool"
+require "aerospike/utils/connection_pool"
+require "aerospike/utils/packer"
+require "aerospike/utils/unpacker"
+require "aerospike/utils/buffer"
+require "aerospike/utils/string_parser"
+require "aerospike/host"
+require "aerospike/host/parse"
+require "aerospike/loggable"
+require "aerospike/record"
+require "aerospike/result_code"
+require "aerospike/version"
+require "aerospike/value/particle_type"
+require "aerospike/value/value"
+require "aerospike/command/single_command"
+require "aerospike/command/batch_direct_node"
+require "aerospike/command/batch_index_node"
+require "aerospike/command/field_type"
+require "aerospike/command/command"
+require "aerospike/command/execute_command"
+require "aerospike/command/write_command"
+require "aerospike/command/batch_item"
+require "aerospike/command/operate_command"
+require "aerospike/command/exists_command"
+require "aerospike/command/multi_command"
+require "aerospike/command/batch_direct_command"
+require "aerospike/command/batch_direct_exists_command"
+require "aerospike/command/batch_index_command"
+require "aerospike/command/batch_index_exists_command"
+require "aerospike/command/read_header_command"
+require "aerospike/command/touch_command"
+require "aerospike/command/read_command"
+require "aerospike/command/delete_command"
+require "aerospike/command/admin_command"
+require "aerospike/command/login_command"
+require "aerospike/command/unsupported_particle_type_validator"
+require "aerospike/command/operate_args"
+require "aerospike/key"
+require "aerospike/operation"
+require "aerospike/cdt/context"
+require "aerospike/cdt/list_operation"
+require "aerospike/cdt/list_order"
+require "aerospike/cdt/list_return_type"
+require "aerospike/cdt/list_sort_flags"
+require "aerospike/cdt/list_write_flags"
+require "aerospike/cdt/list_policy"
+require "aerospike/cdt/map_operation"
+require "aerospike/cdt/map_order"
+require "aerospike/cdt/map_return_type"
+require "aerospike/cdt/map_write_flags"
+require "aerospike/cdt/map_write_mode"
+require "aerospike/cdt/map_policy"
+require "aerospike/cdt/hll_operation"
+require "aerospike/cdt/hll_write_flags"
+require "aerospike/cdt/hll_policy"
+require "aerospike/cdt/bit_operation"
+require "aerospike/cdt/bit_overflow_action"
+require "aerospike/cdt/bit_resize_flags"
+require "aerospike/cdt/bit_write_flags"
+require "aerospike/cdt/bit_policy"
+require "aerospike/geo_json"
+require "aerospike/ttl"
 
-require 'aerospike/policy/client_policy'
-require 'aerospike/policy/priority'
-require 'aerospike/policy/record_exists_action'
-require 'aerospike/policy/generation_policy'
-require 'aerospike/policy/policy'
-require 'aerospike/policy/batch_policy'
-require 'aerospike/policy/write_policy'
-require 'aerospike/policy/scan_policy'
-require 'aerospike/policy/query_policy'
-require 'aerospike/policy/consistency_level'
-require 'aerospike/policy/commit_level'
-require 'aerospike/policy/admin_policy'
-require 'aerospike/policy/auth_mode'
+require "aerospike/policy/client_policy"
+require "aerospike/policy/priority"
+require "aerospike/policy/record_exists_action"
+require "aerospike/policy/generation_policy"
+require "aerospike/policy/policy"
+require "aerospike/policy/batch_policy"
+require "aerospike/policy/write_policy"
+require "aerospike/policy/scan_policy"
+require "aerospike/policy/query_policy"
+require "aerospike/policy/consistency_level"
+require "aerospike/policy/commit_level"
+require "aerospike/policy/admin_policy"
+require "aerospike/policy/auth_mode"
 
-require 'aerospike/socket/base'
-require 'aerospike/socket/ssl'
-require 'aerospike/socket/tcp'
+require "aerospike/socket/base"
+require "aerospike/socket/ssl"
+require "aerospike/socket/tcp"
 
-require 'aerospike/connection/authenticate'
-require 'aerospike/connection/create'
+require "aerospike/connection/authenticate"
+require "aerospike/connection/create"
 
-require 'aerospike/cluster'
-require 'aerospike/cluster/create_connection'
-require 'aerospike/cluster/find_nodes_to_remove'
-require 'aerospike/cluster/find_node'
-require 'aerospike/cluster/partition'
-require 'aerospike/cluster/partition_parser'
-require 'aerospike/cluster/rack_parser'
-require 'aerospike/node'
-require 'aerospike/node/generation'
-require 'aerospike/node/rebalance'
-require 'aerospike/node/refresh/failed'
-require 'aerospike/node/refresh/friends'
-require 'aerospike/node/refresh/info'
-require 'aerospike/node/refresh/partitions'
-require 'aerospike/node/refresh/racks'
-require 'aerospike/node/refresh/peers'
-require 'aerospike/node/refresh/reset'
-require 'aerospike/node/verify/cluster_name'
-require 'aerospike/node/verify/name'
-require 'aerospike/node/verify/partition_generation'
-require 'aerospike/node/verify/rebalance_generation'
-require 'aerospike/node/verify/peers_generation'
-require 'aerospike/node_validator'
-require 'aerospike/peer'
-require 'aerospike/peers'
-require 'aerospike/peers/fetch'
-require 'aerospike/peers/parse'
-require 'aerospike/info'
-require 'aerospike/udf'
-require 'aerospike/bin'
-require 'aerospike/aerospike_exception'
-require 'aerospike/user_role'
-require 'aerospike/privilege'
-require 'aerospike/role'
+require "aerospike/cluster"
+require "aerospike/cluster/create_connection"
+require "aerospike/cluster/find_nodes_to_remove"
+require "aerospike/cluster/find_node"
+require "aerospike/cluster/partition"
+require "aerospike/cluster/partition_parser"
+require "aerospike/cluster/rack_parser"
+require "aerospike/node"
+require "aerospike/node/generation"
+require "aerospike/node/rebalance"
+require "aerospike/node/refresh/failed"
+require "aerospike/node/refresh/friends"
+require "aerospike/node/refresh/info"
+require "aerospike/node/refresh/partitions"
+require "aerospike/node/refresh/racks"
+require "aerospike/node/refresh/peers"
+require "aerospike/node/refresh/reset"
+require "aerospike/node/verify/cluster_name"
+require "aerospike/node/verify/name"
+require "aerospike/node/verify/partition_generation"
+require "aerospike/node/verify/rebalance_generation"
+require "aerospike/node/verify/peers_generation"
+require "aerospike/node_validator"
+require "aerospike/peer"
+require "aerospike/peers"
+require "aerospike/peers/fetch"
+require "aerospike/peers/parse"
+require "aerospike/info"
+require "aerospike/udf"
+require "aerospike/bin"
+require "aerospike/aerospike_exception"
+require "aerospike/user_role"
+require "aerospike/privilege"
+require "aerospike/role"
 
-require 'aerospike/task/index_task'
-require 'aerospike/task/execute_task'
-require 'aerospike/task/udf_remove_task'
-require 'aerospike/task/udf_register_task'
-require 'aerospike/task/task'
-require 'aerospike/language'
+require "aerospike/task/index_task"
+require "aerospike/task/execute_task"
+require "aerospike/task/udf_remove_task"
+require "aerospike/task/udf_register_task"
+require "aerospike/task/task"
+require "aerospike/language"
 
-require 'aerospike/query/recordset'
-require 'aerospike/query/filter'
-require 'aerospike/query/stream_command'
-require 'aerospike/query/query_command'
-require 'aerospike/query/scan_command'
-require 'aerospike/query/statement'
-require 'aerospike/query/pred_exp'
-require 'aerospike/query/partition_tracker'
-require 'aerospike/query/partition_status'
-require 'aerospike/query/partition_filter'
-require 'aerospike/query/node_partitions'
-require 'aerospike/query/scan_executor'
-require 'aerospike/query/scan_partition_command'
-require 'aerospike/query/query_executor'
-require 'aerospike/query/query_partition_command'
+require "aerospike/query/recordset"
+require "aerospike/query/filter"
+require "aerospike/query/stream_command"
+require "aerospike/query/query_command"
+require "aerospike/query/scan_command"
+require "aerospike/query/statement"
+require "aerospike/query/pred_exp"
+require "aerospike/query/partition_tracker"
+require "aerospike/query/partition_status"
+require "aerospike/query/partition_filter"
+require "aerospike/query/node_partitions"
+require "aerospike/query/scan_executor"
+require "aerospike/query/scan_partition_command"
+require "aerospike/query/query_executor"
+require "aerospike/query/query_partition_command"
 
-require 'aerospike/query/pred_exp/and_or'
-require 'aerospike/query/pred_exp/geo_json_value'
-require 'aerospike/query/pred_exp/integer_value'
-require 'aerospike/query/pred_exp/op'
-require 'aerospike/query/pred_exp/regex'
-require 'aerospike/query/pred_exp/regex_flags'
-require 'aerospike/query/pred_exp/string_value'
+require "aerospike/exp/exp"
+require "aerospike/exp/exp_map"
+require "aerospike/exp/exp_list"
+require "aerospike/exp/exp_bit"
+require "aerospike/exp/exp_hll"
+require "aerospike/exp/operation"
+
+require "aerospike/query/pred_exp/and_or"
+require "aerospike/query/pred_exp/geo_json_value"
+require "aerospike/query/pred_exp/integer_value"
+require "aerospike/query/pred_exp/op"
+require "aerospike/query/pred_exp/regex"
+require "aerospike/query/pred_exp/regex_flags"
+require "aerospike/query/pred_exp/string_value"
 
 module Aerospike
   extend Loggable