aerospike 2.14.0 → 2.19.0

data/lib/aerospike/cdt/map_order.rb

@@ -20,15 +20,15 @@ module Aerospike
 
       ##
       # Map is not ordered. This is the default.
-      UNORDERED = 0
+      UNORDERED = {attr: 0, flag: 0x40}
 
       ##
       # Order map by key.
-      KEY_ORDERED = 1
+      KEY_ORDERED = {attr: 1, flag: 0x80}
 
       ##
       # Order map by key, then value.
-      KEY_VALUE_ORDERED = 3
+      KEY_VALUE_ORDERED = {attr: 3, flag: 0xc0}
 
       ##
       # Default order

data/lib/aerospike/client.rb

@@ -44,6 +44,7 @@ module Aerospike
     attr_accessor :default_read_policy
     attr_accessor :default_scan_policy
     attr_accessor :default_write_policy
+    attr_accessor :default_operate_policy
     attr_accessor :cluster
 
     def initialize(hosts = nil, policy: ClientPolicy.new, connect: true)
@@ -232,7 +233,7 @@ module Aerospike
         str_cmd = "truncate:namespace=#{namespace}"
         str_cmd << ";set=#{set_name}" unless set_name.to_s.strip.empty?
       else
-        if node.supports_feature(Aerospike::Features::TRUNCATE_NAMESPACE)
+        if node.supports_feature?(Aerospike::Features::TRUNCATE_NAMESPACE)
           str_cmd = "truncate-namespace:namespace=#{namespace}"
         else
           str_cmd = "truncate:namespace=#{namespace}"
@@ -383,7 +384,7 @@ module Aerospike
     #  read the result, all in one database call. Operations are executed in
     #  the order they are specified.
     def operate(key, operations, options = nil)
-      policy = create_policy(options, WritePolicy, default_write_policy)
+      policy = create_policy(options, OperatePolicy, default_operate_policy)
 
       command = OperateCommand.new(@cluster, policy, key, operations)
       execute_command(command)
@@ -827,6 +828,7 @@ module Aerospike
       self.default_query_policy = create_policy(policies[:query], QueryPolicy)
       self.default_scan_policy = create_policy(policies[:scan], ScanPolicy)
       self.default_write_policy = create_policy(policies[:write], WritePolicy)
+      self.default_operate_policy = create_policy(policies[:operate], OperatePolicy)
     end
 
     def send_info_command(policy, command, node = nil)

data/lib/aerospike/cluster.rb

@@ -18,7 +18,6 @@
 # the License.
 
 require 'set'
-require 'timeout'
 
 require 'aerospike/atomic/atomic'
 
@@ -428,6 +427,7 @@ module Aerospike
 
     def wait_till_stablized
       count = -1
+      done = false
 
       # will run until the cluster is stablized
       thr = Thread.new do
@@ -438,20 +438,20 @@ module Aerospike
           # If not, assume cluster has stabilized and return.
           break if count == nodes.length
 
-          sleep(0.001) # sleep for a miliseconds
+          # Break if timed out
+          break if done
+
+          sleep(0.001) # sleep for a milisecond
 
           count = nodes.length
         end
       end
 
       # wait for the thread to finish or timeout
-      begin
-        Timeout.timeout(@connection_timeout) do
-          thr.join
-        end
-      rescue Timeout::Error
-        thr.kill if thr.alive?
-      end
+      thr.join(@connection_timeout)
+      done = true
+      sleep(0.001)
+      thr.kill if thr.alive?
 
       @closed.value = false if @cluster_nodes.length > 0
     end

data/lib/aerospike/command/command.rb

@@ -59,6 +59,9 @@ module Aerospike
   # Create only. Fail if record already exists.
   INFO2_CREATE_ONLY = Integer(1 << 5)
 
+  # Return a result for every operation.
+  INFO2_RESPOND_ALL_OPS = Integer(1 << 7)
+
   # This is the last of a multi-part message.
   INFO3_LAST = Integer(1 << 0)
   # Commit to master only before declaring success.
@@ -254,10 +257,12 @@ module Aerospike
       read_attr = 0
       write_attr = 0
       read_header = false
+      record_bin_multiplicity = policy.record_bin_multiplicity == RecordBinMultiplicity::ARRAY
 
       operations.each do |operation|
         case operation.op_type
-        when Aerospike::Operation::READ
+        when Aerospike::Operation::READ, Aerospike::Operation::CDT_READ, 
+              Aerospike::Operation::HLL_READ, Aerospike::Operation::BIT_READ
           read_attr |= INFO1_READ
 
           # Read all bins if no bin is specified.
@@ -271,17 +276,22 @@ module Aerospike
           read_attr |= INFO1_READ
           read_header = true
 
-        when Aerospike::Operation::CDT_READ
-          read_attr |= INFO1_READ
-
         else
           write_attr = INFO2_WRITE
         end
 
+        if [Aerospike::Operation::HLL_MODIFY, Aerospike::Operation::HLL_READ, 
+              Aerospike::Operation::BIT_MODIFY, Aerospike::Operation::BIT_READ].include?(operation.op_type)
+          record_bin_multiplicity = true
+        end
+
         estimate_operation_size_for_operation(operation)
       end
       size_buffer
 
+
+      write_attr |= INFO2_RESPOND_ALL_OPS if write_attr != 0 && record_bin_multiplicity
+
       if write_attr != 0
         write_header_with_policy(policy, read_attr, write_attr, field_count, operations.length)
       else
@@ -436,10 +446,14 @@ module Aerospike
           @node = get_node
           @conn = @node.get_connection(@policy.timeout)
         rescue => e
-          # Socket connection error has occurred. Decrease health and retry.
-          @node.decrease_health
+          if @node
+            # Socket connection error has occurred. Decrease health and retry.
+            @node.decrease_health
 
-          Aerospike.logger.error("Node #{@node.to_s}: #{e}")
+            Aerospike.logger.error("Node #{@node.to_s}: #{e}")
+          else
+            Aerospike.logger.error("No node available for transaction: #{e}")
+          end
           next
         end
 

data/lib/aerospike/features.rb

@@ -42,5 +42,8 @@ module Aerospike
 
     # Server supports the "truncate-namespace" command
     TRUNCATE_NAMESPACE = :"truncate-namespace"
+
+    # Server supports the "blob-bits" command
+    BLOB_BITS = :"blob-bits"
   end
 end

data/lib/aerospike/operation.rb

@@ -20,7 +20,7 @@ module Aerospike
 
   class Operation
 
-    attr_reader :op_type, :bin_name, :bin_value
+    attr_reader :op_type, :bin_name, :bin_value, :ctx
 
     READ        = 1
     READ_HEADER = 1
@@ -31,12 +31,17 @@ module Aerospike
     APPEND      = 9
     PREPEND     = 10
     TOUCH       = 11
+    BIT_READ    = 12
+    BIT_MODIFY  = 13
     DELETE      = 14
+    HLL_READ    = 15
+    HLL_MODIFY  = 16
 
-    def initialize(op_type, bin_name=nil, bin_value=NullValue.new)
+    def initialize(op_type, bin_name=nil, bin_value=NullValue.new, ctx = nil)
       @op_type = op_type
       @bin_name = bin_name
       @bin_value = Value.of(bin_value)
+      @ctx = ctx
       self
     end
 

data/lib/aerospike/policy/replica.rb

@@ -31,7 +31,7 @@ module Aerospike
     # Try node on the same rack as the client first.  If there are no nodes on the
     # same rack, use SEQUENCE instead.
     #
-    # ClientPolicy#rack_aware}, ClientPolicy#rack_id, and server rack
+    # ClientPolicy#rack_aware, ClientPolicy#rack_id, and server rack
     # configuration must also be set to enable this functionality.
     PREFER_RACK = 3
 

data/lib/aerospike/result_code.rb

@@ -60,6 +60,10 @@ module Aerospike
     # exists.
     KEY_EXISTS_ERROR = 5
 
+    # Bin already exists on a create-only operation.
+    BIN_EXISTS_ERROR = 6
+
+
     # Expected cluster ID was not received.
     CLUSTER_KEY_MISMATCH = 7
 
@@ -91,6 +95,9 @@ module Aerospike
     # Unsupported Server Feature (e.g. Scan + UDF)
     UNSUPPORTED_FEATURE = 16
 
+    # Bin not found on update-only operation.
+    BIN_NOT_FOUND = 17
+
     # Specified bin name does not exist in record.
     DEVICE_OVERLOAD = 18
 
@@ -122,11 +129,19 @@ module Aerospike
     # The transaction was not performed because the predexp was false.
     FILTERED_OUT = 27
 
+    # Write command loses conflict to XDR.
+    LOST_CONFLICT = 28
+
     # There are no more records left for query.
     QUERY_END = 50
 
+    # Security functionality not supported by connected server.
     SECURITY_NOT_SUPPORTED = 51
+
+    # Security functionality not enabled by connected server.
     SECURITY_NOT_ENABLED = 52
+
+    # Security scheme not supported.
     SECURITY_SCHEME_NOT_SUPPORTED = 53
 
     # Administration command is invalid.
@@ -155,6 +170,9 @@ module Aerospike
     # Security credential is invalid.
     INVALID_CREDENTIAL = 65
 
+    # Expired session token.
+    EXPIRED_SESSION = 66
+
     # Role name is invalid.
     INVALID_ROLE = 70
 
@@ -164,15 +182,48 @@ module Aerospike
     # Privilege is invalid.
     INVALID_PRIVILEGE = 72
 
+    # Specified IP whitelist is invalid.
+    INVALID_WHITELIST = 73
+
     # User must be authentication before performing database operations.
     NOT_AUTHENTICATED = 80
 
     # User does not posses the required role to perform the database operation.
     ROLE_VIOLATION = 81
 
+    # Client IP address is not on the IP whitelist.
+    NOT_WHITELISTED = 82
+
+    # LDAP feature not enabled on server.
+    LDAP_NOT_ENABLED = 90
+
+    # Error in LDAP setup.
+    LDAP_SETUP = 91
+
+    # Error in LDAP TLS setup.
+    LDAP_TLS_SETUP = 92
+
+    # Error authenticating LDAP user.
+    LDAP_AUTHENTICATION = 93
+
+    # Error querying LDAP server.
+    LDAP_QUERY = 94
+
     # A user defined function returned an error code.
     UDF_BAD_RESPONSE = 100
 
+    # Batch functionality has been disabled by configuring the batch-index-thread=0.
+    BATCH_DISABLED = 150
+
+    # Batch max requests has been exceeded.
+    BATCH_MAX_REQUESTS = 151
+
+    # All batch queues are full.
+    BATCH_QUEUES_FULL = 152
+
+    # GeoJSON is malformed or not supported.
+    INVALID_GEOJSON = 160
+
     # Secondary index already exists.
     INDEX_FOUND = 200
 
@@ -206,6 +257,12 @@ module Aerospike
     # Generic query error.
     QUERY_GENERIC = 213
 
+    # Network error. Query is aborted.
+    QUERY_NET_IO = 214
+
+    # Internal error.
+    QUERY_DUPLICATE = 215
+
     def self.message(code)
       case code
       when COMMAND_REJECTED
@@ -244,6 +301,9 @@ module Aerospike
       when KEY_EXISTS_ERROR
         "Key already exists"
 
+      when BIN_EXISTS_ERROR
+        "Bin already exists on a create-only operation"
+
       when CLUSTER_KEY_MISMATCH
         "Cluster key mismatch"
 
@@ -274,6 +334,9 @@ module Aerospike
       when UNSUPPORTED_FEATURE
         "Unsupported Server Feature"
 
+      when BIN_NOT_FOUND
+        "Bin not found on update-only operation"
+
       when DEVICE_OVERLOAD
         "Device overload"
 
@@ -304,6 +367,9 @@ module Aerospike
       when FILTERED_OUT
         "The transaction was not performed because the predexp was false."
 
+      when LOST_CONFLICT
+        "Write command loses conflict to XDR."
+
       when QUERY_END
         "Query end"
 
@@ -343,6 +409,9 @@ module Aerospike
       when INVALID_CREDENTIAL
         "Invalid credential"
 
+      when EXPIRED_SESSION
+        "Expired session token"
+
       when INVALID_ROLE
         "Invalid role"
 
@@ -352,15 +421,48 @@ module Aerospike
       when INVALID_PRIVILEGE
         "Invalid privilege"
 
+      when INVALID_WHITELIST
+        "Specified IP whitelist is invalid"
+
       when NOT_AUTHENTICATED
         "Not authenticated"
 
       when ROLE_VIOLATION
         "Role violation"
 
+      when NOT_WHITELISTED
+        "Client IP address is not on the IP whitelist"
+
+      when LDAP_NOT_ENABLED
+        "LDAP feature not enabled on server"
+
+      when LDAP_SETUP
+        "Error in LDAP setup"
+
+      when LDAP_TLS_SETUP
+        "Error in LDAP TLS setup"
+
+      when LDAP_AUTHENTICATION
+        "Error authenticating LDAP user"
+
+      when LDAP_QUERY
+        "Error querying LDAP server"
+
       when UDF_BAD_RESPONSE
         "UDF d error"
 
+      when BATCH_DISABLED
+        "Batch functionality has been disabled by configuring the batch-index-thread=0"
+
+      when BATCH_MAX_REQUESTS
+        "Batch max requests has been exceeded"
+
+      when BATCH_QUEUES_FULL
+        "All batch queues are full"
+
+      when INVALID_GEOJSON
+        "GeoJSON is malformed or not supported"
+
       when INDEX_FOUND
         "Index already exists"
 
@@ -394,6 +496,12 @@ module Aerospike
       when QUERY_GENERIC
         "Query error"
 
+      when QUERY_NET_IO
+        "Network error. Query is aborted"
+
+      when QUERY_DUPLICATE
+        "Internal query error"
+
       else
         "ResultCode #{code} unknown in the client. Please file a github issue."
       end # case

data/lib/aerospike/utils/unpacker.rb

@@ -92,9 +92,9 @@ module Aerospike
         end
         value
       when Array
-        normalize_strings_in_array(elem)
+        unpack_list(elem)
       when Hash
-        normalize_strings_in_map(elem)
+        unpack_map(elem)
       else
         elem
       end

data/lib/aerospike/value/particle_type.rb

@@ -36,7 +36,7 @@ module Aerospike
     #RTA_DICT = 15
     #RTA_APPEND_DICT = 16
     #RTA_APPEND_LIST = 17
-    #LUA_BLOB = 18
+    HLL = 18
     MAP = 19
     LIST = 20
     GEOJSON = 23

data/lib/aerospike/value/value.rb

@@ -23,14 +23,24 @@ module Aerospike
   # Polymorphic value classes used to efficiently serialize objects into the wire protocol.
   class Value #:nodoc:
 
-    def self.of(value)
+    def self.of(value, allow_64bits = false)
       case value
       when Integer
-        if value.bit_length < 64
-          res = IntegerValue.new(value)
+        if !allow_64bits
+          if value.bit_length < 64
+            res = IntegerValue.new(value)
+          else
+            # big nums > 2**63 are not supported
+            raise Aerospike::Exceptions::Aerospike.new(Aerospike::ResultCode::TYPE_NOT_SUPPORTED, "Value type #{value.class} not supported with more than 64 bits.")
+          end
         else
-          # big nums > 2**63 are not supported
-          raise Aerospike::Exceptions::Aerospike.new(Aerospike::ResultCode::TYPE_NOT_SUPPORTED, "Value type #{value.class} not supported.")
+          # used in bitwise operations
+          if value.bit_length <= 64
+            res = IntegerValue.new(value)
+          else
+            # nums with more than 64 bits are not supported
+            raise Aerospike::Exceptions::Aerospike.new(Aerospike::ResultCode::TYPE_NOT_SUPPORTED, "Value type #{value.class} not supported with more than 64 bits.")
+          end
         end
       when Float
         res = FloatValue.new(value)
@@ -48,6 +58,8 @@ module Aerospike
         res = GeoJSONValue.new(value)
       when nil
         res = NULL
+      when TrueClass, FalseClass
+        res = BoolValue.new(value)
       else
         # throw an exception for anything that is not supported.
         raise Aerospike::Exceptions::Aerospike.new(Aerospike::ResultCode::TYPE_NOT_SUPPORTED, "Value type #{value.class} not supported.")
@@ -526,6 +538,49 @@ module Aerospike
 
   end
 
+  # #######################################/
+
+  # HLLValue value. Encapsulates a HyperLogLog value.
+  # Supported by Aerospike server version 4.9 and later.
+  class HLLValue < Value #:nodoc:
+
+    def initialize(value)
+      @bytes = value
+      @bytes.force_encoding('binary')
+
+      self
+    end
+
+    def type
+      Aerospike::ParticleType::HLL
+    end
+
+    def get
+      self
+    end
+
+    def to_s
+      @bytes.to_s
+    end
+
+    def to_bytes
+      @bytes
+    end
+
+    def estimate_size
+      @bytes.bytesize
+    end
+
+    def write(buffer, offset)
+      buffer.write_binary(@bytes, offset)
+    end
+
+    def pack(packer)
+      packer.write(Aerospike::ParticleType::BLOB.chr + @bytes)
+    end
+
+  end
+
   #######################################
 
   def self.encoding
@@ -572,6 +627,10 @@ module Aerospike
       hdrsz = 1 + 2 + (ncells * 8)
       Aerospike::GeoJSON.new(buf.read(offset + hdrsz, length - hdrsz))
 
+    when Aerospike::ParticleType::HLL
+      bytes = buf.read(offset,length)
+      Aerospike::HLLValue.new(bytes)
+
     else
       nil
     end
@@ -593,4 +652,47 @@ module Aerospike
       nil
     end
   end
+
+  private
+
+  #######################################
+
+  # Boolean value.
+  # This is private, and only used internally for bitwise CDTs
+  class BoolValue < Value #:nodoc:
+
+    def initialize(val)
+      @value = val || false
+      self
+    end
+
+    def estimate_size
+      1
+    end
+
+    def write(buffer, offset)
+      raise Exception.new("Unreachable")
+    end
+
+    def pack(packer)
+      packer.write(@value)
+    end
+
+    def type
+      raise Exception.new("Unreachable")
+    end
+
+    def get
+      @value
+    end
+
+    def to_bytes
+      raise Exception.new("Unreachable")
+    end
+
+    def to_s
+      @value.to_s
+    end
+
+  end # BoolValue
 end # module