aerospike 2.28.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 646dcb876d7a83fab511f844216980206ee489f5cdb50f6d169a5c1893184861
-  data.tar.gz: f508306bf2eb681e493f1e929cab19427475f6eb7c0976b3c16b86056083b443
+  metadata.gz: 89cd439991384bc1b01465f9c28e9be14f9cb31ba283801ba6f3297eea240015
+  data.tar.gz: 6eab65e105f999420692a1757dcaaae9908384851e2f43fe49f6e805be2a3bf7
 SHA512:
-  metadata.gz: 51e3be1cb3b4790695eeae954e989da0df09f62deb43c9bc7995cd6c17e72804f2be1a02cf4bfcf09179a9aaff03c6d87f457bf338226d214614a6d6e3c75719
-  data.tar.gz: c36094ad5db6f9758131aa33258ec551a59a9fcfd72c3f106008bdcc2a8de9530d47fae6bd90a6d1459bdf772902d8770ec842c8d3cc41ef4cd1d720dd3bd430
+  metadata.gz: 984c705a6d1604c95ec428f30a05e1f7385d935aaee6d7acab50fb604ff3718836a6184af107e6e842377e177a4bbac46f28954a49d86fa97b9755ef290ee212
+  data.tar.gz: fc47757f4a1c55d25c56fba9d663e93dcc81a4c6d0c0d6e691d2d8d80722a32e9901f09415b1958a294ba45fd8dae9aa6d2b433fcb77e96bd957b6bf00fc4a0c

data/CHANGELOG.md

@@ -2,13 +2,25 @@
 
 All notable changes to this project will be documented in this file.
 
-## [2.27.0] 2023-05-18
+## [3.0.0] 2023-12-15
+Notice: This version of the client only supports Aerospike Server v6.0 and later. Some features will work for the older server versions.
+- **new_features**
+  - [CLIENT-2575] - Support Exp.recordSize().
+  - [CLIENT-2621] - Support persistent map indexes.
+
+- **improvements**
+  - [CLIENT-2590] - Required Updates Following Server-Side Changes: SINDEX Support for 'Blob' Type Elements.
+
+## [2.29.0] 2023-08-24
+- **Updates**
+  - [CLIENT-2526] Support for set quota for user defined roles
+
+## [2.28.0] 2023-06-23
 - **New Features**
   - [CLIENT-1432] Support minimum connections in connection pools
 
 - **Updates**
-  - [CLIENT-1529] Remove Policy.priority, ScanPolicy.scanPercent and ScanPolicy.failOnClusterChange
-
+  - [CLIENT-1529] Removed Policy.priority, ScanPolicy.scanPercent and ScanPolicy.failOnClusterChange
 
 ## [2.27.0] 2023-05-18
 - **New Features**

data/lib/aerospike/cdt/map_operation.rb

@@ -110,14 +110,23 @@ module Aerospike
         self
       end
 
-      ##
-      # Creates a map create operation.
-      # Server creates map at given context level.
-      def self.create(bin_name, order, ctx: nil)
-        if !ctx || ctx.length == 0
+      # Create map create operation.
+      # Server creates a map at the given context level.
+      #
+      # @param [String] bin_name The bin name.
+      # @param [Integer] order The map order.
+      # @param [Boolean] persist_index If true, persist map index. A map index improves lookup performance,
+      #   but requires more storage. A map index can be created for a top-level
+      #   ordered map only. Nested and unordered map indexes are not supported.
+      # @param [String] ctx Optional path to a nested map. If not defined, the top-level map is used.
+      def self.create(bin_name, order, persistent_index, ctx: nil)
+        if !ctx || ctx.empty?
           # If context not defined, the set order for top-level bin map.
-          self.set_policy(MapPolicy.new(order: order, flag: 0), bin_name)
+          attr = order[:attr]
+          attr += 0x10 if persistent_index
+          MapOperation.new(Operation::CDT_MODIFY, SET_TYPE, bin_name, attr, ctx: ctx, flag: order[:flag])
         else
+          # Create nested map. persistIndex does not apply here, so ignore it
           MapOperation.new(Operation::CDT_MODIFY, SET_TYPE, bin_name, order[:attr], ctx: ctx, flag: order[:flag])
         end
       end
@@ -128,7 +137,12 @@ module Aerospike
       #
       # The required map policy attributes can be changed after the map is created.
       def self.set_policy(bin_name, policy, ctx: nil)
-        MapOperation.new(Operation::CDT_MODIFY, SET_TYPE, bin_name, policy.order[:attr], ctx: ctx)
+        attr = policy.attributes
+        # Remove persistIndex flag for nested maps.
+        if !ctx.nil? && !ctx.empty? && (attr & 0x10) != 0
+          attr &= ~0x10
+        end
+        MapOperation.new(Operation::CDT_MODIFY, SET_TYPE, bin_name, attr, ctx: ctx)
       end
 
       ##
@@ -635,7 +649,7 @@ module Aerospike
         args.unshift(return_type) if return_type
 
         Packer.use do |packer|
-          if @ctx != nil && @ctx.length > 0
+          if @ctx != nil && !@ctx.empty?
             packer.write_array_header(3)
             Value.of(0xff).pack(packer)
 
@@ -645,12 +659,12 @@ module Aerospike
             Value.of(@map_op).pack(packer)
           else
             packer.write_raw_short(@map_op)
-            if args.length > 0
+            if !args.empty?
               packer.write_array_header(args.length)
             end
           end
 
-          if args.length > 0
+          if !args.empty?
             args.each do |value|
               Value.of(value).pack(packer)
             end

data/lib/aerospike/cdt/map_policy.rb

@@ -17,10 +17,9 @@
 module Aerospike
   module CDT
     class MapPolicy
-      attr_accessor :order, :write_mode, :flags
-      attr_accessor :item_command, :items_command, :attributes
+      attr_accessor :order, :write_mode, :flags, :item_command, :items_command, :attributes, :persist_index
 
-      def initialize(order: nil, write_mode: nil, flags: nil)
+      def initialize(order: nil, write_mode: nil, persist_index: false, flags: nil)
         if write_mode && flags
           raise ArgumentError, "Use write mode for server versions < 4.3; use write flags for server versions >= 4.3."
         end
@@ -30,6 +29,10 @@ module Aerospike
         @flags = flags || MapWriteFlags::DEFAULT
         @attributes = order ? order[:attr] : 0
 
+        if @persist_index
+          @attributes |= 0x10
+        end
+
         case @write_mode
         when CDT::MapWriteMode::DEFAULT
           @item_command = CDT::MapOperation::PUT

data/lib/aerospike/client.rb

@@ -529,7 +529,7 @@ module Aerospike
     # This method is only supported by Aerospike 3 servers.
     # If the policy is nil, the default relevant policy will be used.
     def execute_udf_on_query(statement, package_name, function_name, function_args = [], options = nil)
-      policy = create_policy(options, QueryPolicy, default_query_policy)
+      policy = create_policy(options, WritePolicy, default_write_policy)
 
       nodes = @cluster.nodes
       if nodes.empty?
@@ -538,14 +538,12 @@ module Aerospike
 
       statement = statement.clone
       statement.set_aggregate_function(package_name, function_name, function_args, false)
-
       # 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
           begin
-            command = QueryCommand.new(node, policy, statement, nil, partitions)
+            command = ServerCommand.new(@cluster, node, policy, statement, true, statement.task_id)
             execute_command(command)
           rescue => e
             Aerospike.logger.error(e)
@@ -701,7 +699,6 @@ module Aerospike
     # 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?
@@ -894,6 +891,13 @@ module Aerospike
       command.revoke_privileges(@cluster, policy, role_name, privileges)
     end
 
+    # Set or update quota for a role.
+    def set_quotas(role_name, read_quota, write_quota, options = nil)
+      policy = create_policy(options, AdminPolicy, default_admin_policy)
+      command = AdminCommand.new
+      command.set_quotas(@cluster, policy, role_name, read_quota, write_quota)
+    end
+
     private
 
     def set_default_policies(policies)

data/lib/aerospike/command/batch_direct_command.rb

@@ -60,7 +60,7 @@ module Aerospike
         operation_count = bin_names.length
       end
 
-      write_header(policy, read_attr, 0, 2, operation_count)
+      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)
 

data/lib/aerospike/command/batch_index_command.rb

@@ -66,7 +66,7 @@ module Aerospike
         end
       end
       size_buffer
-      write_header(policy,read_attr | INFO1_BATCH, 0, field_count, 0)
+      write_header_read(policy, read_attr | INFO1_BATCH, 0, field_count, 0)
 
       write_predexp(@policy.predexp, predexp_size)
 

data/lib/aerospike/command/command.rb

@@ -124,7 +124,7 @@ module Aerospike
 
       size_buffer
 
-      write_header_with_policy(policy, 0, INFO2_WRITE, field_count, bins.length)
+      write_header_write(policy, INFO2_WRITE, field_count, bins.length)
       write_key(key, policy)
       write_predexp(policy.predexp, predexp_size)
       write_filter_exp(@policy.filter_exp, exp_size)
@@ -149,7 +149,7 @@ module Aerospike
       field_count += 1 if exp_size > 0
 
       size_buffer
-      write_header_with_policy(policy, 0, INFO2_WRITE | INFO2_DELETE, field_count, 0)
+      write_header_write(policy,  INFO2_WRITE | INFO2_DELETE, field_count, 0)
       write_key(key)
       write_predexp(policy.predexp, predexp_size)
       write_filter_exp(@policy.filter_exp, exp_size)
@@ -169,7 +169,7 @@ module Aerospike
 
       estimate_operation_size
       size_buffer
-      write_header_with_policy(policy, 0, INFO2_WRITE, field_count, 1)
+      write_header_write(policy,  INFO2_WRITE, field_count, 1)
       write_key(key)
       write_predexp(policy.predexp, predexp_size)
       write_filter_exp(@policy.filter_exp, exp_size)
@@ -189,7 +189,7 @@ module Aerospike
       field_count += 1 if exp_size > 0
 
       size_buffer
-      write_header(policy, INFO1_READ | INFO1_NOBINDATA, 0, field_count, 0)
+      write_header_read_header(policy, INFO1_READ | INFO1_NOBINDATA, field_count, 0)
       write_key(key)
       write_predexp(policy.predexp, predexp_size)
       write_filter_exp(@policy.filter_exp, exp_size)
@@ -208,7 +208,7 @@ module Aerospike
       field_count += 1 if exp_size > 0
 
       size_buffer
-      write_header(policy, INFO1_READ | INFO1_GET_ALL, 0, field_count, 0)
+      write_header_read(policy, INFO1_READ | INFO1_GET_ALL, 0, field_count, 0)
       write_key(key)
       write_predexp(policy.predexp, predexp_size)
       write_filter_exp(@policy.filter_exp, exp_size)
@@ -217,7 +217,7 @@ module Aerospike
 
     # Writes the command for get operations (specified bins)
     def set_read(policy, key, bin_names)
-      if bin_names && bin_names.length > 0
+      if bin_names && !bin_names.empty?
         begin_cmd
         field_count = estimate_key_size(key)
 
@@ -232,7 +232,12 @@ module Aerospike
         end
 
         size_buffer
-        write_header(policy, INFO1_READ, 0, field_count, bin_names.length)
+        attr = INFO1_READ
+        if bin_names.empty?
+          attr |= INFO1_GET_ALL
+        end
+
+        write_header_read(policy, attr, 0, field_count, bin_names.length)
         write_key(key)
         write_predexp(policy.predexp, predexp_size)
         write_filter_exp(@policy.filter_exp, exp_size)
@@ -242,6 +247,7 @@ module Aerospike
         end
 
         end_cmd
+        mark_compressed(policy)
       else
         set_read_for_key_only(policy, key)
       end
@@ -258,20 +264,19 @@ module Aerospike
       exp_size = estimate_expression_size(@policy.filter_exp)
       field_count += 1 if exp_size > 0
 
-      estimate_operation_size_for_bin_name("")
       size_buffer
 
       # The server does not currently return record header data with _INFO1_NOBINDATA attribute set.
       # The workaround is to request a non-existent bin.
       # TODO: Fix this on server.
       #command.set_read(INFO1_READ | _INFO1_NOBINDATA);
-      write_header(policy, INFO1_READ, 0, field_count, 1)
+      write_header_read_header(policy, INFO1_READ|INFO1_NOBINDATA, field_count, 0)
 
       write_key(key)
       write_predexp(policy.predexp, predexp_size)
       write_filter_exp(@policy.filter_exp, exp_size)
-      write_operation_for_bin_name("", Aerospike::Operation::READ)
       end_cmd
+      mark_compressed(policy)
     end
 
     # Implements different command operations
@@ -289,7 +294,7 @@ module Aerospike
 
       size_buffer
 
-      write_header_with_policy(policy, args.read_attr, args.write_attr, field_count, args.operations.length)
+      write_header_read_write(policy, args.read_attr, args.write_attr, field_count, args.operations.length)
       write_key(key, policy)
       write_predexp(policy.predexp, predexp_size)
       write_filter_exp(policy.filter_exp, exp_size)
@@ -317,7 +322,7 @@ module Aerospike
       field_count += estimate_udf_size(package_name, function_name, arg_bytes)
       size_buffer
 
-      write_header(policy, 0, INFO2_WRITE, field_count, 0)
+      write_header_write(policy, INFO2_WRITE, field_count, 0)
       write_key(key, policy)
       write_predexp(policy.predexp, predexp_size)
       write_filter_exp(@policy.filter_exp, exp_size)
@@ -329,7 +334,7 @@ module Aerospike
       mark_compressed(policy)
     end
 
-    def set_scan(policy, namespace, set_name, bin_names, node_partitions)
+    def set_scan(cluster, policy, namespace, set_name, bin_names, node_partitions)
       # Estimate buffer size
       begin_cmd
       field_count = 0
@@ -395,12 +400,17 @@ module Aerospike
         read_attr |= INFO1_NOBINDATA
       end
 
+      info_attr = 0
+      if cluster.supports_feature?(Aerospike::Features::PARTITION_QUERY)
+        info_attr = INFO3_PARTITION_DONE
+      end
+
       operation_count = 0
-      if bin_names
+      unless bin_names.nil?
         operation_count = bin_names.length
       end
 
-      write_header(policy, read_attr, 0, field_count, operation_count)
+      write_header_read(policy, read_attr, info_attr, field_count, operation_count)
 
       if namespace
         write_field_string(namespace, Aerospike::FieldType::NAMESPACE)
@@ -465,11 +475,13 @@ module Aerospike
       end_cmd
     end
 
-    def set_query(policy, statement, background, node_partitions)
+
+    def set_query(cluster, policy, statement, background, node_partitions)
       function_arg_buffer = nil
       field_count = 0
       filter_size = 0
 
+      is_new = cluster.supports_feature?(Aerospike::Features::PARTITION_QUERY)
       begin_cmd
 
       if statement.namespace
@@ -548,7 +560,7 @@ module Aerospike
         @data_offset += statement.function_name.bytesize + FIELD_HEADER_SIZE
 
         function_arg_buffer = ""
-        if statement.function_args && statement.function_args.length > 0
+        if statement.function_args && !statement.function_args.empty?
           function_arg_buffer = Value.of(statement.function_args).to_bytes
         end
         @data_offset += FIELD_HEADER_SIZE + function_arg_buffer.bytesize
@@ -592,10 +604,13 @@ module Aerospike
         field_count += 1
       end
 
-      operations = statement.operations
+      unless statement.operations.nil?
+        operations = statement.operations
+      end
+
       operation_count = 0
 
-      if !operations.empty?
+      if operations
 
         unless background
           raise Aerospike::Exceptions::Aerospike.new(Aerospike::ResultCode::PARAMETER_ERROR)
@@ -616,17 +631,20 @@ module Aerospike
       size_buffer
 
       if background
-        write_header_with_policy(policy, 0, INFO2_WRITE, field_count, operation_count)
+        write_header_write(policy, INFO2_WRITE, field_count, operation_count)
       else
         read_attr = INFO1_READ
         read_attr |= INFO1_NOBINDATA unless policy.include_bin_data
         read_attr |= INFO1_SHORT_QUERY if policy.short_query
-        write_header(policy, read_attr, 0, field_count, operation_count)
+        info_attr = INFO3_PARTITION_DONE if is_new
+        write_header_read(policy, read_attr, info_attr, field_count, operation_count)
       end
 
+
       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(statement.records_per_second, FieldType::RECORDS_PER_SECOND) if statement.records_per_second > 0
 
@@ -670,7 +688,6 @@ module Aerospike
         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|
@@ -696,23 +713,19 @@ module Aerospike
         write_field(max_records, FieldType::MAX_RECORDS)
       end
 
-      if operations.empty?
-        if bin_names.empty?
-          bin_names.each do |bin_name|
-            write_operation_for_bin_name(bin_name, Operation::READ)
-          end
-        end
-      else
+      if !operations.nil?
         operations.each do |operation|
           write_operation_for_operation(operation)
         end
+      elsif !bin_names.nil? && (is_new || filter.nil?)
+        bin_names.each do |bin_name|
+          write_operation_for_bin_name(bin_name, Operation::READ)
+        end
       end
-
       end_cmd
-
-      nil
     end
 
+
     def execute
       iterations = 0
 
@@ -764,7 +777,6 @@ module Aerospike
 
           # Reset timeout in send buffer (destined for server) and socket.
           @data_buffer.write_int32((@policy.timeout * 1000).to_i, 22)
-
           # Send command.
           begin
             @conn.write(@data_buffer, @data_offset)
@@ -879,7 +891,7 @@ module Aerospike
     end
 
     def estimate_predexp(predexp)
-      if predexp && predexp.size > 0
+      if predexp && !predexp.empty?
         @data_offset += FIELD_HEADER_SIZE
         sz = Aerospike::PredExp.estimate_size(predexp)
         @data_offset += sz
@@ -897,21 +909,52 @@ module Aerospike
       0
     end
 
-    # Generic header write.
-    def write_header(policy, read_attr, write_attr, field_count, operation_count)
-      read_attr |= INFO1_CONSISTENCY_ALL if policy.consistency_level == Aerospike::ConsistencyLevel::CONSISTENCY_ALL
-      read_attr |= INFO1_COMPRESS_RESPONSE if policy.use_compression
+    # Header write for write command
+    def write_header_write(policy, write_attr, field_count, operation_count)
+      # Set flags.
+      generation = Integer(0)
+      info_attr = Integer(0)
+      read_attr = Integer(0)
+
+      case policy.record_exists_action
+      when Aerospike::RecordExistsAction::UPDATE
+      when Aerospike::RecordExistsAction::UPDATE_ONLY
+        info_attr |= INFO3_UPDATE_ONLY
+      when Aerospike::RecordExistsAction::REPLACE
+        info_attr |= INFO3_CREATE_OR_REPLACE
+      when Aerospike::RecordExistsAction::REPLACE_ONLY
+        info_attr |= INFO3_REPLACE_ONLY
+      when Aerospike::RecordExistsAction::CREATE_ONLY
+        write_attr |= INFO2_CREATE_ONLY
+      end
 
+      case policy.generation_policy
+      when Aerospike::GenerationPolicy::NONE
+      when Aerospike::GenerationPolicy::EXPECT_GEN_EQUAL
+        generation = policy.generation
+        write_attr |= INFO2_GENERATION
+      when Aerospike::GenerationPolicy::EXPECT_GEN_GT
+        generation = policy.generation
+        write_attr |= INFO2_GENERATION_GT
+      end
+
+      info_attr |= INFO3_COMMIT_MASTER if policy.commit_level == Aerospike::CommitLevel::COMMIT_MASTER
+      write_attr |= INFO2_DURABLE_DELETE if policy.durable_delete
       # Write all header data except total size which must be written last.
-      @data_buffer.write_byte(MSG_REMAINING_HEADER_SIZE, 8) # Message heade.length.
+      @data_buffer.write_byte(MSG_REMAINING_HEADER_SIZE, 8) # Message header.length.
       @data_buffer.write_byte(read_attr, 9)
       @data_buffer.write_byte(write_attr, 10)
+      @data_buffer.write_byte(info_attr, 11)
+      @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)
 
-      i = 11
-      while i <= 25
-        @data_buffer.write_byte(0, i)
-        i = i.succ
-      end
+      # Initialize timeout. It will be written later.
+      @data_buffer.write_byte(0, 22)
+      @data_buffer.write_byte(0, 23)
+      @data_buffer.write_byte(0, 24)
+      @data_buffer.write_byte(0, 25)
 
       @data_buffer.write_int16(field_count, 26)
       @data_buffer.write_int16(operation_count, 28)
@@ -920,7 +963,7 @@ module Aerospike
     end
 
     # Header write for write operations.
-    def write_header_with_policy(policy, read_attr, write_attr, field_count, operation_count)
+    def write_header_read_write(policy, read_attr, write_attr, field_count, operation_count)
       # Set flags.
       generation = Integer(0)
       info_attr = Integer(0)
@@ -948,9 +991,9 @@ module Aerospike
       end
 
       info_attr |= INFO3_COMMIT_MASTER if policy.commit_level == Aerospike::CommitLevel::COMMIT_MASTER
-      read_attr |= INFO1_CONSISTENCY_ALL if policy.consistency_level == Aerospike::ConsistencyLevel::CONSISTENCY_ALL
       write_attr |= INFO2_DURABLE_DELETE if policy.durable_delete
       read_attr |= INFO1_COMPRESS_RESPONSE if policy.use_compression
+
       # Write all header data except total size which must be written last.
       @data_buffer.write_byte(MSG_REMAINING_HEADER_SIZE, 8) # Message header.length.
       @data_buffer.write_byte(read_attr, 9)
@@ -973,6 +1016,52 @@ module Aerospike
       @data_offset = MSG_TOTAL_HEADER_SIZE
     end
 
+    def write_header_read(policy, read_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(info_attr, 11)
+
+      (12...22).each { |i| @data_buffer.write_byte(i, 0) }
+
+      # Initialize timeout. It will be written later.
+      @data_buffer.write_byte(0, 22)
+      @data_buffer.write_byte(0, 23)
+      @data_buffer.write_byte(0, 24)
+      @data_buffer.write_byte(0, 25)
+
+      @data_buffer.write_int16(field_count, 26)
+      @data_buffer.write_int16(operation_count, 28)
+
+      @data_offset = MSG_TOTAL_HEADER_SIZE
+    end
+
+    def write_header_read_header(policy, read_attr, field_count, operation_count)
+      info_attr = Integer(0)
+      #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(info_attr, 11)
+
+      (12...22).each { |i| @data_buffer.write_byte(i, 0) }
+
+      # Initialize timeout. It will be written later.
+      @data_buffer.write_byte(0, 22)
+      @data_buffer.write_byte(0, 23)
+      @data_buffer.write_byte(0, 24)
+      @data_buffer.write_byte(0, 25)
+
+      @data_buffer.write_int16(field_count, 26)
+      @data_buffer.write_int16(operation_count, 28)
+
+      @data_offset = MSG_TOTAL_HEADER_SIZE
+    end
+
     def write_key(key, policy = nil)
       # Write key into buffer.
       if key.namespace
@@ -1111,7 +1200,7 @@ module Aerospike
     end
 
     def write_predexp(predexp, predexp_size)
-      if predexp && predexp.size > 0
+      if predexp && !predexp.empty?
         write_field_header(predexp_size, Aerospike::FieldType::FILTER_EXP)
         @data_offset = Aerospike::PredExp.write(
           predexp, @data_buffer, @data_offset
@@ -1152,13 +1241,13 @@ module Aerospike
         compressed = Zlib::deflate(@data_buffer.buf, Zlib::DEFAULT_COMPRESSION)
 
         # write original size as header
-        proto_s = "%08d" % 0
+        proto_s = format("%08d", 0)
         proto_s[0, 8] = [@data_offset].pack("q>")
         compressed.prepend(proto_s)
 
         # write proto
         proto = (compressed.size + 8) | Integer(CL_MSG_VERSION << 56) | Integer(AS_MSG_TYPE << 48)
-        proto_s = "%08d" % 0
+        proto_s = format("%08d", 0)
         proto_s[0, 8] = [proto].pack("q>")
         compressed.prepend(proto_s)
 

data/lib/aerospike/command/single_command.rb

@@ -40,7 +40,7 @@ module Aerospike
     end
 
     def empty_socket
-      # There should not be any more bytes.
+      # There should not be any more get_bytes.
       # Empty the socket to be safe.
       sz = @data_buffer.read_int64( 0)
       header_length = @data_buffer.read(8).ord