aerospike 2.16.0 → 2.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71a4730468bf7f38257303515a01945e1221d25f98b35f28d7aa9c0d74e06e3b
-  data.tar.gz: 1bf1fd2c18697d5e7adda3cc5df5b5fdea7ecd2c7f6c81950c7a4f9dbba06ead
+  metadata.gz: bed472fc5bda556a4f67f2d6e4e0ee8a82188253b34e0bfab3a0b05be3526d2e
+  data.tar.gz: 4a11f36509d86792412e764ef978ec6e27753eab2a96e65353b73786ea383591
 SHA512:
-  metadata.gz: 4aeaddd24ad85bc4178973cfe865410536b8aaa2030486715d1495c380438a7e9b5980a36f953623f9da85b4f6ef497273797baad99e0e1af259faf1a6d64c6a
-  data.tar.gz: 899f9ff5ddf4be0085dd6783f382278948f9e466778590e939a8f097b91432745001c65b6bf7ed3494056296a1c80ce1bbba5a9a6473b982101a99c839ea1168
+  metadata.gz: fa02cbf6bc8e6065e80849e5dcbe71d91550eb549c77af53c761df2e969d7f3135ea3641dcc8af28bd98d5f3e46ab868e61f4e61023c70f0a400e99c93747a00
+  data.tar.gz: 47f9d0da4d7099b2e96992012deb79292c4de7d8bbd8fa9ca3a362dc5aa126841887d3eef8f0f0f15e176190a729dde8377f486f3c0ef357b312ab43569b31ce

data/CHANGELOG.md

@@ -2,6 +2,40 @@
 
 All notable changes to this project will be documented in this file.
 
+## [2.20.0] - 2020-11-08
+
+Notice: This version of the client only supports Aerospike Server v4.9 and later. Some features will work for the older server versions, but they are not tested, nor officially supported.
+
+* **New Features**
+  * [CLIENT-1467] Support native Boolean type for server v5.6+.
+
+* **Improvements**
+  * Add basic support for server v4.9+ scan/queries.
+  * Don't check for key equality in Batch command results.
+
+## [2.19.0] - 2020-02-09
+
+* **Improvements**
+  * Remove Timeout in `wait_till_stabilized` in favor of `thread.join(timeout)` . Thanks to [Marcelo](https://github.com/MarcPer) [[#104](https://github.com/aerospike/aerospike-client-ruby/pull/104)]
+  * Adds `ResultCode::LOST_CONFLICT`
+
+## [2.18.0] - 2020-12-01
+
+* **Bug Fixes**
+  * Avoid panic if `Command#get_node` fails in `Command#execute`. Resolves issue #101.
+  * Fix wrong method invocation inside `Client#truncate` method. Thanks to [Alexander](https://github.com/selivandex)
+
+* **Improvements**
+  * Added missing server error codes.
+
+## [2.17.0] - 2020-10-15
+
+* **New Features**
+  * [CLIENT-1246] Adds missing API for Context#list_index_create and Context#map_key_create
+
+* **Bug Fixes**
+  * Fixed an issue were MsgPack extensions were not recursively cleared from the CDTs during unpacking.
+
 ## [2.16.0] - 2020-10-12
 
 * **New Features**
@@ -46,7 +80,7 @@ All notable changes to this project will be documented in this file.
 
 * **Improvements**
   * Optimize serialization for nested structures. Thanks to [@Kacper Madej](https://github.com/madejejej)! [[#94](https://github.com/aerospike/aerospike-client-ruby/pull/94)]
-  * Remove `Thread#abort_on_exception` from `batch_index_command`. Thanks to [@Kacper Madej](https://github.com/madejejej)! [[#94](https://github.com/aerospike/aerospike-client-ruby/pull/92)]
+  * Remove `Thread#abort_on_exception` from `batch_index_command`. Thanks to [@Kacper Madej](https://github.com/madejejej)! [[#92](https://github.com/aerospike/aerospike-client-ruby/pull/92)]
   * Does not allow values other than Integer, Float, String, Symbol and nil to be used as keys in Maps.
 
 * **Bug Fixes**

data/lib/aerospike/cdt/context.rb

@@ -34,6 +34,12 @@ module Aerospike
         @value = value
       end
 
+      ##
+      # Create list with given type at index offset, given an order and pad.
+      def self.list_index_create(index, order, pad)
+      Context.new(0x10 | ListOrder.flag(order, pad), index)
+      end
+
 	  ##
 	  # Lookup list by index offset.
 	  # If the index is negative, the resolved index starts backwards from end of list.
@@ -90,6 +96,12 @@ module Aerospike
 	  	Context.new(0x22, key)
 	  end
 	  
+      ##
+      # Create map with given type at map key.
+      def self.map_key_create(key, order)
+        Context.new(0x22 | order[:flag], key)
+      end
+
 	  ##
 	  # Lookup map by value.
 	  def self.map_value(key)

data/lib/aerospike/cdt/list_operation.rb

@@ -84,18 +84,33 @@ module Aerospike
       REMOVE_BY_RANK_RANGE = 39
       REMOVE_BY_VALUE_REL_RANK_RANGE = 40
 
-      attr_reader :list_op, :arguments, :policy, :return_type, :ctx
+      attr_reader :list_op, :arguments, :policy, :return_type, :ctx, :flag
 
-      def initialize(op_type, list_op, bin_name, *arguments, return_type: nil, ctx: nil)
+      def initialize(op_type, list_op, bin_name, *arguments, return_type: nil, ctx: nil, flag: nil)
         @op_type = op_type
         @bin_name = bin_name
         @bin_value = nil
         @list_op = list_op
         @ctx = ctx
+        @flag = flag
         @arguments = arguments
         @return_type = return_type
       end
 
+      ##
+      # creates list create operation.
+      # Server creates list at given context level. The context is allowed to be beyond list
+      # boundaries only if pad is set to true.  In that case, nil list entries will be inserted to
+      # satisfy the context position.
+      def self.create(bin_name, order, pad, ctx: nil)
+        # If context not defined, the set order for top-level bin list.
+        if !ctx || ctx.length == 0
+          self.set_order(bin_name, order)
+        else
+          ListOperation.new(Operation::CDT_MODIFY, SET_TYPE, bin_name, order, ctx: ctx, flag: ListOrder.flag(order, pad))
+        end
+      end
+
       ##
       #  Create a set list order operation.
       #  Server sets list order.
@@ -504,11 +519,7 @@ module Aerospike
             packer.write_array_header(3)
             Value.of(0xff).pack(packer)
 
-            packer.write_array_header(@ctx.length*2)
-            @ctx.each do |ctx|
-              Value.of(ctx.id).pack(packer)
-              Value.of(ctx.value).pack(packer)
-            end
+            pack_context(packer)
 
             packer.write_array_header(args.length+1)
             Value.of(@list_op).pack(packer)
@@ -529,6 +540,24 @@ module Aerospike
         end
         BytesValue.new(bytes)
       end
+
+      def pack_context(packer)
+        packer.write_array_header(@ctx.length*2)
+        if @flag
+          (1...@ctx.length).each do |i|
+            Value.of(@ctx[i].id).pack(packer)
+            Value.of(@ctx[i].value).pack(packer)
+          end
+
+          Value.of(@ctx[-1].id | @flag).pack(packer)
+          Value.of(@ctx[-1].value).pack(packer)
+        else
+          @ctx.each do |ctx|
+            Value.of(ctx.id).pack(packer)
+            Value.of(ctx.value).pack(packer)
+          end
+        end
+      end
     end
 
     class InvertibleListOp < ListOperation

data/lib/aerospike/cdt/list_order.rb

@@ -32,6 +32,13 @@ module Aerospike
       ##
       # Default order
       DEFAULT = UNORDERED
+
+      private
+
+      def self.flag(attributes, pad)
+        (attributes == 1) ? 0xc0 : (pad ? 0x80 : 0x40)
+      end
+
     end
   end
 end

data/lib/aerospike/cdt/map_operation.rb

@@ -96,26 +96,39 @@ module Aerospike
       GET_BY_KEY_REL_INDEX_RANGE = 109
       GET_BY_VALUE_REL_RANK_RANGE = 110
 
-      attr_reader :map_op, :arguments, :return_type, :ctx
+      attr_reader :map_op, :arguments, :return_type, :ctx, :flag
 
-      def initialize(op_type, map_op, bin_name, *arguments, ctx: nil, return_type: nil)
+      def initialize(op_type, map_op, bin_name, *arguments, ctx: nil, return_type: nil, flag: nil)
         @op_type = op_type
         @bin_name = bin_name
         @bin_value = nil
         @map_op = map_op
         @ctx = ctx
+        @flag = flag
         @arguments = arguments
         @return_type = return_type
         self
       end
 
+      ##
+      # Creates a map create operation.
+      # Server creates map at given context level.
+      def self.create(bin_name, order, ctx: nil)
+        if !ctx || ctx.length == 0
+          # If context not defined, the set order for top-level bin map.
+          self.set_policy(MapPolicy.new(order: order, flag: 0), bin_name)
+        else
+          MapOperation.new(Operation::CDT_MODIFY, SET_TYPE, bin_name, order[:attr], ctx: ctx, flag: order[:flag])
+        end
+      end
+
       ##
       # Create set map policy operation.
       # Server sets map policy attributes. Server returns null.
       #
       # The required map policy attributes can be changed after the map is created.
       def self.set_policy(bin_name, policy, ctx: nil)
-        MapOperation.new(Operation::CDT_MODIFY, SET_TYPE, bin_name, policy.order, ctx: ctx)
+        MapOperation.new(Operation::CDT_MODIFY, SET_TYPE, bin_name, policy.order[:attr], ctx: ctx)
       end
 
       ##
@@ -126,16 +139,16 @@ module Aerospike
       # The map policy also specifies the flags used when writing items to the map.
       def self.put(bin_name, key, value, ctx: nil, policy: MapPolicy::DEFAULT)
         if policy.flags != MapWriteFlags::DEFAULT
-          MapOperation.new(Operation::CDT_MODIFY, PUT, bin_name, key, value, policy.order, policy.flags, ctx: ctx)
+          MapOperation.new(Operation::CDT_MODIFY, PUT, bin_name, key, value, policy.order[:attr], policy.flags, ctx: ctx)
         else
           case policy.write_mode
           when MapWriteMode::UPDATE_ONLY
             # Replace doesn't allow map order because it does not create on non-existing key.
             MapOperation.new(Operation::CDT_MODIFY, REPLACE, bin_name, key, value, ctx: ctx)
           when MapWriteMode::CREATE_ONLY
-            MapOperation.new(Operation::CDT_MODIFY, ADD, bin_name, key, value, policy.order, ctx: ctx)
+            MapOperation.new(Operation::CDT_MODIFY, ADD, bin_name, key, value, policy.order[:attr], ctx: ctx)
           else
-            MapOperation.new(Operation::CDT_MODIFY, PUT, bin_name, key, value, policy.order, ctx: ctx)
+            MapOperation.new(Operation::CDT_MODIFY, PUT, bin_name, key, value, policy.order[:attr], ctx: ctx)
           end
         end
       end
@@ -148,16 +161,16 @@ module Aerospike
       # The map policy also specifies the flags used when writing items to the map.
       def self.put_items(bin_name, values, ctx: nil, policy: MapPolicy::DEFAULT)
         if policy.flags != MapWriteFlags::DEFAULT
-          MapOperation.new(Operation::CDT_MODIFY, PUT_ITEMS, bin_name, values, policy.order, policy.flags, ctx: ctx)
+          MapOperation.new(Operation::CDT_MODIFY, PUT_ITEMS, bin_name, values, policy.order[:attr], policy.flags, ctx: ctx)
         else
           case policy.write_mode
           when MapWriteMode::UPDATE_ONLY
             # Replace doesn't allow map order because it does not create on non-existing key.
             MapOperation.new(Operation::CDT_MODIFY, REPLACE_ITEMS, bin_name, values, ctx: ctx)
           when MapWriteMode::CREATE_ONLY
-            MapOperation.new(Operation::CDT_MODIFY, ADD_ITEMS, bin_name, values, policy.order, ctx: ctx)
+            MapOperation.new(Operation::CDT_MODIFY, ADD_ITEMS, bin_name, values, policy.order[:attr], ctx: ctx)
           else
-            MapOperation.new(Operation::CDT_MODIFY, PUT_ITEMS, bin_name, values, policy.order, ctx: ctx)
+            MapOperation.new(Operation::CDT_MODIFY, PUT_ITEMS, bin_name, values, policy.order[:attr], ctx: ctx)
           end
         end
       end
@@ -170,7 +183,7 @@ module Aerospike
       # The map policy dictates the type of map to create when it does not exist.
       # The map policy also specifies the mode used when writing items to the map.
       def self.increment(bin_name, key, incr, ctx: nil, policy: MapPolicy::DEFAULT)
-        MapOperation.new(Operation::CDT_MODIFY, INCREMENT, bin_name, key, incr, policy.order, ctx: ctx)
+        MapOperation.new(Operation::CDT_MODIFY, INCREMENT, bin_name, key, incr, policy.order[:attr], ctx: ctx)
       end
 
       ##
@@ -181,7 +194,7 @@ module Aerospike
       # The map policy dictates the type of map to create when it does not exist.
       # The map policy also specifies the mode used when writing items to the map.
       def self.decrement(bin_name, key, decr, ctx: nil, policy: MapPolicy::DEFAULT)
-        MapOperation.new(Operation::CDT_MODIFY, DECREMENT, bin_name, key, decr, policy.order, ctx: ctx)
+        MapOperation.new(Operation::CDT_MODIFY, DECREMENT, bin_name, key, decr, policy.order[:attr], ctx: ctx)
       end
 
       ##
@@ -626,11 +639,7 @@ module Aerospike
             packer.write_array_header(3)
             Value.of(0xff).pack(packer)
 
-            packer.write_array_header(@ctx.length*2)
-            @ctx.each do |ctx|
-              Value.of(ctx.id).pack(packer)
-              Value.of(ctx.value).pack(packer)
-            end
+            pack_context(packer)
 
             packer.write_array_header(args.length+1)
             Value.of(@map_op).pack(packer)
@@ -651,6 +660,23 @@ module Aerospike
         BytesValue.new(bytes)
       end
 
+      def pack_context(packer)
+        packer.write_array_header(@ctx.length*2)
+        if @flag
+          (1...@ctx.length).each do |i|
+            Value.of(@ctx[i].id).pack(packer)
+            Value.of(@ctx[i].value).pack(packer)
+          end
+
+          Value.of(@ctx[-1].id | @flag).pack(packer)
+          Value.of(@ctx[-1].value).pack(packer)
+        else
+          @ctx.each do |ctx|
+            Value.of(ctx.id).pack(packer)
+            Value.of(ctx.value).pack(packer)
+          end
+        end
+      end
     end
 
   end

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

@@ -233,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}"
@@ -543,10 +543,11 @@ module Aerospike
 
       # Use a thread per node
       nodes.each do |node|
+        partitions = node.cluster.node_partitions(node, statement.namespace)
         Thread.new do
           Thread.current.abort_on_exception = true
           begin
-            command = QueryCommand.new(node, policy, statement, nil)
+            command = QueryCommand.new(node, policy, statement, nil, partitions)
             execute_command(command)
           rescue => e
             Aerospike.logger.error(e)
@@ -644,9 +645,10 @@ module Aerospike
       if policy.concurrent_nodes
         # Use a thread per node
         nodes.each do |node|
+          partitions = node.cluster.node_partitions(node, namespace)
           Thread.new do
             Thread.current.abort_on_exception = true
-            command = ScanCommand.new(node, new_policy, namespace, set_name, bin_names, recordset)
+            command = ScanCommand.new(node, new_policy, namespace, set_name, bin_names, recordset, partitions)
             begin
               execute_command(command)
             rescue => e
@@ -661,7 +663,8 @@ module Aerospike
         Thread.new do
           Thread.current.abort_on_exception = true
           nodes.each do |node|
-            command = ScanCommand.new(node, new_policy, namespace, set_name, bin_names, recordset)
+            partitions = node.cluster.node_partitions(node, namespace)
+            command = ScanCommand.new(node, new_policy, namespace, set_name, bin_names, recordset, partitions)
             begin
               execute_command(command)
             rescue => e
@@ -694,9 +697,10 @@ module Aerospike
 
       recordset = Recordset.new(policy.record_queue_size, 1, :scan)
 
+      partitions = node.cluster.node_partitions(node, namespace)
       Thread.new do
         Thread.current.abort_on_exception = true
-        command = ScanCommand.new(node, new_policy, namespace, set_name, bin_names, recordset)
+        command = ScanCommand.new(node, new_policy, namespace, set_name, bin_names, recordset, partitions)
         begin
           execute_command(command)
         rescue => e
@@ -734,9 +738,10 @@ module Aerospike
 
       # Use a thread per node
       nodes.each do |node|
+        partitions = node.cluster.node_partitions(node, statement.namespace)
         Thread.new do
           Thread.current.abort_on_exception = true
-          command = QueryCommand.new(node, new_policy, statement, recordset)
+          command = QueryCommand.new(node, new_policy, statement, recordset, partitions)
           begin
             execute_command(command)
           rescue => e

data/lib/aerospike/cluster.rb

@@ -18,7 +18,6 @@
 # the License.
 
 require 'set'
-require 'timeout'
 
 require 'aerospike/atomic/atomic'
 
@@ -231,6 +230,27 @@ module Aerospike
       batch_read_node(partition, replica_policy)
     end
 
+    # Returns partitions pertaining to a node
+    def node_partitions(node, namespace)
+      res = []
+
+      partition_map = partitions
+      replica_array = partition_map[namespace]
+      raise Aerospike::Exceptions::InvalidNamespace("namespace not found in the partition map") if !replica_array
+
+      node_array = (replica_array.get)[0]
+      raise Aerospike::Exceptions::InvalidNamespace("namespace not found in the partition map") if !node_array
+
+
+      pid = 0
+      for tnode in node_array.get
+        res << pid if node == tnode
+        pid+=1
+      end
+
+      res
+    end
+
     # Returns a random node on the cluster
     def random_node
       # Must copy array reference for copy on write semantics to work.
@@ -428,6 +448,7 @@ module Aerospike
 
     def wait_till_stablized
       count = -1
+      done = false
 
       # will run until the cluster is stablized
       thr = Thread.new do
@@ -438,20 +459,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/batch_index_command.rb

@@ -110,16 +110,12 @@ module Aerospike
       field_count = @data_buffer.read_int16(18)
       op_count = @data_buffer.read_int16(20)
 
-      key = parse_key(field_count)
+      skip_key(field_count)
       req_key = batch.key_for_index(batch_index)
 
-      if key.digest == req_key.digest
-        if result_code == 0
-          record = parse_record(req_key, op_count, generation, expiration)
-          results[batch_index] = record
-        end
-      else
-        Aerospike.logger.warn("Unexpected batch key returned: #{key}")
+      if result_code == 0
+        record = parse_record(req_key, op_count, generation, expiration)
+        results[batch_index] = record
       end
     end
 

data/lib/aerospike/command/batch_index_exists_command.rb

@@ -36,7 +36,7 @@ module Aerospike
         raise Aerospike::Exceptions::Parse.new('Received bins that were not requested!')
       end
 
-      parse_key(field_count)
+      skip_key(field_count)
       results[batch_index] = (result_code == 0)
     end
 

data/lib/aerospike/command/command.rb

@@ -66,6 +66,8 @@ module Aerospike
   INFO3_LAST = Integer(1 << 0)
   # Commit to master only before declaring success.
   INFO3_COMMIT_MASTER = Integer(1 << 1)
+  # Partition is complete response in scan.
+  INFO3_PARTITION_DONE = Integer(1 << 2)
   # Update only. Merge bins.
   INFO3_UPDATE_ONLY = Integer(1 << 3)
 
@@ -333,7 +335,7 @@ module Aerospike
       mark_compressed(policy)
     end
 
-    def set_scan(policy, namespace, set_name, bin_names)
+    def set_scan(policy, namespace, set_name, bin_names, partitions)
       # Estimate buffer size
       begin_cmd
       field_count = 0
@@ -357,7 +359,10 @@ module Aerospike
       field_count += 1 if predexp_size > 0
 
       # Estimate scan options size.
-      @data_offset += 2 + FIELD_HEADER_SIZE
+      # @data_offset += 2 + FIELD_HEADER_SIZE
+      # field_count += 1
+
+      @data_offset += partitions.length * 2 + FIELD_HEADER_SIZE
       field_count += 1
 
       # Estimate scan timeout size.
@@ -392,24 +397,30 @@ module Aerospike
         write_field_string(set_name, Aerospike::FieldType::TABLE)
       end
 
+      write_field_header(partitions.length * 2, Aerospike::FieldType::PID_ARRAY)
+      for pid in partitions
+          @data_buffer.write_uint16_little_endian(pid, @data_offset)
+          @data_offset += 2
+      end
+
       if policy.records_per_second > 0
         write_field_int(policy.records_per_second, Aerospike::FieldType::RECORDS_PER_SECOND)
       end
 
       write_predexp(policy.predexp, predexp_size)
 
-      write_field_header(2, Aerospike::FieldType::SCAN_OPTIONS)
+      # write_field_header(2, Aerospike::FieldType::SCAN_OPTIONS)
 
-      priority = policy.priority & 0xFF
-      priority <<= 4
-      if policy.fail_on_cluster_change
-        priority |= 0x08
-      end
+      # priority = policy.priority & 0xFF
+      # priority <<= 4
+      # if policy.fail_on_cluster_change
+      #   priority |= 0x08
+      # end
 
-      @data_buffer.write_byte(priority, @data_offset)
-      @data_offset += 1
-      @data_buffer.write_byte(policy.scan_percent.to_i.ord, @data_offset)
-      @data_offset += 1
+      # @data_buffer.write_byte(priority, @data_offset)
+      # @data_offset += 1
+      # @data_buffer.write_byte(policy.scan_percent.to_i.ord, @data_offset)
+      # @data_offset += 1
 
       write_field_header(4, Aerospike::FieldType::SCAN_TIMEOUT)
       @data_buffer.write_uint32(policy.socket_timeout.to_i, @data_offset)
@@ -446,10 +457,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
 
@@ -782,6 +797,12 @@ module Aerospike
       @data_offset += len
     end
 
+    def write_u16_little_endian(i, ftype)
+      @data_buffer.write_uint16_little_endian(i, @data_offset+FIELD_HEADER_SIZE)
+      write_field_header(2, ftype)
+      @data_offset += 2
+    end
+
     def write_field_int(i, ftype)
       @data_buffer.write_int32(i, @data_offset+FIELD_HEADER_SIZE)
       write_field_header(4, ftype)

data/lib/aerospike/command/field_type.rb

@@ -32,6 +32,7 @@ module Aerospike
     SCAN_OPTIONS = 8
     SCAN_TIMEOUT = 9
     RECORDS_PER_SECOND = 10
+    PID_ARRAY = 11
     INDEX_NAME = 21
     INDEX_RANGE = 22
     INDEX_FILTER = 23

data/lib/aerospike/command/multi_command.rb

@@ -150,6 +150,23 @@ module Aerospike
       Aerospike::Key.new(namespace, set_name, user_key, digest)
     end
 
+    def skip_key(field_count)
+      # in Stream queries, there are no keys
+      return unless field_count > 0
+
+      i = 0
+      while i < field_count
+        read_bytes(4)
+
+        fieldlen = @data_buffer.read_int32(0)
+        read_bytes(fieldlen)
+
+        i = i.succ
+      end
+
+      nil
+    end
+
     # Parses the given byte buffer and populate the result object.
     # Returns the number of bytes that were parsed from the given buffer.
     def parse_record(key, op_count, generation, expiration)

data/lib/aerospike/query/query_command.rb

@@ -23,12 +23,13 @@ module Aerospike
 
   class QueryCommand < StreamCommand #:nodoc:
 
-    def initialize(node, policy, statement, recordset)
+    def initialize(node, policy, statement, recordset, partitions)
       super(node)
 
       @policy = policy
       @statement = statement
       @recordset = recordset
+      @partitions = partitions
     end
 
     def write_buffer
@@ -81,7 +82,10 @@ module Aerospike
           @data_offset += binNameSize
           fieldCount+=1
         end
-      else
+      else    
+        @data_offset += @partitions.length * 2 + FIELD_HEADER_SIZE
+        fieldCount += 1
+
         if @policy.records_per_second > 0
           @data_offset += 4 + FIELD_HEADER_SIZE
           fieldCount += 1
@@ -89,8 +93,8 @@ module Aerospike
 
         # Calling query with no filters is more efficiently handled by a primary index scan.
         # Estimate scan options size.
-        @data_offset += (2 + FIELD_HEADER_SIZE)
-        fieldCount+=1
+        # @data_offset += (2 + FIELD_HEADER_SIZE)
+        # fieldCount+=1
       end
 
       @statement.set_task_id
@@ -177,18 +181,24 @@ module Aerospike
           end
         end
       else
+        write_field_header(@partitions.length * 2, Aerospike::FieldType::PID_ARRAY)
+        for pid in @partitions
+          @data_buffer.write_uint16_little_endian(pid, @data_offset)
+          @data_offset += 2
+        end
+
         if @policy.records_per_second > 0
           write_field_int(@policy.records_per_second, Aerospike::FieldType::RECORDS_PER_SECOND)
         end
 
         # Calling query with no filters is more efficiently handled by a primary index scan.
-        write_field_header(2, Aerospike::FieldType::SCAN_OPTIONS)
-        priority = @policy.priority.ord
-        priority = priority << 4
-        @data_buffer.write_byte(priority, @data_offset)
-        @data_offset+=1
-        @data_buffer.write_byte(100.ord, @data_offset)
-        @data_offset+=1
+        # write_field_header(2, Aerospike::FieldType::SCAN_OPTIONS)
+        # priority = @policy.priority.ord
+        # priority = priority << 4
+        # @data_buffer.write_byte(priority, @data_offset)
+        # @data_offset+=1
+        # @data_buffer.write_byte(100.ord, @data_offset)
+        # @data_offset+=1
       end
 
       write_field_header(8, Aerospike::FieldType::TRAN_ID)

data/lib/aerospike/query/scan_command.rb

@@ -23,7 +23,7 @@ module Aerospike
 
   class ScanCommand < StreamCommand #:nodoc:
 
-    def initialize(node, policy, namespace, set_name, bin_names, recordset)
+    def initialize(node, policy, namespace, set_name, bin_names, recordset, partitions)
       super(node)
 
       @policy = policy
@@ -31,10 +31,11 @@ module Aerospike
       @set_name = set_name
       @bin_names = bin_names
       @recordset = recordset
+      @partitions = partitions
     end
 
     def write_buffer
-      set_scan(@policy, @namespace, @set_name, @bin_names)
+      set_scan(@policy, @namespace, @set_name, @bin_names, @partitions)
     end
 
   end # class

data/lib/aerospike/query/stream_command.rb

@@ -58,6 +58,9 @@ module Aerospike
         op_count = @data_buffer.read_int16(20)
         key = parse_key(field_count)
 
+        # If cmd is the end marker of the response, do not proceed further
+        return true if (info3 & INFO3_PARTITION_DONE) != 0
+
         if result_code == 0
           if @recordset.active?
             @recordset.records.enq(parse_record(key, op_count, generation, expiration))

data/lib/aerospike/result_code.rb

@@ -129,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.
@@ -162,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
 
@@ -171,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
 
@@ -213,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
@@ -317,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"
 
@@ -356,6 +409,9 @@ module Aerospike
       when INVALID_CREDENTIAL
         "Invalid credential"
 
+      when EXPIRED_SESSION
+        "Expired session token"
+
       when INVALID_ROLE
         "Invalid role"
 
@@ -365,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"
 
@@ -407,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/buffer.rb

@@ -33,6 +33,7 @@ module Aerospike
 
     INT16 = 's>'
     UINT16 = 'n'
+    UINT16LE = 'v'
     INT32 = 'l>'
     UINT32 = 'N'
     INT64 = 'q>'
@@ -92,6 +93,11 @@ module Aerospike
       2
     end
 
+    def write_uint16_little_endian(i, offset)
+      @buf[offset, 2] = [i].pack(UINT16LE)
+      2
+    end
+
     def write_int32(i, offset)
       @buf[offset, 4] = [i].pack(INT32)
       4
@@ -156,6 +162,10 @@ module Aerospike
       vals.unpack(DOUBLE)[0]
     end
 
+    def read_bool(offset, length)
+      length <= 0 ? false : @buf[offset].ord != 0
+    end
+
     def to_s
       @buf[0..@slice_end-1]
     end

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

@@ -23,19 +23,8 @@ module Aerospike
     DOUBLE = 2
     STRING = 3
     BLOB = 4
-    #TIMESTAMP = 5
-    #DIGEST = 6
-    #JBLOB = 7
-    #CSHARP_BLOB = 8
-    #PYTHON_BLOB = 9
     RUBY_BLOB = 10
-    #PHP_BLOB = 11
-    #ERLANG_BLOB = 12
-    #SEGMENT_POINTER = 13
-    #RTA_LIST = 14
-    #RTA_DICT = 15
-    #RTA_APPEND_DICT = 16
-    #RTA_APPEND_LIST = 17
+    BOOL = 17
     HLL = 18
     MAP = 19
     LIST = 20

data/lib/aerospike/value/value.rb

@@ -606,6 +606,9 @@ module Aerospike
     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)
 
@@ -658,7 +661,7 @@ module Aerospike
   #######################################
 
   # Boolean value.
-  # This is private, and only used internally for bitwise CDTs
+  # Supported by Aerospike server 5.6+ only.
   class BoolValue < Value #:nodoc:
 
     def initialize(val)
@@ -671,7 +674,9 @@ module Aerospike
     end
 
     def write(buffer, offset)
-      raise Exception.new("Unreachable")
+      val = @value ? 1 : 0
+      buffer.write_byte(val.ord, offset)
+      1
     end
 
     def pack(packer)
@@ -679,7 +684,7 @@ module Aerospike
     end
 
     def type
-      raise Exception.new("Unreachable")
+      Aerospike::ParticleType::BOOL
     end
 
     def get
@@ -687,7 +692,7 @@ module Aerospike
     end
 
     def to_bytes
-      raise Exception.new("Unreachable")
+      @value.ord
     end
 
     def to_s

data/lib/aerospike/version.rb

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

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: aerospike
 version: !ruby/object:Gem::Version
-  version: 2.16.0
+  version: 2.20.0
 platform: ruby
 authors:
 - Khosrow Afroozeh
 - Jan Hecking
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-12 00:00:00.000000000 Z
+date: 2021-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -210,7 +210,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key:
+signing_key: 
 specification_version: 4
 summary: An Aerospike driver for Ruby.
 test_files: []