aerospike 2.29.0 → 4.0.0

data/lib/aerospike/policy/batch_delete_policy.rb

@@ -0,0 +1,71 @@
+# encoding: utf-8
+# Copyright 2014-2024 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
+
+  # Policy attributes used in batch delete commands.
+  class BatchDeletePolicy
+    attr_accessor :filter_exp, :commit_level, :generation_policy, :generation, :durable_delete, :send_key
+
+    def initialize(opt = {})
+      # Optional expression filter. If filter_exp exists and evaluates to false, the specific batch key
+      # request is not performed and {BatchRecord#result_code} is set to
+      # {ResultCode#FILTERED_OUT}.
+      #
+      # If exists, this filter overrides the batch parent filter {Policy#filter_exp}
+      # for the specific key in batch commands that allow a different policy per key.
+      # Otherwise, this filter is ignored.
+      #
+      # Default: nil
+      @filter_exp = opt[:filter_exp]
+
+      # Desired consistency guarantee when committing a transaction on the server. The default
+      # (COMMIT_ALL) indicates that the server should wait for master and all replica commits to
+      # be successful before returning success to the client.
+      #
+      # Default: CommitLevel.COMMIT_ALL
+      @commit_level = opt[:commit_level] || CommitLevel::COMMIT_ALL
+
+      # Qualify how to handle record deletes based on record generation. The default (NONE)
+      # indicates that the generation is not used to restrict deletes.
+      #
+      # Default: GenerationPolicy.NONE
+      @generation_policy = opt[:generation_policy] || GenerationPolicy::NONE
+
+      # Expected generation. Generation is the number of times a record has been modified
+      # (including creation) on the server. This field is only relevant when generationPolicy
+      # is not NONE.
+      #
+      # Default: 0
+      @generation = opt[:generation] || 0
+
+      # If the transaction results in a record deletion, leave a tombstone for the record.
+      # This prevents deleted records from reappearing after node failures.
+      # Valid for Aerospike Server Enterprise Edition only.
+      #
+      # Default: false (do not tombstone deleted records).
+      @durable_delete = opt[:durable_delete] || false
+
+      # Send user defined key in addition to hash digest.
+      # If true, the key will be stored with the tombstone record on the server.
+      #
+      # Default: false (do not send the user defined key)
+      @send_key = opt[:send_key] || false
+
+      self
+    end
+  end
+end

data/lib/aerospike/policy/batch_policy.rb

@@ -21,12 +21,14 @@ module Aerospike
 
   # Container object for batch policy command.
   class BatchPolicy < Policy
-
-    attr_accessor :use_batch_direct
+    attr_accessor :allow_inline_ssd, :respond_all_keys, :send_key
 
     def initialize(opt={})
-      super(opt)
+      super
 
+      # [:nodoc:]
+      # DEPRECATED
+      # This setting does not have any effect anymore.
       # Use old batch direct protocol where batch reads are handled by direct
       # low-level batch server database routines. The batch direct protocol can
       # be faster when there is a single namespace. But there is one important
@@ -38,11 +40,58 @@ module Aerospike
       # index protocol will perform this record proxy when necessary.
       #
       # Default: false (use new batch index protocol if server supports it)
-      @use_batch_direct = opt.fetch(:use_batch_direct) { false }
+      @use_batch_direct = opt.fetch(:use_batch_direct, false)
+
+
+      # Allow batch to be processed immediately in the server's receiving thread for SSD
+      # namespaces. If false, the batch will always be processed in separate service threads.
+      # Server versions &lt; 6.0 ignore this field.
+      #
+      # Inline processing can introduce the possibility of unfairness because the server
+      # can process the entire batch before moving onto the next command.
+      #
+      # Default: false
+      @allow_inline_ssd = opt.fetch(:allow_inline_ssd, false)
+
+
+      # Should all batch keys be attempted regardless of errors. This field is used on both
+      # the client and server. The client handles node specific errors and the server handles
+      # key specific errors.
+      #
+      # If true, every batch key is attempted regardless of previous key specific errors.
+      # Node specific errors such as timeouts stop keys to that node, but keys directed at
+      # other nodes will continue to be processed.
+      #
+      # If false, the server will stop the batch to its node on most key specific errors.
+      # The exceptions are {ResultCode#KEY_NOT_FOUND_ERROR} and
+      # {ResultCode#FILTERED_OUT} which never stop the batch.
+      # The client will stop the entire batch on node specific errors. The client will
+      # not stop the entire batch commands run in parallel.
+      #
+      # Server versions < 6.0 do not support this field and treat this value as false
+      # for key specific errors.
+      #
+      # Default: true
+      @respond_all_keys = opt.fetch(:respond_all_keys, true)
+
+
+      # Send user defined key in addition to hash digest on a record put.
+      # The default is to _not_ send the user defined key.
+      @send_key = opt.fetch(:send_key, false)
 
       self
     end
 
+    def self.read_default
+      BatchPolicy.new
+    end
+
+    def self.write_default
+      bp = BatchPolicy.new
+      bp.max_retries = 0
+      bp
+    end
+
   end # class
 
 end # module

data/lib/aerospike/{command/batch_direct_node.rb → policy/batch_read_policy.rb}

@@ -17,24 +17,22 @@
 
 module Aerospike
 
-  BatchNamespace = Struct.new :namespace, :keys
-
-  class BatchDirectNode #:nodoc:
-
-    attr_accessor :node
-    attr_accessor :batch_namespaces
-
-    def self.generate_list(cluster, replica_policy, keys)
-      keys.group_by { |key| cluster.get_node_for_key(replica_policy, key) }
-        .map { |node, keys_for_node| BatchDirectNode.new(node, keys_for_node) }
+  # Policy attributes used in batch read commands.
+  class BatchReadPolicy
+
+    attr_accessor :filter_exp
+
+    def initialize(opt={})
+      # Optional expression filter. If filter_exp exists and evaluates to false, the specific batch key
+      # request is not performed and {BatchRecord#result_code} is set to
+      # {ResultCode#FILTERED_OUT}.
+      #
+      # If exists, this filter overrides the batch parent filter {Policy#filter_exp}
+      # for the specific key in batch commands that allow a different policy per key.
+      # Otherwise, this filter is ignored.
+      #
+      # Default: nil
+      @filter_exp = opt[:filter_exp]
     end
-
-    def initialize(node, keys)
-      @node = node
-      @batch_namespaces = keys.group_by(&:namespace)
-        .map { |ns, keys_for_ns| BatchNamespace.new(ns, keys_for_ns) }
-    end
-
   end
-
-end
+end

data/lib/aerospike/policy/batch_udf_policy.rb

@@ -0,0 +1,75 @@
+# Copyright 2014-2023 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
+
+  # Policy attributes used in batch UDF execute commands.
+  class BatchUDFPolicy
+
+    attr_accessor :filter_exp, :commit_level, :ttl, :durable_delete, :send_key
+
+    alias expiration ttl
+    alias expiration= ttl=
+
+    def initialize(opt={})
+      # Optional expression filter. If filter_exp exists and evaluates to false, the specific batch key
+      # request is not performed and {BatchRecord#resultCode} is set to
+      # {ResultCode#FILTERED_OUT}.
+      #
+      # If exists, this filter overrides the batch parent filter {Policy#filter_exp}
+      # for the specific key in batch commands that allow a different policy per key.
+      # Otherwise, this filter is ignored.
+      #
+      # Default: nil
+      @filter_exp = opt[:filter_exp]
+
+      # Desired consistency guarantee when committing a transaction on the server. The default
+      # (COMMIT_ALL) indicates that the server should wait for master and all replica commits to
+      # be successful before returning success to the client.
+      #
+      # Default: CommitLevel::COMMIT_ALL
+      @commit_level = opt.fetch(:commit_level, CommitLevel::COMMIT_ALL)
+
+      # Record expiration; also known as time-to-live (TTL).
+      # Seconds record will live before being removed by the server.
+      #
+      # Supported values:
+      # - `Aerospike::TTL::NEVER_EXPIRE`: Never expire record; requires Aerospike 2
+      #    server versions >= 2.7.2 or Aerospike 3 server versions >= 3.1.4. Do
+      #    not use for older servers.
+      # - `Aerospike::TTL::NAMESPACE_DEFAULT`: Default to namespace configuration
+      #    variable "default-ttl" on the server.
+      # - `Aerospike::TTL::DONT_UPDATE`: Do not change a record's expiration date
+      #   when updating the record. Requires Aerospike server v3.10.1 or later.
+      # - Any value > 0: Actual time-to-live in seconds.
+      @ttl = opt[:ttl] || opt[:expiration] || 0
+
+      # If the transaction results in a record deletion, leave a tombstone for the record.
+      # This prevents deleted records from reappearing after node failures.
+      # Valid for Aerospike Server Enterprise Edition only.
+      #
+      # Default: false (do not tombstone deleted records).
+      @durable_delete = opt.fetch(:durable_delete, false)
+
+      # Send user defined key in addition to hash digest.
+      # If true, the key will be stored with the record on the server.
+      #
+      # Default: false (do not send the user defined key)
+      @send_key = opt.fetch(:send_key, false)
+    end
+  end
+end

data/lib/aerospike/policy/batch_write_policy.rb

@@ -0,0 +1,105 @@
+# Copyright 2014-2023 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
+
+
+  # Policy attributes used in batch write commands.
+  class BatchWritePolicy
+
+    attr_accessor :filter_exp, :record_exists_action, :commit_level,
+                  :generation_policy, :generation, :ttl, :durable_delete,
+                  :send_key
+
+    alias expiration ttl
+    alias expiration= ttl=
+
+    def initialize(opt={})
+      # Optional expression filter. If filter_exp exists and evaluates to false, the specific batch key
+      # request is not performed and {BatchRecord#result_code} is set to
+      # {ResultCode#FILTERED_OUT}.
+      #
+      # If exists, this filter overrides the batch parent filter {Policy#filter_exp}
+      # for the specific key in batch commands that allow a different policy per key.
+      # Otherwise, this filter is ignored.
+      #
+      # Default: nil
+      @filter_exp = opt[:filter_exp]
+
+      # Qualify how to handle writes where the record already exists.
+      #
+      # Default: RecordExistsAction::UPDATE
+      @record_exists_action = opt.fetch(:record_exists_action, RecordExistsAction::UPDATE)
+
+      # Desired consistency guarantee when committing a transaction on the server. The default
+      # (COMMIT_ALL) indicates that the server should wait for master and all replica commits to
+      # be successful before returning success to the client.
+      #
+      # Default: CommitLevel::COMMIT_ALL
+      @commit_level = opt.fetch(:commit_level, CommitLevel::COMMIT_ALL)
+
+      # Qualify how to handle record writes based on record generation. The default (NONE)
+      # indicates that the generation is not used to restrict writes.
+      #
+      # The server does not support this field for UDF execute() calls. The read-modify-write
+      # usage model can still be enforced inside the UDF code itself.
+      #
+      # Default: GenerationPolicy::NONE
+      @generation_policy = opt.fetch(:generation_policy, GenerationPolicy::NONE)
+
+      # Expected generation. Generation is the number of times a record has been modified
+      # (including creation) on the server. If a write operation is creating a record,
+      # the expected generation would be <code>0</code>. This field is only relevant when
+      # generationPolicy is not NONE.
+      #
+      # The server does not support this field for UDF execute() calls. The read-modify-write
+      # usage model can still be enforced inside the UDF code itself.
+      #
+      # Default: 0
+      @generation = opt.fetch(:generation, 0)
+
+      # Record expiration; also known as time-to-live (TTL).
+      # Seconds record will live before being removed by the server.
+      #
+      # Supported values:
+      # - `Aerospike::TTL::NEVER_EXPIRE`: Never expire record; requires Aerospike 2
+      #    server versions >= 2.7.2 or Aerospike 3 server versions >= 3.1.4. Do
+      #    not use for older servers.
+      # - `Aerospike::TTL::NAMESPACE_DEFAULT`: Default to namespace configuration
+      #    variable "default-ttl" on the server.
+      # - `Aerospike::TTL::DONT_UPDATE`: Do not change a record's expiration date
+      #   when updating the record. Requires Aerospike server v3.10.1 or later.
+      # - Any value > 0: Actual time-to-live in seconds.
+      @ttl = opt[:ttl] || opt[:expiration] || 0
+
+      # If the transaction results in a record deletion, leave a tombstone for the record.
+      # This prevents deleted records from reappearing after node failures.
+      # Valid for Aerospike Server Enterprise Edition only.
+      #
+      # Default: false (do not tombstone deleted records).
+      @durable_delete = opt.fetch(:durable_delete, false)
+
+      # Send user defined key in addition to hash digest.
+      # If true, the key will be stored with the record on the server.
+      #
+      # Default: false (do not send the user defined key)
+      @send_key = opt.fetch(:send_key, false)
+
+      self
+    end
+  end
+end

data/lib/aerospike/policy/policy.rb

@@ -22,7 +22,7 @@ module Aerospike
   # Container object for client policy command.
   class Policy
     attr_accessor :filter_exp, :priority, :timeout, :max_retries, :sleep_between_retries, :consistency_level,
-                  :predexp, :fail_on_filtered_out, :replica, :use_compression, :socket_timeout
+                  :fail_on_filtered_out, :replica, :use_compression, :socket_timeout
 
     alias total_timeout timeout
     alias total_timeout= timeout=
@@ -31,7 +31,7 @@ module Aerospike
       # Container object for transaction policy attributes used in all database
       # operation calls.
 
-      # Optional expression filter. If filterExp exists and evaluates to false, the
+      # Optional expression filter. If filter_exp exists and evaluates to false, the
       # transaction is ignored.
       #
       # Default: nil
@@ -57,44 +57,7 @@ module Aerospike
       # TODO: Remove for next major release
       @priority = opt[:priority] || Priority::DEFAULT
 
-      # Set optional predicate expression filters in postfix notation.
-      # Predicate expression filters are applied on the query results on the server.
-      # Predicate expression filters may occur on any bin in the record.
-      # Requires Aerospike Server versions >= 3.12
-      #
-      # Postfix notation is described here: http://wiki.c2.com/?PostfixNotation
-      #
-      # Example:
-      #
-      # (c >= 11 and c <= 20) or (d > 3 and (d < 5)
-      # policy.predexp = [
-      #   PredExp.integer_bin("c"),
-      #   PredExp.integer_value(11),
-      #   PredExp.integer_greater_eq(),
-      #   PredExp.integer_bin("c"),
-      #   PredExp.integer_value(20),
-      #   PredExp.integer_less_eq(),
-      #   PredExp.and(2),
-      #   PredExp.integer_bin("d"),
-      #   PredExp.integer_value(3),
-      #   PredExp.integer_greater(),
-      #   PredExp.integer_bin("d"),
-      #   PredExp.integer_value(5),
-      #   PredExp.integer_less(),
-      #   PredExp.and(2),
-      #   PredExp.or(2)
-      # ]
-      #
-      # # Record last update time > 2017-01-15
-      # policy.predexp = [
-      #   PredExp.rec_last_update(),
-      #   PredExp.integer_value(Time.new(2017, 1, 15).to_i),
-      #   PredExp.integer_greater(),
-      #   PredExp.integer_greater()
-      # ]
-      @predexp = opt[:predexp] || nil
-
-      # Throw exception if @predexp is defined and that filter evaluates
+      # Throw exception if @filter_exp is defined and that filter evaluates
       # to false (transaction ignored). The Aerospike::Exceptions::Aerospike
       # will contain result code Aerospike::ResultCode::FILTERED_OUT.
       # This field is not applicable to batch, scan or query commands.

data/lib/aerospike/query/query_command.rb

@@ -23,9 +23,9 @@ module Aerospike
 
   class QueryCommand < StreamCommand #:nodoc:
 
-    def initialize(node, policy, statement, recordset, partitions)
+    def initialize(cluster, node, policy, statement, recordset, partitions)
       super(node)
-
+      @cluster = cluster
       @policy = policy
       @statement = statement
       @recordset = recordset
@@ -33,209 +33,7 @@ module Aerospike
     end
 
     def write_buffer
-      fieldCount = 0
-      filterSize = 0
-      binNameSize = 0
-      predSize = 0
-
-      begin_cmd
-
-      if @statement.namespace
-        @data_offset += @statement.namespace.bytesize + FIELD_HEADER_SIZE
-        fieldCount+=1
-      end
-
-      if @statement.index_name
-        @data_offset += @statement.index_name.bytesize + FIELD_HEADER_SIZE
-        fieldCount+=1
-      end
-
-      if @statement.set_name
-        @data_offset += @statement.set_name.bytesize + FIELD_HEADER_SIZE
-        fieldCount+=1
-      end
-
-      if !is_scan?
-        col_type = @statement.filters[0].collection_type
-        if col_type > 0
-          @data_offset += FIELD_HEADER_SIZE + 1
-          fieldCount += 1
-        end
-
-        @data_offset += FIELD_HEADER_SIZE
-        filterSize+=1 # num filters
-
-        @statement.filters.each do |filter|
-          sz = filter.estimate_size
-          filterSize += sz
-        end
-        @data_offset += filterSize
-        fieldCount+=1
-
-        if @statement.bin_names && @statement.bin_names.length > 0
-          @data_offset += FIELD_HEADER_SIZE
-          binNameSize+=1 # num bin names
-
-          @statement.bin_names.each do |bin_name|
-            binNameSize += bin_name.bytesize + 1
-          end
-          @data_offset += binNameSize
-          fieldCount+=1
-        end
-      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
-        end
-
-        # 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
-      end
-
-      @statement.set_task_id
-
-      @data_offset += 8 + FIELD_HEADER_SIZE
-      fieldCount+=1
-
-      predexp = @policy.predexp || @statement.predexp
-
-      if predexp
-        @data_offset += FIELD_HEADER_SIZE
-        predSize = Aerospike::PredExp.estimate_size(predexp)
-        @data_offset += predSize
-        fieldCount += 1
-      end
-
-      if @statement.function_name
-        @data_offset += FIELD_HEADER_SIZE + 1 # udf type
-        @data_offset += @statement.package_name.bytesize + FIELD_HEADER_SIZE
-        @data_offset += @statement.function_name.bytesize + FIELD_HEADER_SIZE
-
-        if @statement.function_args && @statement.function_args.length > 0
-          functionArgBuffer = Value.of(@statement.function_args).to_bytes
-        else
-          functionArgBuffer = ''
-        end
-        @data_offset += FIELD_HEADER_SIZE + functionArgBuffer.bytesize
-        fieldCount += 4
-      end
-
-      if @statement.filters.nil? || @statement.filters.empty?
-        if @statement.bin_names && @statement.bin_names.length > 0
-          @statement.bin_names.each do |bin_name|
-            estimate_operation_size_for_bin_name(bin_name)
-          end
-        end
-      end
-
-      size_buffer
-
-      readAttr = @policy.include_bin_data ? INFO1_READ : INFO1_READ | INFO1_NOBINDATA
-      operation_count = (is_scan? && !@statement.bin_names.nil?) ? @statement.bin_names.length : 0
-
-      write_header(@policy, readAttr, 0, fieldCount, operation_count)
-
-      if @statement.namespace
-        write_field_string(@statement.namespace, Aerospike::FieldType::NAMESPACE)
-      end
-
-      unless @statement.index_name.nil?
-        write_field_string(@statement.index_name, Aerospike::FieldType::INDEX_NAME)
-      end
-
-      if @statement.set_name
-        write_field_string(@statement.set_name, Aerospike::FieldType::TABLE)
-      end
-
-      if !is_scan?
-        col_type = @statement.filters[0].collection_type
-        if col_type > 0
-          write_field_header(1, Aerospike::FieldType::INDEX_TYPE)
-          @data_buffer.write_byte(col_type, @data_offset)
-          @data_offset+=1
-        end
-
-        write_field_header(filterSize, Aerospike::FieldType::INDEX_RANGE)
-        @data_buffer.write_byte(@statement.filters.length, @data_offset)
-        @data_offset+=1
-
-        @statement.filters.each do |filter|
-          @data_offset = filter.write(@data_buffer, @data_offset)
-        end
-
-        # Query bin names are specified as a field (Scan bin names are specified later as operations)
-        if @statement.bin_names && @statement.bin_names.length > 0
-          write_field_header(binNameSize, Aerospike::FieldType::QUERY_BINLIST)
-          @data_buffer.write_byte(@statement.bin_names.length, @data_offset)
-          @data_offset += 1
-
-          @statement.bin_names.each do |bin_name|
-            len = @data_buffer.write_binary(bin_name, @data_offset + 1)
-            @data_buffer.write_byte(len, @data_offset)
-            @data_offset += len + 1;
-          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
-      end
-
-      write_field_header(8, Aerospike::FieldType::TRAN_ID)
-      @data_buffer.write_int64(@statement.task_id, @data_offset)
-      @data_offset += 8
-
-      if predexp
-        write_field_header(predSize, Aerospike::FieldType::PREDEXP)
-        @data_offset = Aerospike::PredExp.write(
-          predexp, @data_buffer, @data_offset
-        )
-      end
-
-      if @statement.function_name
-        write_field_header(1, Aerospike::FieldType::UDF_OP)
-        if @statement.return_data
-          @data_buffer.write_byte(1, @data_offset)
-          @data_offset+=1
-        else
-          @data_buffer.write_byte(2, @data_offset)
-          @data_offset+=1
-        end
-
-        write_field_string(@statement.package_name, Aerospike::FieldType::UDF_PACKAGE_NAME)
-        write_field_string(@statement.function_name, Aerospike::FieldType::UDF_FUNCTION)
-        write_field_bytes(functionArgBuffer, Aerospike::FieldType::UDF_ARGLIST)
-      end
-
-      if is_scan? && !@statement.bin_names.nil?
-        @statement.bin_names.each do |bin_name|
-          write_operation_for_bin_name(bin_name, Aerospike::Operation::READ)
-        end
-      end
-
-      end_cmd
-
-      return nil
+      set_query(@cluster, @policy, @statement, false, @partitions)
     end
 
     def is_scan?

data/lib/aerospike/query/query_executor.rb

@@ -34,7 +34,7 @@ module Aerospike
           list.each do |node_partition|
             threads << Thread.new do
               Thread.current.abort_on_exception = true
-              command = QueryPartitionCommand.new(node_partition.node, tracker, policy, statement, recordset, node_partition)
+              command = QueryPartitionCommand.new(cluster, node_partition.node, tracker, policy, statement, recordset, node_partition)
               begin
                 command.execute
               rescue => e
@@ -48,7 +48,7 @@ module Aerospike
         else
           # Use a single thread for all nodes for all node
           list.each do |node_partition|
-            command = QueryPartitionCommand.new(node_partition.node, tracker, policy, statement, recordset, node_partition)
+            command = QueryPartitionCommand.new(cluster, node_partition.node, tracker, policy, statement, recordset, node_partition)
             begin
               command.execute
             rescue => e