aerospike 2.22.0 → 2.24.0

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, partitions)
+    def initialize(node, policy, namespace, set_name, bin_names, recordset, node_partitions)
       super(node)
 
       @policy = policy
@@ -31,11 +31,11 @@ module Aerospike
       @set_name = set_name
       @bin_names = bin_names
       @recordset = recordset
-      @partitions = partitions
+      @node_partitions = node_partitions
     end
 
     def write_buffer
-      set_scan(@policy, @namespace, @set_name, @bin_names, @partitions)
+      set_scan(@policy, @namespace, @set_name, @bin_names, @node_partitions)
     end
 
   end # class

data/lib/aerospike/query/scan_executor.rb

@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+# Copyright 2014-2020 Aerospike, Inc.
+#
+# Portions may be licensed to Aerospike, Inc. under one or more contributor
+# license agreements.
+#
+# 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.
+
+module Aerospike
+  class ScanExecutor # :nodoc:
+
+    def self.scan_partitions(policy, cluster, tracker, namespace, set_name, recordset, bin_names = nil)
+      interval = policy.sleep_between_retries
+
+      should_retry = false
+
+      loop do
+        list = tracker.assign_partitions_to_nodes(cluster, namespace)
+
+        if policy.concurrent_nodes
+          threads = []
+          # Use a thread per node
+          list.each do |node_partition|
+
+            threads << Thread.new do
+              Thread.current.abort_on_exception = true
+              command = ScanPartitionCommand.new(policy, tracker, node_partition, namespace, set_name, bin_names, recordset)
+              begin
+                command.execute
+              rescue => e
+                should_retry ||= command.should_retry(e)
+                Aerospike.logger.error(e.backtrace.join("\n")) unless e == SCAN_TERMINATED_EXCEPTION
+              end
+            end
+          end
+          threads.each(&:join)
+        else
+          # Use a single thread for all nodes for all node
+          list.each do |node_partition|
+            command = ScanPartitionCommand.new(policy, tracker, node_partition, namespace, set_name, bin_names, recordset)
+            begin
+              command.execute
+            rescue => e
+              should_retry ||= command.should_retry(e)
+              Aerospike.logger.error(e.backtrace.join("\n")) unless e == SCAN_TERMINATED_EXCEPTION
+            end
+          end
+        end
+
+        if tracker.complete?(@cluster, policy) || !should_retry
+          recordset.thread_finished
+          return
+        end
+        sleep(interval) if policy.sleep_between_retries > 0
+      end
+    end
+
+  end
+
+end

data/lib/aerospike/query/scan_partition_command.rb

@@ -0,0 +1,49 @@
+# encoding: utf-8
+# Copyright 2014-2020 Aerospike, Inc.
+#
+# Portions may be licensed to Aerospike, Inc. under one or more contributor
+# license agreements.
+#
+# 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.
+
+require 'aerospike/query/stream_command'
+require 'aerospike/query/recordset'
+
+module Aerospike
+
+  private
+
+  class ScanPartitionCommand < StreamCommand #:nodoc:
+
+    def initialize(policy, tracker, node_partitions, namespace, set_name, bin_names, recordset)
+      super(node_partitions.node)
+
+      @policy = policy
+      @namespace = namespace
+      @set_name = set_name
+      @bin_names = bin_names
+      @recordset = recordset
+      @node_partitions = node_partitions
+      @tracker = tracker
+    end
+
+    def write_buffer
+      set_scan(@policy, @namespace, @set_name, @bin_names, @node_partitions)
+    end
+
+    def should_retry(e)
+      # !! converts nil to false
+      !!@tracker&.should_retry(@node_partitions, e)
+    end
+
+  end # class
+
+end # module

data/lib/aerospike/query/statement.rb

@@ -49,7 +49,7 @@ module Aerospike
       # This method is redundant because PredExp can now be set in the base Policy for
       # any transaction (including queries).
       #
-      # NOTE : Policy.predexp takes precedence to this value. This value will be 
+      # NOTE : Policy.predexp takes precedence to this value. This value will be
       # deprecated in the future.
       @predexp = nil
 
@@ -81,6 +81,13 @@ module Aerospike
     end
   end
 
+  def reset_task_id
+    @task_id = rand(RAND_MAX)
+    while @task_id == 0
+      @task_id = rand(RAND_MAX)
+    end
+  end
+
   private
 
   RAND_MAX = 2**63

data/lib/aerospike/query/stream_command.rb

@@ -39,6 +39,8 @@ module Aerospike
         case result_code
         when Aerospike::ResultCode::OK
           # noop
+        when Aerospike::ResultCode::PARTITION_UNAVAILABLE
+          # noop
         when Aerospike::ResultCode::KEY_NOT_FOUND_ERROR
           # consume the rest of the input buffer from the socket
           read_bytes(receive_size - @data_offset) if @data_offset < receive_size
@@ -59,7 +61,16 @@ module Aerospike
         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 (info3 & INFO3_PARTITION_DONE) != 0
+          # When an error code is received, mark partition as unavailable
+          # for the current round. Unavailable partitions will be retried
+          # in the next round. Generation is overloaded as partitionId.
+          if result_code != 0
+            @tracker&.partition_unavailable(@node_partitions, generation)
+          end
+
+          next
+        end
 
         if result_code == 0
           if @recordset.active?
@@ -68,6 +79,9 @@ module Aerospike
             expn = @recordset.is_scan? ? SCAN_TERMINATED_EXCEPTION : QUERY_TERMINATED_EXCEPTION
             raise expn
           end
+
+          # UDF results do not return a key
+          @tracker&.set_last(@node_partitions, key, key.bval) if key
         end
       end # while
 

data/lib/aerospike/result_code.rb

@@ -20,6 +20,42 @@ module Aerospike
 
     attr_reader :code
 
+    # One or more keys failed in a batch.
+    BATCH_FAILED = -20
+
+    # No response was received from the server.
+    NO_RESPONSE = -19
+
+    # A network error. Checked the wrapped error for detail.
+    NETWORK_ERROR = -18
+
+    # A common, none-aerospike error. Checked the wrapped error for detail.
+    COMMON_ERROR = -17
+
+    # Max retries limit reached.
+    MAX_RETRIES_EXCEEDED = -16
+
+    # Max errors limit reached.
+    MAX_ERROR_RATE = -15
+
+    # Requested Rack for node/namespace was not defined in the cluster.
+    RACK_NOT_DEFINED = -13
+
+    # Cluster has an invalid partition map, usually due to bad configuration.
+    INVALID_CLUSTER_PARTITION_MAP = -12
+
+    # Server is not accepting requests.
+    SERVER_NOT_AVAILABLE = -11
+
+    # Cluster Name does not match the ClientPolicy.ClusterName value.
+    CLUSTER_NAME_MISMATCH_ERROR = -10
+
+    # Recordset has already been closed or cancelled
+    RECORDSET_CLOSED = -9
+
+    # There were no connections available to the node in the pool, and the pool was limited
+    NO_AVAILABLE_CONNECTIONS_TO_NODE = -8
+
     # Value type not supported by Aerospike server
     TYPE_NOT_SUPPORTED = -7
 
@@ -76,8 +112,8 @@ module Aerospike
     # XDS product is not available.
     NO_XDS = 10
 
-    # Server is not accepting requests.
-    SERVER_NOT_AVAILABLE = 11
+    # Partition is unavailable.
+    PARTITION_UNAVAILABLE = 11
 
     # Operation is not supported with configured bin type (single-bin or
     # multi-bin).
@@ -265,6 +301,45 @@ module Aerospike
 
     def self.message(code)
       case code
+      when BATCH_FAILED
+          "one or more keys failed in a batch"
+
+      when NO_RESPONSE
+          "no response was received from the server"
+
+      when NETWORK_ERROR
+          "network error. Checked the wrapped error for detail"
+
+      when COMMON_ERROR
+          "common, none-aerospike error. Checked the wrapped error for detail"
+
+      when MAX_RETRIES_EXCEEDED
+          "Max retries exceeded"
+
+      when MAX_ERROR_RATE
+          "Max errors limit reached for node"
+
+      when RACK_NOT_DEFINED
+          "Requested Rack for node/namespace was not defined in the cluster."
+
+      when INVALID_CLUSTER_PARTITION_MAP
+          "Cluster has an invalid partition map, usually due to bad configuration."
+
+      when SERVER_NOT_AVAILABLE
+          "Server is not accepting requests."
+
+      when CLUSTER_NAME_MISMATCH_ERROR
+          "Cluster Name does not match the ClientPolicy.ClusterName value"
+
+      when RECORDSET_CLOSED
+          "Recordset has already been closed or cancelled."
+
+      when NO_AVAILABLE_CONNECTIONS_TO_NODE
+          "No available connections to the node. Connection Pool was empty, and limited to certain number of connections."
+
+      when TYPE_NOT_SUPPORTED
+          "Type cannot be converted to Value Type."
+
       when COMMAND_REJECTED
         "Command rejected"
 
@@ -316,8 +391,8 @@ module Aerospike
       when NO_XDS
         "XDS not available"
 
-      when SERVER_NOT_AVAILABLE
-        "Server not available"
+      when PARTITION_UNAVAILABLE
+          "Partition not available"
 
       when BIN_TYPE_ERROR
         "Bin type error"

data/lib/aerospike/role.rb

@@ -49,7 +49,7 @@ module Aerospike
     def to_s
       "Role [name=#{@name}, privileges=#{@privileges}, allowlist=#{@allowlist}, readQuota=#{@read_quota}, writeQuota=#{@write_quota}]";
     end
- 
+
   end # class
 
-end # module
+end # module

data/lib/aerospike/task/execute_task.rb

@@ -70,7 +70,7 @@ module Aerospike
 
         case status
         when 'ABORTED'
-          raise raise Aerospike::Exceptions::QueryTerminated
+          raise Aerospike::Exceptions::QueryTerminated
         when 'IN PROGRESS'
           return false
         when 'DONE'
@@ -82,4 +82,4 @@ module Aerospike
     end
 
   end
-end
+end

data/lib/aerospike/task/index_task.rb

@@ -25,7 +25,7 @@ module Aerospike
 
   class IndexTask < Task
 
-    MATCHER = /.*load_pct=(?<load_pct>\d+(\.\d+)?).*/
+    MATCHER = /.*load_pct=(?<load_pct>\d+(\.\d+)?).*/.freeze
 
     def initialize(cluster, namespace, index_name, done=false)
       super(cluster, done)

data/lib/aerospike/user_role.rb

@@ -52,4 +52,4 @@ module Aerospike
 
 	end
 
-end
+end

data/lib/aerospike/utils/buffer.rb

@@ -38,6 +38,7 @@ module Aerospike
     UINT32 = 'N'
     INT64 = 'q>'
     UINT64 = 'Q>'
+    UINT64LE = 'Q'
     DOUBLE = 'G'
 
     DEFAULT_BUFFER_SIZE = 16 * 1024
@@ -124,6 +125,11 @@ module Aerospike
       8
     end
 
+    def write_uint64_little_endian(i, offset)
+      @buf[offset, 8] = [i].pack(UINT64LE)
+      8
+    end
+
     def write_double(f, offset)
       @buf[offset, 8] = [f].pack(DOUBLE)
       8
@@ -162,6 +168,11 @@ module Aerospike
       vals.unpack(INT64)[0]
     end
 
+    def read_uint64_little_endian(offset)
+      vals = @buf[offset..offset+7]
+      vals.unpack(UINT64LE)[0]
+    end
+
     def read_uint64(offset)
       vals = @buf[offset..offset+7]
       vals.unpack(UINT64)[0]
@@ -197,14 +208,28 @@ module Aerospike
       end
     end
 
-    def dump(from=nil, to=nil)
-      from ||= 0
-      to ||= @slice_end - 1
-
-      @buf.bytes[from...to].each do |c|
-        print c.ord.to_s(16)
-        putc ' '
+    def dump(start=0, finish=nil)
+      finish ||= @slice_end - 1
+      width = 16
+
+      ascii = '|'
+      counter = 0
+
+      print '%06x  ' % start
+      @buf.bytes[start...finish].each do |c|
+        if counter >= start
+          print '%02x ' % c
+          ascii << (c.between?(32, 126) ? c : ?.)
+          if ascii.length >= width
+            ascii << '|'
+            puts ascii
+            ascii = '|'
+            print '%06x  ' % (counter + 1)
+          end
+        end
+        counter += 1
       end
+      puts
     end
 
   end # buffer

data/lib/aerospike/utils/pool.rb

@@ -53,7 +53,7 @@ module Aerospike
     end
 
     def empty?
-      @pool.length == 0
+      @pool.empty?
     end
 
     def length

data/lib/aerospike/value/value.rb

@@ -26,19 +26,19 @@ module Aerospike
     def self.of(value, allow_64bits = false)
       case value
       when Integer
-        if !allow_64bits
-          if value.bit_length < 64
+        if allow_64bits
+          # used in bitwise operations
+          if value.bit_length <= 64
             res = IntegerValue.new(value)
           else
-            # big nums > 2**63 are not supported
+            # 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
         else
-          # used in bitwise operations
-          if value.bit_length <= 64
+          if value.bit_length < 64
             res = IntegerValue.new(value)
           else
-            # nums with more than 64 bits are not supported
+            # 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
         end

data/lib/aerospike/version.rb

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

data/lib/aerospike.rb

@@ -160,6 +160,14 @@ 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'

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: aerospike
 version: !ruby/object:Gem::Version
-  version: 2.22.0
+  version: 2.24.0
 platform: ruby
 authors:
 - Khosrow Afroozeh
 - Jan Hecking
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-14 00:00:00.000000000 Z
+date: 2022-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -108,6 +108,7 @@ files:
 - lib/aerospike/command/write_command.rb
 - lib/aerospike/connection/authenticate.rb
 - lib/aerospike/connection/create.rb
+- lib/aerospike/exp/exp.rb
 - lib/aerospike/features.rb
 - lib/aerospike/geo_json.rb
 - lib/aerospike/host.rb
@@ -155,6 +156,10 @@ files:
 - lib/aerospike/policy/write_policy.rb
 - lib/aerospike/privilege.rb
 - lib/aerospike/query/filter.rb
+- lib/aerospike/query/node_partitions.rb
+- lib/aerospike/query/partition_filter.rb
+- lib/aerospike/query/partition_status.rb
+- lib/aerospike/query/partition_tracker.rb
 - lib/aerospike/query/pred_exp.rb
 - lib/aerospike/query/pred_exp/and_or.rb
 - lib/aerospike/query/pred_exp/geo_json_value.rb
@@ -164,8 +169,12 @@ files:
 - lib/aerospike/query/pred_exp/regex_flags.rb
 - lib/aerospike/query/pred_exp/string_value.rb
 - lib/aerospike/query/query_command.rb
+- lib/aerospike/query/query_executor.rb
+- lib/aerospike/query/query_partition_command.rb
 - lib/aerospike/query/recordset.rb
 - lib/aerospike/query/scan_command.rb
+- lib/aerospike/query/scan_executor.rb
+- lib/aerospike/query/scan_partition_command.rb
 - lib/aerospike/query/statement.rb
 - lib/aerospike/query/stream_command.rb
 - lib/aerospike/record.rb
@@ -212,8 +221,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
-signing_key:
+rubygems_version: 3.3.5
+signing_key: 
 specification_version: 4
 summary: An Aerospike driver for Ruby.
 test_files: []