aerospike 3.0.0 → 4.1.0

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 = "3.0.0"
+  VERSION = "4.1.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"
@@ -91,12 +90,17 @@ 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"
 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 +109,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 +171,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 +188,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: 3.0.0
+  version: 4.1.0
 platform: ruby
 authors:
 - Khosrow Afroozeh
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-18 00:00:00.000000000 Z
+date: 2024-10-22 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
@@ -156,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
@@ -168,14 +179,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 +233,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.

data/lib/aerospike/command/batch_direct_command.rb

@@ -1,105 +0,0 @@
-# Copyright 2014-2020 Aerospike, Inc.
-#
-# Portions may be licensed to Aerospike, Inc. under one or more contributor
-# license agreements.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may not
-# use this file except in compliance with the License. You may obtain a copy of
-# the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations under
-# the License.
-
-require 'aerospike/command/multi_command'
-
-module Aerospike
-
-  class BatchDirectCommand < MultiCommand #:nodoc:
-
-    attr_accessor :batch
-    attr_accessor :policy
-    attr_accessor :key_map
-    attr_accessor :bin_names
-    attr_accessor :results
-    attr_accessor :read_attr
-
-    def initialize(node, batch, policy, key_map, bin_names, results, read_attr)
-      super(node)
-
-      @batch = batch
-      @policy = policy
-      @key_map = key_map
-      @bin_names = bin_names
-      @results = results
-      @read_attr = read_attr
-    end
-
-    def write_buffer
-      # Estimate buffer size
-      begin_cmd
-      byte_size = batch.keys.length * DIGEST_SIZE
-
-      @data_offset += batch.namespace.bytesize +
-        FIELD_HEADER_SIZE + byte_size + FIELD_HEADER_SIZE
-
-      if bin_names
-        bin_names.each do |bin_name|
-          estimate_operation_size_for_bin_name(bin_name)
-        end
-      end
-
-      size_buffer
-
-      operation_count = 0
-      if bin_names
-        operation_count = bin_names.length
-      end
-
-      write_header_read(policy, read_attr, 0, 2, operation_count)
-      write_field_string(batch.namespace, Aerospike::FieldType::NAMESPACE)
-      write_field_header(byte_size, Aerospike::FieldType::DIGEST_RIPE_ARRAY)
-
-      batch.keys.each do |key|
-        @data_offset += @data_buffer.write_binary(key.digest, @data_offset)
-      end
-
-      if bin_names
-        bin_names.each do |bin_name|
-          write_operation_for_bin_name(bin_name, Aerospike::Operation::READ)
-        end
-      end
-
-      end_cmd
-      mark_compressed(@policy)
-    end
-
-    # Parse all results in the batch.  Add records to shared list.
-    # If the record was not found, the bins will be nil.
-    def parse_row(result_code)
-      generation = @data_buffer.read_int32(6)
-      expiration = @data_buffer.read_int32(10)
-      field_count = @data_buffer.read_int16(18)
-      op_count = @data_buffer.read_int16(20)
-
-      key = parse_key(field_count)
-
-      item = key_map[key.digest]
-      if item
-        if result_code == 0
-          index = item.index
-          key = item.key
-          results[index] = parse_record(key, op_count, generation, expiration)
-        end
-      else
-        Aerospike.logger.warn("Unexpected batch key returned: #{key}")
-      end
-    end
-
-  end # class
-
-end # module

data/lib/aerospike/command/batch_direct_exists_command.rb

@@ -1,51 +0,0 @@
-# Copyright 2014-2020 Aerospike, Inc.
-#
-# Portions may be licensed to Aerospike, Inc. under one or more contributor
-# license agreements.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may not
-# use this file except in compliance with the License. You may obtain a copy of
-# the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations under
-# the License.
-
-require 'aerospike/command/batch_direct_command'
-
-module Aerospike
-
-  class BatchDirectExistsCommand < BatchDirectCommand #:nodoc:
-
-    def initialize(node, batch, policy, key_map, results)
-      super(node, batch, policy, key_map, nil, results, INFO1_READ | INFO1_NOBINDATA)
-    end
-
-    # Parse all results in the batch.  Add records to shared list.
-    # If the record was not found, the bins will be nil.
-    def parse_row(result_code)
-      field_count = @data_buffer.read_int16(18)
-      op_count = @data_buffer.read_int16(20)
-
-      if op_count > 0
-        raise Aerospike::Exceptions::Parse.new('Received bins that were not requested!')
-      end
-
-      key = parse_key(field_count)
-      item = key_map[key.digest]
-
-      if item
-        index = item.index
-        results[index] = (result_code == 0)
-      else
-        Aerospike::logger.debug("Unexpected batch key returned: #{key.namespace}, #{key.digest}")
-      end
-    end
-
-  end # class
-
-end # module

data/lib/aerospike/command/batch_direct_node.rb

@@ -1,40 +0,0 @@
-# Copyright 2014-2020 Aerospike, Inc.
-#
-# Portions may be licensed to Aerospike, Inc. under one or more contributor
-# license agreements.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may not
-# use this file except in compliance with the License. You may obtain a copy of
-# the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations under
-# the License.
-
-module Aerospike
-
-  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) }
-    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

data/lib/aerospike/query/pred_exp/and_or.rb

@@ -1,32 +0,0 @@
-# frozen_string_literal: true
-
-module Aerospike
-  class PredExp
-    class AndOr < PredExp
-      def initialize(op, nexp)
-        @op = op
-        @nexp = nexp
-      end
-
-      def estimate_size
-        8
-      end
-
-      def write(buffer, offset)
-        # write type
-        buffer.write_int16(@op, offset)
-        offset += 2
-
-        # write length
-        buffer.write_int32(2, offset)
-        offset += 4
-
-        # write predicate count
-        buffer.write_int16(@nexp, offset)
-        offset += 2
-
-        offset
-      end
-    end
-  end
-end

data/lib/aerospike/query/pred_exp/geo_json_value.rb

@@ -1,41 +0,0 @@
-# frozen_string_literal: true
-
-module Aerospike
-  class PredExp
-    class GeoJsonValue < PredExp
-      def initialize(value, type)
-        @value = value
-        @type = type
-      end
-
-      def estimate_size
-        @value.bytesize + 9
-      end
-
-      def write(buffer, offset)
-        # tag
-        buffer.write_uint16(@type, offset)
-        offset += 2
-
-        # len
-        buffer.write_uint32(@value.bytesize + 3, offset)
-        offset += 4
-
-        # flags
-
-        buffer.write_byte(0, offset)
-        offset += 1
-
-        # ncells
-        buffer.write_uint16(0, offset)
-        offset += 2
-
-        # value
-        len = buffer.write_binary(@value, offset)
-        offset += len
-
-        offset
-      end
-    end
-  end
-end

data/lib/aerospike/query/pred_exp/integer_value.rb

@@ -1,32 +0,0 @@
-# frozen_string_literal: true
-
-module Aerospike
-  class PredExp
-    class IntegerValue < PredExp
-      def initialize(value, type)
-        @value = value
-        @type = type
-      end
-
-      def estimate_size
-        14
-      end
-
-      def write(buffer, offset)
-        # Write type
-        buffer.write_int16(@type, offset)
-        offset += 2
-
-        # Write length
-        buffer.write_int32(8, offset)
-        offset += 4
-
-        # Write value.
-        buffer.write_int64(@value, offset)
-        offset += 8
-
-        offset
-      end
-    end
-  end
-end

data/lib/aerospike/query/pred_exp/op.rb

@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-module Aerospike
-  class PredExp
-    class Op < PredExp
-      def initialize(op)
-        @op = op
-      end
-
-      def estimate_size
-        6
-      end
-
-      def write(buffer, offset)
-        # write type
-        buffer.write_int16(@op, offset)
-        offset += 2
-
-        # write zero length
-        buffer.write_int32(0, offset)
-        offset += 4
-
-        offset
-      end
-    end
-  end
-end

data/lib/aerospike/query/pred_exp/regex.rb

@@ -1,32 +0,0 @@
-# frozen_string_literal: true
-
-module Aerospike
-  class PredExp
-    class Regex < PredExp
-      def initialize(op, flag = Flags::NONE)
-        @op = op
-        @flag = flag
-      end
-
-      def estimate_size
-        10
-      end
-
-      def write(buffer, offset)
-        # write op type
-        buffer.write_int16(@op, offset)
-        offset += 2
-
-        # write length
-        buffer.write_int32(4, offset)
-        offset += 4
-
-        # write predicate count
-        buffer.write_int32(@flag, offset)
-        offset += 4
-
-        offset
-      end
-    end
-  end
-end

data/lib/aerospike/query/pred_exp/regex_flags.rb

@@ -1,23 +0,0 @@
-# fr# frozen_string_literal: true
-
-module Aerospike
-  class PredExp
-    # Regex bit flags
-    module RegexFlags
-      # Regex defaults
-      NONE = 0
-
-      # Use POSIX Extended Regular Expression syntax when interpreting regex.
-      EXTENDED = 1
-
-      # Do not differentiate case.
-      ICASE = 2
-
-      # Do not report position of matches.
-      NOSUB = 4
-
-      # Match-any-character operators don't match a newline.
-      NEWLINE = 8
-    end
-  end
-end