aerospike 2.19.0 → 2.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85cdd4e1a2cbb3572cf4c84715a6a43e768e5b8b4b3adc583d45dd41280b9c31
-  data.tar.gz: faa4ae8908d9fca3798b59053a0753bf9df740ff006d6bdccaf39b45fd4b11d7
+  metadata.gz: bed472fc5bda556a4f67f2d6e4e0ee8a82188253b34e0bfab3a0b05be3526d2e
+  data.tar.gz: 4a11f36509d86792412e764ef978ec6e27753eab2a96e65353b73786ea383591
 SHA512:
-  metadata.gz: 1137414c6f8d465650d88d3169710f4c860ce1938acc24998cbdcd33abed486b238f4ce8a3aee92158a610df99db756311d5aba6617bc464db81268e41529cf6
-  data.tar.gz: 7f9e276d0d4aab9843312cb3054305a82b4b59691473e869ad1fcefb1eaacb6ee19c46c2bdacd0cc081650b474a426a0dea845c1e678e23967b66ab34294a5ff
+  metadata.gz: fa02cbf6bc8e6065e80849e5dcbe71d91550eb549c77af53c761df2e969d7f3135ea3641dcc8af28bd98d5f3e46ab868e61f4e61023c70f0a400e99c93747a00
+  data.tar.gz: 47f9d0da4d7099b2e96992012deb79292c4de7d8bbd8fa9ca3a362dc5aa126841887d3eef8f0f0f15e176190a729dde8377f486f3c0ef357b312ab43569b31ce

data/CHANGELOG.md

@@ -2,6 +2,17 @@
 
 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**

data/lib/aerospike/client.rb

@@ -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

@@ -230,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.

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)
@@ -786,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/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/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.19.0"
+  VERSION = "2.20.0"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: aerospike
 version: !ruby/object:Gem::Version
-  version: 2.19.0
+  version: 2.20.0
 platform: ruby
 authors:
 - Khosrow Afroozeh
 - Jan Hecking
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-09 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: []