aerospike 2.23.0 → 2.24.0

data/lib/aerospike/client.rb

@@ -693,44 +693,44 @@ module Aerospike
     # Query functions (Supported by Aerospike 3 servers only)
     #--------------------------------------------------------
 
-    # Query executes a query and returns a recordset.
-    # The query executor puts records on a channel from separate goroutines.
-    # The caller can concurrently pops records off the channel through the
-    # record channel.
+    # Executes a query for specified partitions and returns a recordset.
+    # The query executor puts records on the queue from separate threads.
+    # The caller can concurrently pop records off the queue through the
+    # recordset.records API.
     #
-    # This method is only supported by Aerospike 3 servers.
-    # If the policy is nil, a default policy will be generated.
-    def query(statement, options = nil)
+    # This method is only supported by Aerospike 4.9+ servers.
+    # If the policy is nil, the default relevant policy will be used.
+    def query_partitions(partition_filter, statement, options = nil)
       policy = create_policy(options, QueryPolicy, default_query_policy)
       new_policy = policy.clone
 
       nodes = @cluster.nodes
       if nodes.empty?
-        raise Aerospike::Exceptions::Aerospike.new(Aerospike::ResultCode::SERVER_NOT_AVAILABLE, "Scan failed because cluster is empty.")
+        raise Aerospike::Exceptions::Aerospike.new(Aerospike::ResultCode::SERVER_NOT_AVAILABLE, "Query failed because cluster is empty.")
       end
 
-      recordset = Recordset.new(policy.record_queue_size, nodes.length, :query)
-
-      # 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, partitions)
-          begin
-            execute_command(command)
-          rescue => e
-            Aerospike.logger.error(e.backtrace.join("\n")) unless e == QUERY_TERMINATED_EXCEPTION
-            recordset.cancel(e)
-          ensure
-            recordset.thread_finished
-          end
-        end
+      # result recordset
+      recordset = Recordset.new(policy.record_queue_size, 1, :query)
+      tracker = PartitionTracker.new(policy, nodes, partition_filter)
+      Thread.new do
+        Thread.current.abort_on_exception = true
+        QueryExecutor.query_partitions(@cluster, policy, tracker, statement, recordset)
       end
 
       recordset
     end
 
+    # Query executes a query and returns a recordset.
+    # The query executor puts records on a channel from separate threads.
+    # The caller can concurrently pops records off the channel through the
+    # record channel.
+    #
+    # This method is only supported by Aerospike 3 servers.
+    # If the policy is nil, a default policy will be generated.
+    def query(statement, options = nil)
+      query_partitions(Aerospike::PartitionFilter.all, statement, options)
+    end
+
     #-------------------------------------------------------
     # User administration
     #-------------------------------------------------------

data/lib/aerospike/command/command.rb

@@ -34,6 +34,8 @@ module Aerospike
   INFO1_READ = Integer(1 << 0)
   # Get all bins.
   INFO1_GET_ALL = Integer(1 << 1)
+	# Short query
+	INFO1_SHORT_QUERY = Integer(1 << 2)
 
 
   INFO1_BATCH = Integer(1 << 3)
@@ -454,7 +456,7 @@ module Aerospike
       # @data_buffer.write_byte(policy.scan_percent.to_i.ord, @data_offset)
       # @data_offset += 1
 
-      write_field_header(4, Aerospike::FieldType::SCAN_TIMEOUT)
+      write_field_header(4, Aerospike::FieldType::SOCKET_TIMEOUT)
       @data_buffer.write_uint32(policy.socket_timeout.to_i, @data_offset)
       @data_offset += 4
 

data/lib/aerospike/command/field_type.rb

@@ -21,34 +21,31 @@ module Aerospike
 
   module FieldType
 
-    NAMESPACE = 0
-    TABLE = 1
-    KEY = 2
-    #BIN = 3
-    DIGEST_RIPE = 4
-    #GU_TID = 5
-    DIGEST_RIPE_ARRAY = 6
-    TRAN_ID = 7    # user supplied transaction id, which is simply passed back
-    SCAN_OPTIONS = 8
-    SCAN_TIMEOUT = 9
-    RECORDS_PER_SECOND = 10
-    PID_ARRAY = 11
-    DIGEST_ARRAY = 12
-    MAX_RECORDS = 13
-    BVAL_ARRAY = 15
-    INDEX_NAME = 21
-    INDEX_RANGE = 22
-    INDEX_FILTER = 23
-    INDEX_LIMIT = 24
-    INDEX_ORDER_BY = 25
-    INDEX_TYPE = 26
-    UDF_PACKAGE_NAME = 30
-    UDF_FUNCTION = 31
-    UDF_ARGLIST = 32
-    UDF_OP = 33
-    QUERY_BINLIST = 40
-    BATCH_INDEX = 41
-    PREDEXP = 43
+    NAMESPACE  = 0
+    TABLE      = 1
+    KEY        = 2
+    DIGEST_RIPE  = 4
+    DIGEST_RIPE_ARRAY     = 6
+    TRAN_ID               = 7 # user supplied transaction id, which is simply passed back
+    SCAN_OPTIONS          = 8
+    SOCKET_TIMEOUT        = 9
+    RECORDS_PER_SECOND    = 10
+    PID_ARRAY             = 11
+    DIGEST_ARRAY          = 12
+    MAX_RECORDS           = 13
+    BVAL_ARRAY            = 15
+    INDEX_NAME            = 21
+    INDEX_RANGE           = 22
+    INDEX_CONTEXT         = 23
+    INDEX_TYPE            = 26
+    UDF_PACKAGE_NAME      = 30
+    UDF_FUNCTION          = 31
+    UDF_ARGLIST           = 32
+    UDF_OP                = 33
+    QUERY_BINLIST         = 40
+    BATCH_INDEX           = 41
+    BATCH_INDEX_WITH_SET  = 42
+    FILTER_EXP            = 43
 
   end # module