aerospike 4.0.0 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cbbb3eae452fb9c1bbe7a0a99e7505b4fa774396b9591edc80ae707abb9896e0
-  data.tar.gz: cd2bf9f22247dbc8f49581507b17f6347edf0a6f46a0c307f87eae45c3bf775b
+  metadata.gz: 6807e226bf4278fb49b9b27a13ddca657120fff617e4a9e2fd0553fd9479f7f6
+  data.tar.gz: 07d35bca9861064b0528ef7f9f7d3fefd1930deb868ab6e45f8f1ddf57eded6c
 SHA512:
-  metadata.gz: 88c12b118fcdf74f170a06ac3158b47f3e81076ee7c851d5ca06ea80b82d2b668c2df6588444e22c011dd43cbddce6586ecaaa30c895e54cefd47573e75b55ac
-  data.tar.gz: ffc436ee1b5696765fdc8ab00f87ef0c6e33afea3ae3ddc2d63dcd01fed91e62f3ddb8b109acf9fae65bc5bcabd9c1f36af8c60b87e86fb25c8b1528ed5e926b
+  metadata.gz: f027d16fc67b814e135fc831b7d0b5effce98ea18255df72dc8d33fd63ed1a86c181566fd38211257390576af3306b027eb3213937b31b846b62b0cad69a17e6
+  data.tar.gz: e7125a75bef40d4d5b021408ba09fce58ade3c5b039a81e18241d72ca82936c71df826289131c9416630b2ad6022d85ba136069ea6514d1bac54ba12f461d13e

data/CHANGELOG.md

@@ -2,6 +2,25 @@
 
 All notable changes to this project will be documented in this file.
 
+## [4.2.0] 2024-12-18
+
+- **Fixes**
+  - [CLIENT-3195] Fix ruby client does not return failed nodes on timeout.
+
+## [4.1.0] 2024-10-22
+
+- **New Features**
+  - [CLIENT-2833] Support `Policy#ReadTouchTtlPercent`.
+  - [CLIENT-2826] Support `QueryDuration` in `QueryPolicy#ExpectedDuration`.
+  - [CLIENT-3103] Support `XDR_KEY_BUSY`.
+
+- **Fixes**
+  - [CLIENT-3144] Various fixes. PR #132 and #133 Thanks to [Igor Pstyga](https://github.com/opti)
+    - Fix `BatchRead` for multiple records with operations.
+    - Use correct namespace for the `MapReturnType`.
+    - `BatchRead` with operations would throw an exception.
+  - Fix a test with invalid map key in Server v7.1.
+
 ## [4.0.0] 2024-08-14
 
 - **New Features**

data/lib/aerospike/aerospike_exception.rb

@@ -21,79 +21,79 @@ require 'aerospike/result_code'
 module Aerospike
   module Exceptions
     class Aerospike < StandardError
-      attr_reader :result_code
+      attr_reader :result_code, :failed_nodes
 
-      def initialize(result_code, message = nil)
+      def initialize(result_code, message = nil, failed_nodes = nil)
         @result_code = result_code
+        @failed_nodes = failed_nodes
         message ||= ResultCode.message(result_code)
         super(message)
       end
     end
 
     class Timeout < Aerospike
-      attr_reader :timeout, :iterations, :failed_nodes, :failed_connections
+      attr_reader :timeout, :iterations, :failed_connections
 
       def initialize(timeout, iterations, failed_nodes=nil, failed_connections=nil)
         @timeout = timeout
         @iterations = iterations
-        @failed_nodes = failed_nodes
         @failed_connections = failed_connections
 
-        super(ResultCode::TIMEOUT)
+        super(ResultCode::TIMEOUT, nil, failed_nodes)
       end
     end
 
     class InvalidCredentials < Aerospike
-      def initialize(msg = nil)
-        super(ResultCode::NOT_AUTHENTICATED, msg)
+      def initialize(msg = nil, node=nil)
+        super(ResultCode::NOT_AUTHENTICATED, msg, [node])
       end
     end
 
     class Serialize < Aerospike
       def initialize(msg=nil)
-        super(ResultCode::SERIALIZE_ERROR, msg)
+        super(ResultCode::SERIALIZE_ERROR, msg, [node])
       end
     end
 
     class Parse < Aerospike
-      def initialize(msg=nil)
-        super(ResultCode::PARSE_ERROR, msg)
+      def initialize(msg=nil, node=nil)
+        super(ResultCode::PARSE_ERROR, msg, [node])
       end
     end
 
     class Connection < Aerospike
-      def initialize(msg=nil)
-        super(ResultCode::SERVER_NOT_AVAILABLE, msg)
+      def initialize(msg=nil, node=nil)
+        super(ResultCode::SERVER_NOT_AVAILABLE, msg, [node])
       end
     end
 
     class InvalidNode < Aerospike
-      def initialize(msg=nil)
-        super(ResultCode::INVALID_NODE_ERROR, msg)
+      def initialize(msg=nil, node=nil)
+        super(ResultCode::INVALID_NODE_ERROR, msg, [node])
       end
     end
 
     class ScanTerminated < Aerospike
-      def initialize(msg=nil)
-        super(ResultCode::SCAN_TERMINATED, msg)
+      def initialize(msg=nil, node=nil)
+        super(ResultCode::SCAN_TERMINATED, msg, [node])
       end
     end
 
     class QueryTerminated < Aerospike
-      def initialize(msg=nil)
-        super(ResultCode::QUERY_TERMINATED, msg)
+      def initialize(msg=nil, node=nil)
+        super(ResultCode::QUERY_TERMINATED, msg, [node])
       end
     end
 
     class CommandRejected < Aerospike
-      def initialize(msg=nil)
-        super(ResultCode::COMMAND_REJECTED, msg)
+      def initialize(msg=nil, node=nil)
+        super(ResultCode::COMMAND_REJECTED, msg, [node])
       end
     end
 
     class InvalidNamespace < Aerospike
-      def initialize(msg=nil)
-        super(ResultCode::INVALID_NAMESPACE, msg)
+      def initialize(msg=nil, node=nil)
+        super(ResultCode::INVALID_NAMESPACE, msg, [node])
       end
     end
   end

data/lib/aerospike/batch_attr.rb

@@ -75,7 +75,7 @@ module Aerospike
       @write_attr = 0
       @info_attr = 0
 
-      @expiration = 0
+      @expiration = rp.read_touch_ttl_percent
       @generation = 0
       @has_write = false
       @send_key = false
@@ -88,7 +88,7 @@ module Aerospike
       @write_attr = 0
       @info_attr = 0
 
-      @expiration = 0
+      @expiration = rp.read_touch_ttl_percent
       @generation = 0
       @has_write = false
       @send_key = false

data/lib/aerospike/batch_read.rb

@@ -68,7 +68,7 @@ module Aerospike
     # For internal use only.
     def ==(other) # :nodoc:
       other && other.instance_of?(self.class) &&
-        @bin_names.sort == other.bin_names.sort && @ops.sort == other.ops.sort &&
+        @bin_names&.sort == other.bin_names&.sort && @ops == other.ops &&
         @policy == other.policy && @read_all_bins == other.read_all_bins
     end
 
@@ -88,7 +88,7 @@ module Aerospike
           raise AerospikeException.new(ResultCode::PARAMETER_ERROR, "Write operations not allowed in batch read")
         end
         size += op.bin_name.bytesize + Aerospike::OPERATION_HEADER_SIZE
-        size += op.value.estimate_size
+        size += op.bin_value.estimate_size
       end
 
       size

data/lib/aerospike/client.rb

@@ -239,7 +239,7 @@ module Aerospike
 
       response = send_info_command(policy, str_cmd, node).upcase
       return if response == "OK"
-      raise Aerospike::Exceptions::Aerospike.new(Aerospike::ResultCode::SERVER_ERROR, "Truncate failed: #{response}")
+      raise Aerospike::Exceptions::Aerospike.new(Aerospike::ResultCode::SERVER_ERROR, "Truncate failed: #{response}", [node])
     end
 
     #-------------------------------------------------------

data/lib/aerospike/cluster/partition_parser.rb

@@ -42,7 +42,7 @@ module Aerospike
 
       info = info_map[REPLICAS_ALL]
       if !info || info.length == 0
-        raise Aerospike::Exceptions::Connection.new("#{REPLICAS_ALL} response for node #{@node.name} is empty")
+        raise Aerospike::Exceptions::Connection.new("#{REPLICAS_ALL} response for node #{@node.name} is empty", @node)
       end
 
       @buffer = info
@@ -112,7 +112,8 @@ module Aerospike
       if namespace.length <= 0 || namespace.length >= 32
         response = get_truncated_response
         raise Aerospike::Exceptions::Parse.new(
-          "Invalid partition namespace #{namespace}. Response=#{response}"
+          "Invalid partition namespace #{namespace}. Response=#{response}",
+          @node
         )
       end
 
@@ -133,7 +134,8 @@ module Aerospike
       if count < 0 || count > 4096
         response = get_truncated_response
         raise Aerospike::Exceptions::Parse.new(
-          "Invalid partition count #{count}. Response=#{response}"
+          "Invalid partition count #{count}. Response=#{response}",
+          @node
         )
       end
 

data/lib/aerospike/cluster/rack_parser.rb

@@ -43,7 +43,7 @@ module Aerospike
 
       info = info_map[RACK_IDS]
       if !info || info.length == 0
-        raise Aerospike::Exceptions::Connection.new("#{RACK_IDS} response for node #{@node.name} is empty")
+        raise Aerospike::Exceptions::Connection.new("#{RACK_IDS} response for node #{@node.name} is empty", @node)
       end
 
       @buffer = info
@@ -54,7 +54,7 @@ module Aerospike
         namespace = parse_name
         rack_id = parse_rack_id
 
-        @racks = {} if !@racks
+        @racks ||= {}
         @racks[namespace] = rack_id
       end
 
@@ -76,7 +76,8 @@ module Aerospike
       if namespace.length <= 0 || namespace.length >= 32
         response = get_truncated_response
         raise Aerospike::Exceptions::Parse.new(
-          "Invalid rack namespace #{namespace}. Response=#{response}"
+          "Invalid rack namespace #{namespace}. Response=#{response}",
+          @node
         )
       end
 
@@ -97,7 +98,8 @@ module Aerospike
       if rack_id < 0
         response = get_truncated_response
         raise Aerospike::Exceptions::Parse.new(
-          "Invalid rack_id #{rack_id}. Response=#{response}"
+          "Invalid rack_id #{rack_id}. Response=#{response}",
+          @node
         )
       end
 

data/lib/aerospike/cluster.rb

@@ -129,7 +129,7 @@ module Aerospike
       when Aerospike::Replica::RANDOM
           random_node
       else
-          raise Aerospike::Exceptions::InvalidNode("invalid policy.replica value")
+          raise Aerospike::Exceptions::InvalidNode.new("invalid policy.replica value")
       end
     end
 
@@ -147,7 +147,7 @@ module Aerospike
       when Aerospike::Replica::RANDOM
           random_node
       else
-          raise Aerospike::Exceptions::InvalidNode("invalid policy.replica value")
+          raise Aerospike::Exceptions::InvalidNode.new("invalid policy.replica value")
       end
     end
 
@@ -155,13 +155,13 @@ module Aerospike
     def master_node(partition)
       partition_map = partitions
       replica_array = partition_map[partition.namespace]
-      raise Aerospike::Exceptions::InvalidNamespace("namespace not found in the partition map") unless replica_array
+      raise Aerospike::Exceptions::InvalidNamespace.new("namespace not found in the partition map") unless replica_array
 
       node_array = replica_array.get[0]
-      raise Aerospike::Exceptions::InvalidNamespace("namespace not found in the partition map") unless node_array
+      raise Aerospike::Exceptions::InvalidNamespace.new("namespace not found in the partition map") unless node_array
 
       node = node_array.get[partition.partition_id]
-      raise Aerospike::Exceptions::InvalidNode if !node || !node.active?
+      raise Aerospike::Exceptions::InvalidNode.new("no active node found") if !node || !node.active?
 
       node
     end
@@ -170,7 +170,7 @@ module Aerospike
     def rack_node(partition, seq)
       partition_map = partitions
       replica_array = partition_map[partition.namespace]
-      raise Aerospike::Exceptions::InvalidNamespace("namespace not found in the partition map") unless replica_array
+      raise Aerospike::Exceptions::InvalidNamespace.new("namespace not found in the partition map") unless replica_array
 
       replica_array = replica_array.get
 
@@ -195,14 +195,14 @@ module Aerospike
 
       return fallback if fallback
 
-      raise Aerospike::Exceptions::InvalidNode
+      raise Aerospike::Exceptions::InvalidNode.new("no active node found")
     end
 
     # Returns a node on the cluster for read operations
     def master_proles_node(partition)
       partition_map = partitions
       replica_array = partition_map[partition.namespace]
-      raise Aerospike::Exceptions::InvalidNamespace("namespace not found in the partition map") unless replica_array
+      raise Aerospike::Exceptions::InvalidNamespace.new("namespace not found in the partition map") unless replica_array
 
       replica_array = replica_array.get
 
@@ -214,14 +214,14 @@ module Aerospike
         return node if node && node.active?
       end
 
-      raise Aerospike::Exceptions::InvalidNode
+      raise Aerospike::Exceptions::InvalidNode.new("no active node found")
     end
 
     # Returns a random node on the cluster
     def sequence_node(partition, seq)
       partition_map = partitions
       replica_array = partition_map[partition.namespace]
-      raise Aerospike::Exceptions::InvalidNamespace("namespace not found in the partition map") unless replica_array
+      raise Aerospike::Exceptions::InvalidNamespace.new("namespace not found in the partition map") unless replica_array
 
       replica_array = replica_array.get
 
@@ -233,7 +233,7 @@ module Aerospike
         return node if node && node.active?
       end
 
-      raise Aerospike::Exceptions::InvalidNode
+      raise Aerospike::Exceptions::InvalidNode.new("node active node found")
     end
 
     def get_node_for_key(replica_policy, key, is_write: false)
@@ -251,10 +251,10 @@ module Aerospike
 
       partition_map = partitions
       replica_array = partition_map[namespace]
-      raise Aerospike::Exceptions::InvalidNamespace("namespace not found in the partition map") unless replica_array
+      raise Aerospike::Exceptions::InvalidNamespace.new("namespace not found in the partition map") unless replica_array
 
       node_array = replica_array.get[0]
-      raise Aerospike::Exceptions::InvalidNamespace("namespace not found in the partition map") unless node_array
+      raise Aerospike::Exceptions::InvalidNamespace.new("namespace not found in the partition map") unless node_array
 
 
       pid = 0
@@ -281,7 +281,7 @@ module Aerospike
 
         i = i.succ
       end
-      raise Aerospike::Exceptions::InvalidNode
+      raise Aerospike::Exceptions::InvalidNode.new("no active node found")
     end
 
     # Returns a list of all nodes in the cluster
@@ -296,7 +296,7 @@ module Aerospike
     def get_node_by_name(node_name)
       node = find_node_by_name(node_name)
 
-      raise Aerospike::Exceptions::InvalidNode unless node
+      raise Aerospike::Exceptions::InvalidNode.new("node `#{node_name}` not found") unless node
 
       node
     end

data/lib/aerospike/command/batch_index_command.rb

@@ -62,7 +62,7 @@ module Aerospike
         end
       end
       size_buffer
-      write_header_read(policy, read_attr | INFO1_BATCH, 0, field_count, 0)
+      write_header_read(policy, read_attr | INFO1_BATCH, 0, 0, field_count, 0)
 
       write_filter_exp(@policy.filter_exp, exp_size)
 

data/lib/aerospike/command/batch_index_exists_command.rb

@@ -33,7 +33,7 @@ module Aerospike
       op_count = @data_buffer.read_int16(20)
 
       if op_count > 0
-        raise Aerospike::Exceptions::Parse.new('Received bins that were not requested!')
+        raise Aerospike::Exceptions::Parse.new('Received bins that were not requested!', @node)
       end
 
       skip_key(field_count)

data/lib/aerospike/command/batch_operate_command.rb

@@ -92,7 +92,7 @@ module Aerospike
             if record.bin_names&.length&.> 0
               write_batch_bin_names(key, record.bin_names, attr, attr.filter_exp)
             elsif record.ops&.length&.> 0
-              attr.adjust_read(br.ops)
+              attr.adjust_read(record.ops)
               write_batch_operations(key, record.ops, attr, attr.filter_exp)
             else
               attr.adjust_read_all_bins(record.read_all_bins)

data/lib/aerospike/command/command.rb

@@ -58,7 +58,8 @@ module Aerospike
   INFO2_DURABLE_DELETE = Integer(1 << 4)
   # Create only. Fail if record already exists.
   INFO2_CREATE_ONLY = Integer(1 << 5)
-
+  # Treat as long query, but relax read consistency.
+  INFO2_RELAX_AP_LONG_QUERY = (1 << 6)
   # Return a result for every operation.
   INFO2_RESPOND_ALL_OPS = Integer(1 << 7)
 
@@ -195,7 +196,7 @@ module Aerospike
       field_count += 1 if exp_size > 0
 
       size_buffer
-      write_header_read(policy, INFO1_READ | INFO1_GET_ALL, 0, field_count, 0)
+      write_header_read(policy, INFO1_READ | INFO1_GET_ALL, 0, 0, field_count, 0)
       write_key(key)
       write_filter_exp(@policy.filter_exp, exp_size)
       end_cmd
@@ -220,7 +221,7 @@ module Aerospike
           attr |= INFO1_GET_ALL
         end
 
-        write_header_read(policy, attr, 0, field_count, bin_names.length)
+        write_header_read(policy, attr, 0, 0, field_count, bin_names.length)
         write_key(key)
         write_filter_exp(@policy.filter_exp, exp_size)
 
@@ -269,7 +270,7 @@ module Aerospike
 
       size_buffer
 
-      write_header_read_write(policy, args.read_attr, args.write_attr, field_count, args.operations.length)
+      write_header_read_write(policy, args, field_count)
       write_key(key, policy)
       write_filter_exp(policy.filter_exp, exp_size)
 
@@ -377,7 +378,7 @@ module Aerospike
         operation_count = bin_names.length
       end
 
-      write_header_read(policy, read_attr, info_attr, field_count, operation_count)
+      write_header_read(policy, read_attr, 0, info_attr, field_count, operation_count)
 
       if namespace
         write_field_string(namespace, Aerospike::FieldType::NAMESPACE)
@@ -570,7 +571,7 @@ module Aerospike
       if operations
 
         unless background
-          raise Aerospike::Exceptions::Aerospike.new(Aerospike::ResultCode::PARAMETER_ERROR)
+          raise Aerospike::Exceptions::Aerospike.new(Aerospike::ResultCode::PARAMETER_ERROR, nil, [@node])
         end
 
         operations.each do |operation|
@@ -591,10 +592,16 @@ module Aerospike
         write_header_write(policy, INFO2_WRITE, field_count, operation_count)
       else
         read_attr = INFO1_READ
+        write_attr = 0
+
         read_attr |= INFO1_NOBINDATA unless policy.include_bin_data
-        read_attr |= INFO1_SHORT_QUERY if policy.short_query
+        if policy.short_query || policy.expected_duration == QueryDuration::SHORT
+          read_attr |= INFO1_SHORT_QUERY
+        elsif policy.expected_duration == QueryDuration::LONG_RELAX_AP
+          write_attr |= INFO2_RELAX_AP_LONG_QUERY
+        end
         info_attr = INFO3_PARTITION_DONE if is_new
-        write_header_read(policy, read_attr, info_attr, field_count, operation_count)
+        write_header_read(policy, read_attr, write_attr, info_attr, field_count, operation_count)
       end
 
 
@@ -678,6 +685,7 @@ module Aerospike
 
     def execute
       iterations = 0
+      failed_nodes = []
 
       # set timeout outside the loop
       limit = Time.now + @policy.timeout
@@ -698,6 +706,7 @@ module Aerospike
           @node = get_node
           @conn = @node.get_connection(@policy.timeout)
         rescue => e
+          failed_nodes << @node if @node
           if @node
             # Socket connection error has occurred. Decrease health and retry.
             @node.decrease_health
@@ -717,6 +726,7 @@ module Aerospike
           begin
             write_buffer
           rescue => e
+            failed_nodes << @node if @node
             Aerospike.logger.error(e)
 
             # All runtime exceptions are considered fatal. Do not retry.
@@ -731,6 +741,7 @@ module Aerospike
           begin
             @conn.write(@data_buffer, @data_offset)
           rescue => e
+            failed_nodes << @node if @node
             # IO errors are considered temporary anomalies. Retry.
             # Close socket to flush out possible garbage. Do not put back in pool.
             @conn.close if @conn
@@ -746,6 +757,7 @@ module Aerospike
           begin
             parse_result
           rescue => e
+            failed_nodes << @node if @node
             case e
               # do not log the following exceptions
             when Aerospike::Exceptions::ScanTerminated
@@ -776,7 +788,7 @@ module Aerospike
       end # while
 
       # execution timeout
-      raise Aerospike::Exceptions::Timeout.new(limit, iterations)
+      raise Aerospike::Exceptions::Timeout.new(limit, iterations, failed_nodes)
     end
 
     protected
@@ -903,10 +915,14 @@ module Aerospike
     end
 
     # Header write for write operations.
-    def write_header_read_write(policy, read_attr, write_attr, field_count, operation_count)
+    def write_header_read_write(policy, args, field_count)
       # Set flags.
       generation = Integer(0)
+      ttl = args.has_write ? policy.expiration : policy.read_touch_ttl_percent
+      read_attr = args.read_attr
+      write_attr = args.write_attr
       info_attr = Integer(0)
+      operation_count = args.operations.length
 
       case policy.record_exists_action
       when Aerospike::RecordExistsAction::UPDATE
@@ -942,7 +958,7 @@ module Aerospike
       @data_buffer.write_byte(0, 12) # unused
       @data_buffer.write_byte(0, 13) # clear the result code
       @data_buffer.write_uint32(generation, 14)
-      @data_buffer.write_uint32(policy.ttl, 18)
+      @data_buffer.write_uint32(ttl, 18)
 
       # Initialize timeout. It will be written later.
       @data_buffer.write_byte(0, 22)
@@ -956,18 +972,19 @@ module Aerospike
       @data_offset = MSG_TOTAL_HEADER_SIZE
     end
 
-    def write_header_read(policy, read_attr, info_attr, field_count, operation_count)
+    def write_header_read(policy, read_attr, write_attr, info_attr, field_count, operation_count)
       read_attr |= INFO1_COMPRESS_RESPONSE if policy.use_compression
       #TODO: Add SC Mode
 
       @data_buffer.write_byte(MSG_REMAINING_HEADER_SIZE, 8) # Message header.length.
       @data_buffer.write_byte(read_attr, 9)
-      @data_buffer.write_byte(0, 10)
+      @data_buffer.write_byte(write_attr, 10)
       @data_buffer.write_byte(info_attr, 11)
 
-      (12...22).each { |i| @data_buffer.write_byte(0, i) }
+      (12...18).each { |i| @data_buffer.write_byte(0, i) }
 
       # Initialize timeout. It will be written later.
+      @data_buffer.write_int32(policy.read_touch_ttl_percent, 18)
       @data_buffer.write_byte(0, 22)
       @data_buffer.write_byte(0, 23)
       @data_buffer.write_byte(0, 24)
@@ -988,9 +1005,10 @@ module Aerospike
       @data_buffer.write_byte(0, 10)
       @data_buffer.write_byte(info_attr, 11)
 
-      (12...22).each { |i| @data_buffer.write_byte(0, i) }
+      (12...18).each { |i| @data_buffer.write_byte(0, i) }
 
       # Initialize timeout. It will be written later.
+      @data_buffer.write_int32(policy.read_touch_ttl_percent, 18)
       @data_buffer.write_byte(0, 22)
       @data_buffer.write_byte(0, 23)
       @data_buffer.write_byte(0, 24)

data/lib/aerospike/command/delete_command.rb

@@ -59,13 +59,13 @@ module Aerospike
 
       if result_code == Aerospike::ResultCode::FILTERED_OUT
         if @policy.fail_on_filtered_out
-          raise Aerospike::Exceptions::Aerospike.new(result_code)
+          raise Aerospike::Exceptions::Aerospike.new(result_code, nil, [@node])
         end
         @existed = true
         return
       end
 
-      raise Aerospike::Exceptions::Aerospike.new(result_code)
+      raise Aerospike::Exceptions::Aerospike.new(result_code, nil, [@node])
     end
 
   end # class

data/lib/aerospike/command/exists_command.rb

@@ -59,13 +59,13 @@ module Aerospike
 
       if result_code == Aerospike::ResultCode::FILTERED_OUT
         if @policy.fail_on_filtered_out
-          raise Aerospike::Exceptions::Aerospike.new(result_code)
+          raise Aerospike::Exceptions::Aerospike.new(result_code, nil, [@node])
         end
         @exists = true
         return
       end
 
-      raise Aerospike::Exceptions::Aerospike.new(result_code)
+      raise Aerospike::Exceptions::Aerospike.new(result_code, nil, [@node])
     end
 
   end # class

data/lib/aerospike/command/multi_command.rb

@@ -24,7 +24,7 @@ module Aerospike
   class MultiCommand < Command #:nodoc:
 
     def initialize(node)
-      super(node)
+      super
 
       @valid = true
       @mutex = Mutex.new
@@ -69,7 +69,7 @@ module Aerospike
 
             # inflate the results
             # TODO: reuse the current buffer
-            uncompressed = Zlib::inflate(@data_buffer.buf)
+            uncompressed = Zlib.inflate(@data_buffer.buf)
             receive_size = uncompressed.size - 8
 
             @compressed_data_buffer = Buffer.new(-1, uncompressed)
@@ -83,11 +83,11 @@ module Aerospike
           end
         end
 
-        if receive_size > 0
-          status = parse_group(receive_size)
-        else
-          status = false
-        end
+        status = if receive_size > 0
+          parse_group(receive_size)
+                 else
+          false
+                 end
       end
     end
 
@@ -101,10 +101,10 @@ module Aerospike
         # The only valid server return codes are "ok", "not found" and "filtered out".
         # If other return codes are received, then abort the batch.
         if result_code != 0
-            if result_code == Aerospike::ResultCode::KEY_NOT_FOUND_ERROR || result_code == Aerospike::ResultCode::FILTERED_OUT
+            if [Aerospike::ResultCode::KEY_NOT_FOUND_ERROR, Aerospike::ResultCode::FILTERED_OUT].include?(result_code)
               # NOOP
             else
-              raise Aerospike::Exceptions::Aerospike.new(result_code)
+              raise Aerospike::Exceptions::Aerospike.new(result_code, nil, [@node])
             end
         end
 
@@ -145,7 +145,7 @@ module Aerospike
         when Aerospike::FieldType::TABLE
           set_name = @data_buffer.read(1, size).force_encoding('utf-8')
         when Aerospike::FieldType::KEY
-          user_key = Aerospike::bytes_to_key_value(@data_buffer.read(1).ord, @data_buffer, 2, size-1)
+          user_key = Aerospike.bytes_to_key_value(@data_buffer.read(1).ord, @data_buffer, 2, size-1)
         when Aerospike::FieldType::BVAL_ARRAY
           bval = @data_buffer.read_uint64_little_endian(1)
         end
@@ -207,7 +207,7 @@ module Aerospike
         # Corrupted data streams can result in a huge length.
         # Do a sanity check here.
         if length > Aerospike::Buffer::MAX_BUFFER_SIZE
-          raise Aerospike::Exceptions::Parse.new("Invalid read_bytes length: #{length}")
+          raise Aerospike::Exceptions::Parse.new("Invalid read_bytes length: #{length}", [@node])
         end
         @data_buffer = Buffer.new(length)
       end

data/lib/aerospike/command/read_command.rb

@@ -70,7 +70,7 @@ module Aerospike
 
           # inflate the results
           # TODO: reuse the current buffer
-          uncompressed = Zlib::inflate(@data_buffer.buf)
+          uncompressed = Zlib.inflate(@data_buffer.buf)
 
           @data_buffer = Buffer.new(-1, uncompressed)
         rescue => e
@@ -126,7 +126,7 @@ module Aerospike
 
       if result_code == Aerospike::ResultCode::FILTERED_OUT
         if @policy.fail_on_filtered_out
-          raise Aerospike::Exceptions::Aerospike.new(result_code)
+          raise Aerospike::Exceptions::Aerospike.new(result_code, nil, [@node])
         end
         return
       end
@@ -141,19 +141,19 @@ module Aerospike
         end
       end
 
-      raise Aerospike::Exceptions::Aerospike.new(result_code)
+      raise Aerospike::Exceptions::Aerospike.new(result_code, nil, [@node])
     end
 
     def handle_udf_error(result_code)
       ret = @record.bins['FAILURE']
-      raise Aerospike::Exceptions::Aerospike.new(result_code, ret) if ret
-      raise Aerospike::Exceptions::Aerospike.new(result_code)
+      raise Aerospike::Exceptions::Aerospike.new(result_code, ret, [@node]) if ret
+      raise Aerospike::Exceptions::Aerospike.new(result_code, nil, [@node])
     end
 
     def parse_record(op_count, field_count, generation, expiration)
       bins = op_count > 0 ? {} : nil
       receive_offset = 0
-      single_bin_value = (!(OperatePolicy === policy) || policy.record_bin_multiplicity == RecordBinMultiplicity::SINGLE)
+      single_bin_value = !policy.is_a?(OperatePolicy) || policy.record_bin_multiplicity == RecordBinMultiplicity::SINGLE
 
       # There can be fields in the response (setname etc).
       # But for now, ignore them. Expose them to the API if needed in the future.
@@ -181,7 +181,7 @@ module Aerospike
 
         if single_bin_value || !bins.has_key?(name)
           bins[name] = value
-        elsif (prev = bins[name]).kind_of?(OpResults)
+        elsif (prev = bins[name]).is_a?(OpResults)
           prev << value
         else
           bins[name] = OpResults.new << prev << value

data/lib/aerospike/command/read_header_command.rb

@@ -50,7 +50,7 @@ module Aerospike
       if result_code == 0
         generation = @data_buffer.read_int32(14)
         expiration = @data_buffer.read_int32(18)
-        @record = Record.new(@node, @key, nil,  generation, expiration)
+        @record = Record.new(@node, @key, nil, generation, expiration)
         return
       end
 
@@ -62,12 +62,12 @@ module Aerospike
       if result_code == Aerospike::ResultCode::FILTERED_OUT
         @record = nil
         if @policy.fail_on_filtered_out
-          raise Aerospike::Exceptions::Aerospike.new(result_code)
+          raise Aerospike::Exceptions::Aerospike.new(result_code, nil, [@node])
         end
         return
       end
 
-      raise Aerospike::Exceptions::Aerospike.new(result_code)
+      raise Aerospike::Exceptions::Aerospike.new(result_code, nil, [@node])
     end
 
   end # class

data/lib/aerospike/command/touch_command.rb

@@ -59,7 +59,7 @@ module Aerospike
 
           # inflate the results
           # TODO: reuse the current buffer
-          uncompressed = Zlib::inflate(@data_buffer.buf)
+          uncompressed = Zlib.inflate(@data_buffer.buf)
 
           @data_buffer = Buffer.new(-1, uncompressed)
         rescue => e
@@ -81,12 +81,12 @@ module Aerospike
 
       if result_code == Aerospike::ResultCode::FILTERED_OUT
         if @policy.fail_on_filtered_out
-          raise Aerospike::Exceptions::Aerospike.new(result_code)
+          raise Aerospike::Exceptions::Aerospike.new(result_code, nil, [@node])
         end
         return
       end
 
-      raise Aerospike::Exceptions::Aerospike.new(result_code)
+      raise Aerospike::Exceptions::Aerospike.new(result_code, nil, [@node])
     end
 
   end # class

data/lib/aerospike/command/write_command.rb

@@ -23,7 +23,6 @@ module Aerospike
   class WriteCommand < SingleCommand #:nodoc:
 
     def initialize(cluster, policy, key, bins, operation)
-
       super(cluster, key)
 
       @bins =          bins
@@ -60,12 +59,12 @@ module Aerospike
 
       if result_code == Aerospike::ResultCode::FILTERED_OUT
         if @policy.fail_on_filtered_out
-          raise Aerospike::Exceptions::Aerospike.new(result_code)
+          raise Aerospike::Exceptions::Aerospike.new(result_code, nil, [@node])
         end
         return
       end
 
-      raise Aerospike::Exceptions::Aerospike.new(result_code)
+      raise Aerospike::Exceptions::Aerospike.new(result_code, nil, [@node])
     end
 
   end # class

data/lib/aerospike/exp/exp_map.rb

@@ -476,21 +476,21 @@ module Aerospike
     def self.get_value_type(return_type)
       t = return_type & ~CDT::MapReturnType::INVERTED
       case t
-      when MapReturnType::INDEX, MapReturnType::REVERSE_INDEX, MapReturnType::RANK, MapReturnType::REVERSE_RANK
+      when CDT::MapReturnType::INDEX, CDT::MapReturnType::REVERSE_INDEX, CDT::MapReturnType::RANK, CDT::MapReturnType::REVERSE_RANK
           # This method only called from expressions that can return multiple integers (ie list).
           Exp::Type::LIST
 
-      when MapReturnType::COUNT
+      when CDT::MapReturnType::COUNT
           Exp::Type::INT
 
-      when MapReturnType::KEY, MapReturnType::VALUE
+      when CDT::MapReturnType::KEY, CDT::MapReturnType::VALUE
           # This method only called from expressions that can return multiple objects (ie list).
           Exp::Type::LIST
 
-      when MapReturnType::KEY_VALUE, MapReturnType::ORDERED_MAP, MapReturnType::UNORDERED_MAP
+      when CDT::MapReturnType::KEY_VALUE, CDT::MapReturnType::ORDERED_MAP, CDT::MapReturnType::UNORDERED_MAP
           Exp::Type::MAP
 
-      when MapReturnType::EXISTS
+      when CDT::MapReturnType::EXISTS
           Exp::Type::BOOL
 
       else

data/lib/aerospike/node/verify/cluster_name.rb

@@ -25,7 +25,7 @@ module Aerospike
           def call(node, info_map)
             if node.cluster_name && node.cluster_name != info_map['cluster-name']
               node.inactive!
-              raise Aerospike::Exceptions::Aerospike.new(Aerospike::ResultCode::INVALID_NODE_ERROR, "Cluster name does not match. expected: #{node.cluster_name}, got: #{info_map['cluster-name']}")
+              raise Aerospike::Exceptions::Aerospike.new(Aerospike::ResultCode::INVALID_NODE_ERROR, "Cluster name does not match. expected: #{node.cluster_name}, got: #{info_map['cluster-name']}", [node])
             end
           end
         end

data/lib/aerospike/node/verify/name.rb

@@ -25,15 +25,15 @@ module Aerospike
           def call(node, info_map)
             info_name = info_map['node']
 
-            if !info_name
+            unless info_name
               node.decrease_health
-              raise Aerospike::Exceptions::Aerospike.new(Aerospike::ResultCode::INVALID_NODE_ERROR, 'Node name is empty')
+              raise Aerospike::Exceptions::Aerospike.new(Aerospike::ResultCode::INVALID_NODE_ERROR, 'Node name is empty', [node])
             end
 
-            if !(node.name == info_name)
+            unless node.name == info_name
               # Set node to inactive immediately.
               node.inactive!
-              raise Aerospike::Exceptions::Aerospike.new(Aerospike::ResultCode::INVALID_NODE_ERROR, "Node name has changed. Old=#{node.name} New= #{info_name}")
+              raise Aerospike::Exceptions::Aerospike.new(Aerospike::ResultCode::INVALID_NODE_ERROR, "Node name has changed. Old=#{node.name} New= #{info_name}", [node])
             end
           end
         end

data/lib/aerospike/node/verify/partition_generation.rb

@@ -27,7 +27,7 @@ module Aerospike
           def call(node, info_map)
             gen_string = info_map.fetch('partition-generation', nil)
 
-            raise Aerospike::Exceptions::Parse.new('partition-generation is empty') if gen_string.to_s.empty?
+            raise Aerospike::Exceptions::Parse.new('partition-generation is empty', [node]) if gen_string.to_s.empty?
 
             generation = gen_string.to_i
 

data/lib/aerospike/node/verify/peers_generation.rb

@@ -25,7 +25,7 @@ module Aerospike
           def call(node, info_map, peers)
             gen_string = info_map.fetch('peers-generation', nil)
 
-            raise Aerospike::Exceptions::Parse.new('peers-generation is empty') if gen_string.to_s.empty?
+            raise Aerospike::Exceptions::Parse.new('peers-generation is empty', node) if gen_string.to_s.empty?
 
             generation = gen_string.to_i
 

data/lib/aerospike/node/verify/rebalance_generation.rb

@@ -27,7 +27,7 @@ module Aerospike
           def call(node, info_map)
             gen_string = info_map.fetch('rebalance-generation', nil)
 
-            raise Aerospike::Exceptions::Parse.new('rebalance-generation is empty') if gen_string.to_s.empty?
+            raise Aerospike::Exceptions::Parse.new('rebalance-generation is empty', node) if gen_string.to_s.empty?
 
             generation = gen_string.to_i
 

data/lib/aerospike/policy/batch_read_policy.rb

@@ -20,7 +20,7 @@ module Aerospike
   # Policy attributes used in batch read commands.
   class BatchReadPolicy
 
-    attr_accessor :filter_exp
+    attr_accessor :filter_exp, :read_touch_ttl_percent
 
     def initialize(opt={})
       # Optional expression filter. If filter_exp exists and evaluates to false, the specific batch key
@@ -33,6 +33,23 @@ module Aerospike
       #
       # Default: nil
       @filter_exp = opt[:filter_exp]
+
+      # Determines how record TTL (time to live) is affected on reads. When enabled, the server can
+      # efficiently operate as a read-based LRU cache where the least recently used records are expired.
+      # The value is expressed as a percentage of the TTL sent on the most recent write such that a read
+      # within this interval of the record’s end of life will generate a touch.
+      #
+      # For example, if the most recent write had a TTL of 10 hours and read_touch_ttl_percent is set to
+      # 80, the next read within 8 hours of the record's end of life (equivalent to 2 hours after the most
+      # recent write) will result in a touch, resetting the TTL to another 10 hours.
+      #
+      # Values:
+      #
+      # 0 : Use server config default-read-touch-ttl-pct for the record's namespace/set.
+      # -1 : Do not reset record TTL on reads.
+      # 1 - 100 : Reset record TTL on reads when within this percentage of the most recent write TTL.
+      # Default: 0
+      @read_touch_ttl_percent = opt[:read_touch_ttl_percent] || 0
     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,
-                  :fail_on_filtered_out, :replica, :use_compression, :socket_timeout
+                  :fail_on_filtered_out, :replica, :use_compression, :socket_timeout, :read_touch_ttl_percent
 
     alias total_timeout timeout
     alias total_timeout= timeout=
@@ -95,6 +95,23 @@ module Aerospike
       # has not yet been exceeded.
       @max_retries = opt[:max_retries] || 2
 
+      # Determines how record TTL (time to live) is affected on reads. When enabled, the server can
+      # efficiently operate as a read-based LRU cache where the least recently used records are expired.
+      # The value is expressed as a percentage of the TTL sent on the most recent write such that a read
+      # within this interval of the record’s end of life will generate a touch.
+      #
+      # For example, if the most recent write had a TTL of 10 hours and read_touch_ttl_percent is set to
+      # 80, the next read within 8 hours of the record's end of life (equivalent to 2 hours after the most
+      # recent write) will result in a touch, resetting the TTL to another 10 hours.
+      #
+      # Values:
+      #
+      # 0 : Use server config default-read-touch-ttl-pct for the record's namespace/set.
+      # -1 : Do not reset record TTL on reads.
+      # 1 - 100 : Reset record TTL on reads when within this percentage of the most recent write TTL.
+      # Default: 0
+      @read_touch_ttl_percent = opt[:read_touch_ttl_percent] || 0
+
       # Duration to sleep between retries if a transaction fails and the
       # timeout was not exceeded. Enter zero to skip sleep.
       @sleep_between_retries = opt[:sleep_between_retries] || 0.5

data/lib/aerospike/policy/query_duration.rb

@@ -0,0 +1,48 @@
+# encoding: utf-8
+# Copyright 2014-2024 Aerospike, Inc.
+#
+# 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
+
+  # Defines the expected query duration. The server treats the query in different ways depending on the expected duration.
+  # This enum is ignored for aggregation queries, background queries and server versions < 6.0.
+  module QueryDuration
+
+    # The query is expected to return more than 100 records per node. The server optimizes for a large record set in
+    # the following ways:
+    #
+    # Allow query to be run in multiple threads using the server's query threading configuration.
+    # Do not relax read consistency for AP namespaces.
+    # Add the query to the server's query monitor.
+    # Do not add the overall latency to the server's latency histogram.
+    # Do not allow server timeouts.
+    LONG = 0
+
+    # The query is expected to return less than 100 records per node. The server optimizes for a small record set in
+    # the following ways:
+    # Always run the query in one thread and ignore the server's query threading configuration.
+    # Allow query to be inlined directly on the server's service thread.
+    # Relax read consistency for AP namespaces.
+    # Do not add the query to the server's query monitor.
+    # Add the overall latency to the server's latency histogram.
+    # Allow server timeouts. The default server timeout for a short query is 1 second.
+    SHORT = 1
+
+    # Treat query as a LONG query, but relax read consistency for AP namespaces.
+    # This value is treated exactly like LONG for server versions < 7.1.
+    LONG_RELAX_AP = 2
+
+  end # module
+
+end # module

data/lib/aerospike/policy/query_policy.rb

@@ -15,6 +15,7 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
+require 'aerospike/policy/query_duration'
 require 'aerospike/policy/policy'
 
 module Aerospike
@@ -22,16 +23,10 @@ module Aerospike
   # Container object for query policy command.
   class QueryPolicy < Policy
 
-    attr_accessor :concurrent_nodes
-    attr_accessor :max_records
-    attr_accessor :include_bin_data
-    attr_accessor :record_queue_size
-    attr_accessor :records_per_second
-    attr_accessor :socket_timeout
-    attr_accessor :short_query
+    attr_accessor :concurrent_nodes, :max_records, :include_bin_data, :record_queue_size, :records_per_second, :socket_timeout, :short_query, :expected_duration
 
     def initialize(opt={})
-      super(opt)
+      super
 
       # Indicates if bin data is retrieved. If false, only record digests (and
       # user keys if stored on the server) are retrieved.
@@ -74,11 +69,21 @@ module Aerospike
       # Default is 0
       @records_per_second = opt[:records_per_second] || 0
 
+      # Expected query duration. The server treats the query in different ways depending on the expected duration.
+      # This field is ignored for aggregation queries, background queries and server versions < 6.0.
+      #
+      # Default: QueryDuration::LONG
+      @expected_duration = opt[:expected_duration] || QueryDuration::LONG
+
+      # DEPRECATED
       # Detemine wether query expected to return less than 100 records.
       # If true, the server will optimize the query for a small record set.
       # This field is ignored for aggregation queries, background queries
       # and server versions 6.0+.
       #
+      # This field is deprecated and will eventually be removed. Use {expected_duration} instead.
+      # For backwards compatibility: If ShortQuery is true, the query is treated as a short query and
+      # {expected_duration} is ignored. If {short_query} is false, {expected_duration} is used as defaults to {Policy#QueryDuration#LONG}.
       # Default: false
       @short_query = opt[:short_query] ||false
 

data/lib/aerospike/query/partition_tracker.rb

@@ -77,7 +77,7 @@ module Aerospike
 
       pmap = cluster.partitions
       replica_array = pmap[namespace]
-      raise Aerospike::Exceptions::InvalidNamespace("namespace not found in the partition map") if !replica_array
+      raise Aerospike::Exceptions::InvalidNamespace.new("namespace not found in the partition map") if !replica_array
 
       master = (replica_array.get)[0]
       master = master.get

data/lib/aerospike/query/server_command.rb

@@ -45,7 +45,7 @@ module Aerospike
         if result_code == Aerospike::ResultCode::KEY_NOT_FOUND_ERROR
           return false
         end
-        raise Aerospike::Exceptions::Aerospike.new(result_code)
+        raise Aerospike::Exceptions::Aerospike.new(result_code, nil, [@node])
       end
       op_count = @data_buffer.read_int16(20)
       if op_count <= 0

data/lib/aerospike/query/stream_command.rb

@@ -46,7 +46,7 @@ module Aerospike
           read_bytes(receive_size - @data_offset) if @data_offset < receive_size
           return nil
         else
-          raise Aerospike::Exceptions::Aerospike.new(result_code)
+          raise Aerospike::Exceptions::Aerospike.new(result_code, nil, [@node])
         end
 
         info3 = @data_buffer.read(3).ord
@@ -72,17 +72,16 @@ module Aerospike
           next
         end
 
-        if result_code == 0
-          if @recordset.active?
-            @recordset.records.enq(parse_record(key, op_count, generation, expiration))
-          else
-            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
+        next unless result_code == 0
+        if @recordset.active?
+          @recordset.records.enq(parse_record(key, op_count, generation, expiration))
+        else
+          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 # while
 
       true

data/lib/aerospike/result_code.rb

@@ -168,6 +168,9 @@ module Aerospike
     # Write command loses conflict to XDR.
     LOST_CONFLICT = 28
 
+    # Write can't complete until XDR finishes shipping.
+    XDR_KEY_BUSY = 32
+
     # There are no more records left for query.
     QUERY_END = 50
 
@@ -445,6 +448,10 @@ module Aerospike
       when LOST_CONFLICT
         "Write command loses conflict to XDR."
 
+      # Write can't complete until XDR finishes shipping.
+      when XDR_KEY_BUSY
+        "XDR key busy"
+
       when QUERY_END
         "Query end"
 
@@ -580,7 +587,6 @@ module Aerospike
       else
         "ResultCode #{code} unknown in the client. Please file a github issue."
       end # case
-
     end
 
   end # class

data/lib/aerospike/version.rb

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

data/lib/aerospike.rb

@@ -90,6 +90,7 @@ require "aerospike/cdt/bit_policy"
 require "aerospike/geo_json"
 require "aerospike/ttl"
 
+require "aerospike/policy/query_duration"
 require "aerospike/policy/client_policy"
 require "aerospike/policy/priority"
 require "aerospike/policy/record_exists_action"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aerospike
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.2.0
 platform: ruby
 authors:
 - Khosrow Afroozeh
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-14 00:00:00.000000000 Z
+date: 2024-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -166,6 +166,7 @@ files:
 - lib/aerospike/policy/operate_policy.rb
 - lib/aerospike/policy/policy.rb
 - lib/aerospike/policy/priority.rb
+- lib/aerospike/policy/query_duration.rb
 - lib/aerospike/policy/query_policy.rb
 - lib/aerospike/policy/record_bin_multiplicity.rb
 - lib/aerospike/policy/record_exists_action.rb