aerospike 2.29.0 → 4.0.0

data/lib/aerospike/query/query_partition_command.rb

@@ -21,243 +21,17 @@ module Aerospike
   private
 
   class QueryPartitionCommand < QueryCommand #:nodoc:
-    def initialize(node, tracker, policy, statement, recordset, node_partitions)
-      super(node, policy, statement, recordset, @node_partitions)
+    def initialize(cluster, node, tracker, policy, statement, recordset, node_partitions)
+      super(cluster, node, policy, statement, recordset, @node_partitions)
       @node_partitions = node_partitions
       @tracker = tracker
     end
 
     def write_buffer
-      function_arg_buffer = nil
-      field_count = 0
-      filter_size = 0
-      bin_name_size = 0
-
-      begin_cmd
-
-      if @statement.namespace
-        @data_offset += @statement.namespace.bytesize + FIELD_HEADER_SIZE
-        field_count += 1
-      end
-
-      if @statement.set_name
-        @data_offset += @statement.set_name.bytesize + FIELD_HEADER_SIZE
-        field_count += 1
-      end
-
-      # Estimate recordsPerSecond field size. This field is used in new servers and not used
-      # (but harmless to add) in old servers.
-      if @policy.records_per_second > 0
-        @data_offset += 4 + FIELD_HEADER_SIZE
-        field_count += 1
-      end
-
-      # Estimate socket timeout field size. This field is used in new servers and not used
-      # (but harmless to add) in old servers.
-      @data_offset += 4 + FIELD_HEADER_SIZE
-      field_count += 1
-
-      # Estimate task_id field.
-      @data_offset += 8 + FIELD_HEADER_SIZE
-      field_count += 1
-
-      filter = @statement.filters[0]
-      bin_names = @statement.bin_names
-      packed_ctx = nil
-
-      if filter
-        col_type = filter.collection_type
-
-        # Estimate INDEX_TYPE field.
-        if col_type > 0
-          @data_offset += FIELD_HEADER_SIZE + 1
-          field_count += 1
-        end
-
-        # Estimate INDEX_RANGE field.
-        @data_offset += FIELD_HEADER_SIZE
-        filter_size += 1  # num filters
-        filter_size += filter.estimate_size
-
-        @data_offset += filter_size
-        field_count += 1
-
-        packed_ctx = filter.packed_ctx
-        if packed_ctx
-          @data_offset += FIELD_HEADER_SIZE + packed_ctx.length
-          field_count += 1
-        end
-      end
-
-      @statement.set_task_id
-      predexp = @policy.predexp || @statement.predexp
-
-      if predexp
-        @data_offset += FIELD_HEADER_SIZE
-        pred_size = Aerospike::PredExp.estimate_size(predexp)
-        @data_offset += pred_size
-        field_count += 1
-      end
-
-      unless @policy.filter_exp.nil?
-        exp_size = estimate_expression_size(@policy.filter_exp)
-        field_count += 1 if exp_size > 0
-      end
-
-      # Estimate aggregation/background function size.
-      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
-
-        function_arg_buffer = ""
-        if @statement.function_args && @statement.function_args.length > 0
-          function_arg_buffer = Value.of(@statement.function_args).to_bytes
-        end
-        @data_offset += FIELD_HEADER_SIZE + function_arg_buffer.bytesize
-        field_count += 4
-      end
-
-      max_records = 0
-      parts_full_size = 0
-      parts_partial_digest_size = 0
-      parts_partial_bval_size = 0
-
-      unless @node_partitions.nil?
-        parts_full_size = @node_partitions.parts_full.length * 2
-        parts_partial_digest_size = @node_partitions.parts_partial.length * 20
-
-        unless filter.nil?
-          parts_partial_bval_size = @node_partitions.parts_partial.length * 8
-        end
-        max_records = @node_partitions.record_max
-      end
-
-      if parts_full_size > 0
-        @data_offset += parts_full_size + FIELD_HEADER_SIZE
-        field_count += 1
-      end
-
-      if parts_partial_digest_size > 0
-        @data_offset += parts_partial_digest_size + FIELD_HEADER_SIZE
-        field_count += 1
-      end
-
-      if parts_partial_bval_size > 0
-        @data_offset += parts_partial_bval_size + FIELD_HEADER_SIZE
-        field_count += 1
-      end
-
-      # Estimate max records field size. This field is used in new servers and not used
-      # (but harmless to add) in old servers.
-      if max_records > 0
-        @data_offset += 8 + FIELD_HEADER_SIZE
-        field_count += 1
-      end
-
-      operation_count = 0
-      unless bin_names.empty?
-        # Estimate size for selected bin names (query bin names already handled for old servers).
-        bin_names.each do |bin_name|
-          estimate_operation_size_for_bin_name(bin_name)
-        end
-        operation_count = bin_names.length
-      end
-
-      projected_offset = @data_offset
-
-      size_buffer
-
-      read_attr = INFO1_READ
-      read_attr |= INFO1_NOBINDATA if !@policy.include_bin_data
-      read_attr |= INFO1_SHORT_QUERY if @policy.short_query
-
-      infoAttr = INFO3_PARTITION_DONE
-
-      write_header(@policy, read_attr, 0, field_count, operation_count)
-
-      write_field_string(@statement.namespace, FieldType::NAMESPACE) if @statement.namespace
-      write_field_string(@statement.set_name, FieldType::TABLE) if @statement.set_name
-
-      # Write records per second.
-      write_field_int(@policy.records_per_second, FieldType::RECORDS_PER_SECOND) if @policy.records_per_second > 0
-
-      write_filter_exp(@policy.filter_exp, exp_size)
-
-      # Write socket idle timeout.
-      write_field_int(@policy.socket_timeout, FieldType::SOCKET_TIMEOUT)
-
-      # Write task_id field
-      write_field_int64(@statement.task_id, FieldType::TRAN_ID)
-
-      unless predexp.nil?
-        write_field_header(pred_size, Aerospike::FieldType::PREDEXP)
-        @data_offset = Aerospike::PredExp.write(
-          predexp, @data_buffer, @data_offset
-        )
-      end
-
-      if filter
-        type = filter.collection_type
-
-        if type > 0
-          write_field_header(1, FieldType::INDEX_TYPE)
-          @data_offset += @data_buffer.write_byte(type, @data_offset)
-        end
-
-        write_field_header(filter_size, FieldType::INDEX_RANGE)
-        @data_offset += @data_buffer.write_byte(1, @data_offset)
-        @data_offset = filter.write(@data_buffer, @data_offset)
-
-        if packed_ctx
-          write_field_header(packed_ctx.length, FieldType::INDEX_CONTEXT)
-          @data_offset += @data_buffer.write_binary(packed_ctx, @data_offset)
-        end
-      end
-
-      if @statement.function_name
-        write_field_header(1, FieldType::UDF_OP)
-        @data_offset += @data_buffer.write_byte(1, @data_offset)
-        write_field_string(@statement.package_name, FieldType::UDF_PACKAGE_NAME)
-        write_field_string(@statement.function_name, FieldType::UDF_FUNCTION)
-        write_field_string(function_arg_buffer, FieldType::UDF_ARGLIST)
-      end
-
-      if parts_full_size > 0
-        write_field_header(parts_full_size, FieldType::PID_ARRAY)
-        @node_partitions.parts_full.each do |part|
-          @data_offset += @data_buffer.write_uint16_little_endian(part.id, @data_offset)
-        end
-      end
-
-      if parts_partial_digest_size > 0
-        write_field_header(parts_partial_digest_size, FieldType::DIGEST_ARRAY)
-        @node_partitions.parts_partial.each do |part|
-          @data_offset += @data_buffer.write_binary(part.digest, @data_offset)
-        end
-      end
-
-      if parts_partial_bval_size > 0
-        write_field_header(parts_partial_bval_size, FieldType::BVAL_ARRAY)
-        @node_partitions.parts_partial.each do |part|
-          @data_offset += @data_buffer.write_uint64_little_endian(part.bval, @data_offset)
-        end
-      end
-
-      if max_records > 0
-        write_field(max_records, FieldType::MAX_RECORDS)
-      end
-
-      unless bin_names.empty?
-        bin_names.each do |bin_name|
-          write_operation_for_bin_name(bin_name, Operation::READ)
-        end
-      end
+      set_query(@cluster, @policy, @statement, false, @node_partitions)
+    end
 
-      end_cmd
 
-      nil
-    end
 
     def should_retry(e)
       # !! converts nil to false

data/lib/aerospike/query/scan_executor.rb

@@ -34,7 +34,7 @@ module Aerospike
           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)
+              command = ScanPartitionCommand.new(cluster, policy, tracker, node_partition, namespace, set_name, bin_names, recordset)
               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 = ScanPartitionCommand.new(policy, tracker, node_partition, namespace, set_name, bin_names, recordset)
+            command = ScanPartitionCommand.new(cluster, policy, tracker, node_partition, namespace, set_name, bin_names, recordset)
             begin
               command.execute
             rescue => e

data/lib/aerospike/query/scan_partition_command.rb

@@ -23,9 +23,9 @@ module Aerospike
 
   class ScanPartitionCommand < StreamCommand #:nodoc:
 
-    def initialize(policy, tracker, node_partitions, namespace, set_name, bin_names, recordset)
+    def initialize(cluster, policy, tracker, node_partitions, namespace, set_name, bin_names, recordset)
       super(node_partitions.node)
-
+      @cluster = cluster
       @policy = policy
       @namespace = namespace
       @set_name = set_name
@@ -36,7 +36,7 @@ module Aerospike
     end
 
     def write_buffer
-      set_scan(@policy, @namespace, @set_name, @bin_names, @node_partitions)
+      set_scan(@cluster, @policy, @namespace, @set_name, @bin_names, @node_partitions)
     end
 
     def should_retry(e)

data/lib/aerospike/query/server_command.rb

@@ -33,10 +33,10 @@ module Aerospike
     end
 
     def write_buffer
-      set_query(@policy, @statement, background, nil)
+      set_query(@cluster, @policy, @statement, true, nil)
     end
 
-    def parse_row
+    def parse_row(result_code)
       field_count = @data_buffer.read_int16(18)
       result_code = @data_buffer.read(5).ord & 0xFF
       skip_key(field_count)

data/lib/aerospike/query/statement.rb

@@ -21,9 +21,7 @@ module Aerospike
   # index name, filters, and operations.
   class Statement
 
-    attr_accessor :namespace, :set_name, :index_name, :bin_names, :task_id
-    attr_accessor :filters, :package_name, :function_name, :function_args, :operations
-    attr_accessor :predexp, :return_data, :records_per_second
+    attr_accessor :namespace, :set_name, :index_name, :bin_names, :task_id, :filters, :package_name, :function_name, :function_args, :operations, :return_data, :records_per_second
 
     def initialize(namespace, set_name, bin_names=[])
       # Namespace determines query Namespace
@@ -46,16 +44,6 @@ module Aerospike
       # aggregation function.
       @filters = []
 
-      # Predicate expressions in postfix notation. If the expression is evaluated to false,
-      # the record will be ommited in the results.
-      #
-      # 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
-      # deprecated in the future.
-      @predexp = nil
-
       @package_name  = nil
       @function_name = nil
       @function_args = nil
@@ -83,27 +71,23 @@ module Aerospike
     end
 
     def is_scan?
-      return (filters.nil? || (filters.empty?))
+      filters.nil? || filters.empty?
     end
 
     def set_task_id
-      while @task_id == 0
-        @task_id = rand(RAND_MAX)
-      end
+      @task_id = rand(RAND_MAX) while @task_id == 0
     end
 
     def reset_task_id
       @task_id = rand(RAND_MAX)
-      while @task_id == 0
-        @task_id = rand(RAND_MAX)
-      end
+      @task_id = rand(RAND_MAX) while @task_id == 0
     end
 
 
 
     private
 
-    RAND_MAX = 2**63 - 1
+    RAND_MAX = (2**63) - 1
 
   end # class
 end

data/lib/aerospike/task/execute_task.rb

@@ -1,4 +1,4 @@
-# Copyright 2013-2020 Aerospike, Inc.
+# Copyright 2013-2023 Aerospike, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -47,7 +47,7 @@ module Aerospike
         end
 
         conn = node.get_connection(0)
-        responseMap, _ = Info.request(conn, command)
+        responseMap, = Info.request(conn, command)
         node.put_connection(conn)
 
         response = responseMap[command]

data/lib/aerospike/utils/buffer.rb

@@ -25,7 +25,7 @@ module Aerospike
   # Buffer class to ease the work around
   class Buffer #:nodoc:
     @@buf_pool = Pool.new
-    @@buf_pool.create_proc = Proc.new { Buffer.new }
+    @@buf_pool.create_proc = proc { Buffer.new }
 
     attr_accessor :buf
 
@@ -43,7 +43,7 @@ module Aerospike
     MAX_BUFFER_SIZE = 10 * 1024 * 1024
 
     def initialize(size = DEFAULT_BUFFER_SIZE, buf = nil)
-      @buf = (buf ? buf : ("%0#{size}d" % 0))
+      @buf = buf || format("%0#{size}d", 0)
       @buf.force_encoding("binary")
       @slice_end = @buf.bytesize
     end
@@ -60,7 +60,7 @@ module Aerospike
       @buf.bytesize
     end
 
-    alias_method :length, :size
+    alias length size
 
     def eat!(n)
       @buf.replace(@buf[n..-1])
@@ -74,7 +74,7 @@ module Aerospike
       end
 
       if @buf.bytesize < length
-        @buf.concat("%0#{length - @buf.bytesize}d" % 0)
+        @buf.concat(format("%0#{length - @buf.bytesize}d", 0))
       end
       @slice_end = length
     end
@@ -144,37 +144,37 @@ module Aerospike
 
     def read_int16(offset)
       vals = @buf[offset..offset + 1]
-      vals.unpack(INT16)[0]
+      vals.unpack1(INT16)
     end
 
     def read_uint16(offset)
       vals = @buf[offset..offset + 1]
-      vals.unpack(UINT16)[0]
+      vals.unpack1(UINT16)
     end
 
     def read_int32(offset)
       vals = @buf[offset..offset + 3]
-      vals.unpack(INT32)[0]
+      vals.unpack1(INT32)
     end
 
     def read_uint32(offset)
       vals = @buf[offset..offset + 3]
-      vals.unpack(UINT32)[0]
+      vals.unpack1(UINT32)
     end
 
     def read_int64(offset)
       vals = @buf[offset..offset + 7]
-      vals.unpack(INT64)[0]
+      vals.unpack1(INT64)
     end
 
     def read_uint64_little_endian(offset)
       vals = @buf[offset..offset + 7]
-      vals.unpack(UINT64LE)[0]
+      vals.unpack1(UINT64LE)
     end
 
     def read_uint64(offset)
       vals = @buf[offset..offset + 7]
-      vals.unpack(UINT64)[0]
+      vals.unpack1(UINT64)
     end
 
     def read_var_int64(offset, len)
@@ -190,7 +190,7 @@ module Aerospike
 
     def read_double(offset)
       vals = @buf[offset..offset + 7]
-      vals.unpack(DOUBLE)[0]
+      vals.unpack1(DOUBLE)
     end
 
     def read_bool(offset, length)
@@ -219,13 +219,13 @@ module Aerospike
       @buf.bytes[start...finish].each do |c|
         if counter >= start
           print "%02x " % c
-          ascii << (c.between?(32, 126) ? c : ?.)
-          print " " if ascii.length == (width / 2 + 1)
+          ascii << (c.between?(32, 126) ? c : '.')
+          print " " if ascii.length == ((width / 2) + 1)
           if ascii.length > width
             ascii << "|"
             puts ascii
             ascii = "|"
-            print "%08x  " % (counter + 1)
+            print format("%08x  ", (counter + 1))
           end
         end
         counter += 1

data/lib/aerospike/version.rb

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

data/lib/aerospike.rb

@@ -43,8 +43,8 @@ require "aerospike/version"
 require "aerospike/value/particle_type"
 require "aerospike/value/value"
 require "aerospike/command/single_command"
-require "aerospike/command/batch_direct_node"
 require "aerospike/command/batch_index_node"
+require "aerospike/command/batch_operate_node"
 require "aerospike/command/field_type"
 require "aerospike/command/command"
 require "aerospike/command/execute_command"
@@ -53,9 +53,8 @@ require "aerospike/command/batch_item"
 require "aerospike/command/operate_command"
 require "aerospike/command/exists_command"
 require "aerospike/command/multi_command"
-require "aerospike/command/batch_direct_command"
-require "aerospike/command/batch_direct_exists_command"
 require "aerospike/command/batch_index_command"
+require "aerospike/command/batch_operate_command"
 require "aerospike/command/batch_index_exists_command"
 require "aerospike/command/read_header_command"
 require "aerospike/command/touch_command"
@@ -97,6 +96,10 @@ require "aerospike/policy/record_exists_action"
 require "aerospike/policy/generation_policy"
 require "aerospike/policy/policy"
 require "aerospike/policy/batch_policy"
+require "aerospike/policy/batch_delete_policy"
+require "aerospike/policy/batch_read_policy"
+require "aerospike/policy/batch_udf_policy"
+require "aerospike/policy/batch_write_policy"
 require "aerospike/policy/write_policy"
 require "aerospike/policy/scan_policy"
 require "aerospike/policy/query_policy"
@@ -105,6 +108,13 @@ require "aerospike/policy/commit_level"
 require "aerospike/policy/admin_policy"
 require "aerospike/policy/auth_mode"
 
+require "aerospike/batch_record"
+require "aerospike/batch_attr"
+require "aerospike/batch_read"
+require "aerospike/batch_write"
+require "aerospike/batch_delete"
+require "aerospike/batch_udf"
+
 require "aerospike/socket/base"
 require "aerospike/socket/ssl"
 require "aerospike/socket/tcp"
@@ -160,7 +170,6 @@ require "aerospike/query/stream_command"
 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"
@@ -178,14 +187,6 @@ require "aerospike/exp/exp_bit"
 require "aerospike/exp/exp_hll"
 require "aerospike/exp/operation"
 
-require "aerospike/query/pred_exp/and_or"
-require "aerospike/query/pred_exp/geo_json_value"
-require "aerospike/query/pred_exp/integer_value"
-require "aerospike/query/pred_exp/op"
-require "aerospike/query/pred_exp/regex"
-require "aerospike/query/pred_exp/regex_flags"
-require "aerospike/query/pred_exp/string_value"
-
 module Aerospike
   extend Loggable
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aerospike
 version: !ruby/object:Gem::Version
-  version: 2.29.0
+  version: 4.0.0
 platform: ruby
 authors:
 - Khosrow Afroozeh
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-24 00:00:00.000000000 Z
+date: 2024-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -56,6 +56,13 @@ files:
 - lib/aerospike.rb
 - lib/aerospike/aerospike_exception.rb
 - lib/aerospike/atomic/atomic.rb
+- lib/aerospike/batch_attr.rb
+- lib/aerospike/batch_delete.rb
+- lib/aerospike/batch_read.rb
+- lib/aerospike/batch_record.rb
+- lib/aerospike/batch_results.rb
+- lib/aerospike/batch_udf.rb
+- lib/aerospike/batch_write.rb
 - lib/aerospike/bin.rb
 - lib/aerospike/cdt/bit_operation.rb
 - lib/aerospike/cdt/bit_overflow_action.rb
@@ -87,13 +94,12 @@ files:
 - lib/aerospike/cluster/partition_parser.rb
 - lib/aerospike/cluster/rack_parser.rb
 - lib/aerospike/command/admin_command.rb
-- lib/aerospike/command/batch_direct_command.rb
-- lib/aerospike/command/batch_direct_exists_command.rb
-- lib/aerospike/command/batch_direct_node.rb
 - lib/aerospike/command/batch_index_command.rb
 - lib/aerospike/command/batch_index_exists_command.rb
 - lib/aerospike/command/batch_index_node.rb
 - lib/aerospike/command/batch_item.rb
+- lib/aerospike/command/batch_operate_command.rb
+- lib/aerospike/command/batch_operate_node.rb
 - lib/aerospike/command/command.rb
 - lib/aerospike/command/delete_command.rb
 - lib/aerospike/command/execute_command.rb
@@ -148,7 +154,11 @@ files:
 - lib/aerospike/peers/parse.rb
 - lib/aerospike/policy/admin_policy.rb
 - lib/aerospike/policy/auth_mode.rb
+- lib/aerospike/policy/batch_delete_policy.rb
 - lib/aerospike/policy/batch_policy.rb
+- lib/aerospike/policy/batch_read_policy.rb
+- lib/aerospike/policy/batch_udf_policy.rb
+- lib/aerospike/policy/batch_write_policy.rb
 - lib/aerospike/policy/client_policy.rb
 - lib/aerospike/policy/commit_level.rb
 - lib/aerospike/policy/consistency_level.rb
@@ -168,14 +178,6 @@ files:
 - 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
-- lib/aerospike/query/pred_exp/integer_value.rb
-- lib/aerospike/query/pred_exp/op.rb
-- lib/aerospike/query/pred_exp/regex.rb
-- 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
@@ -230,7 +232,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: An Aerospike driver for Ruby.