aerospike 2.11.0 → 2.16.0

data/lib/aerospike/command/delete_command.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-# Copyright 2014-2017 Aerospike, Inc.
+# Copyright 2014-2020 Aerospike, Inc.
 #
 # Portions may be licensed to Aerospike, Inc. under one or more contributor
 # license agreements.
@@ -33,6 +33,10 @@ module Aerospike
       self
     end
 
+    def get_node
+      @cluster.master_node(@partition)
+    end
+
     def write_buffer
       set_delete(@policy, @key)
     end
@@ -43,13 +47,25 @@ module Aerospike
 
       result_code = @data_buffer.read(13).ord & 0xFF
 
-      if (result_code != 0) && (result_code != Aerospike::ResultCode::KEY_NOT_FOUND_ERROR)
-        raise Aerospike::Exceptions::Aerospike.new(result_code)
+      if result_code == 0
+        @existed = true
+        return
       end
 
-      @existed = (result_code == 0)
+      if result_code == Aerospike::ResultCode::KEY_NOT_FOUND_ERROR
+        @existed = false
+        return
+      end
+
+      if result_code == Aerospike::ResultCode::FILTERED_OUT
+        if @policy.fail_on_filtered_out
+          raise Aerospike::Exceptions::Aerospike.new(result_code)
+        end
+        @existed = true
+        return
+      end
 
-      empty_socket
+      raise Aerospike::Exceptions::Aerospike.new(result_code)
     end
 
   end # class

data/lib/aerospike/command/execute_command.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-# Copyright 2014-2017 Aerospike, Inc.
+# Copyright 2014-2020 Aerospike, Inc.
 #
 # Portions may be licensed to Aerospike, Inc. under one or more contributor
 # license agreements.

data/lib/aerospike/command/exists_command.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-# Copyright 2014-2017 Aerospike, Inc.
+# Copyright 2014-2020 Aerospike, Inc.
 #
 # Portions may be licensed to Aerospike, Inc. under one or more contributor
 # license agreements.
@@ -33,6 +33,10 @@ module Aerospike
       self
     end
 
+    def get_node
+      @cluster.read_node(@partition, @policy.replica, @sequence)
+    end
+
     def write_buffer
       set_exists(@policy, @key)
     end
@@ -43,13 +47,25 @@ module Aerospike
 
       result_code = @data_buffer.read(13).ord & 0xFF
 
-      if (result_code != 0) && (result_code != Aerospike::ResultCode::KEY_NOT_FOUND_ERROR)
-        raise Aerospike::Exceptions::Aerospike.new(result_code)
+      if result_code == 0
+        @exists = true
+        return
       end
 
-      @exists = (result_code == 0)
+      if result_code == Aerospike::ResultCode::KEY_NOT_FOUND_ERROR
+        @exists = false
+        return
+      end
+
+      if result_code == Aerospike::ResultCode::FILTERED_OUT
+        if @policy.fail_on_filtered_out
+          raise Aerospike::Exceptions::Aerospike.new(result_code)
+        end
+        @exists = true
+        return
+      end
 
-      empty_socket
+      raise Aerospike::Exceptions::Aerospike.new(result_code)
     end
 
   end # class

data/lib/aerospike/command/field_type.rb

@@ -1,4 +1,4 @@
-# Copyright 2014-2018 Aerospike, Inc.
+# Copyright 2014-2020 Aerospike, Inc.
 #
 # Portions may be licensed to Aerospike, Inc. under one or more contributor
 # license agreements.
@@ -31,6 +31,7 @@ module Aerospike
     TRAN_ID = 7    # user supplied transaction id, which is simply passed back
     SCAN_OPTIONS = 8
     SCAN_TIMEOUT = 9
+    RECORDS_PER_SECOND = 10
     INDEX_NAME = 21
     INDEX_RANGE = 22
     INDEX_FILTER = 23

data/lib/aerospike/command/multi_command.rb

@@ -1,4 +1,4 @@
-# Copyright 2014-2018 Aerospike, Inc.
+# Copyright 2014-2020 Aerospike, Inc.
 #
 # Portions may be licensed to Aerospike, Inc. under one or more contributor
 # license agreements.
@@ -29,21 +29,57 @@ module Aerospike
       @valid = true
       @mutex = Mutex.new
 
+      @compressed_data_buffer = nil
+      @compressed_data_offset = nil
+
       self
     end
 
+    def get_node
+      @node
+    end
+
     def parse_result
       # Read socket into receive buffer one record at a time.  Do not read entire receive size
       # because the receive buffer would be too big.
       status = true
 
       while status
+        @data_offset = 0
+        @compressed_data_buffer = nil
+
         # Read header.
         read_bytes(8)
 
         size = @data_buffer.read_int64(0)
         receive_size = size & 0xFFFFFFFFFFFF
 
+        # inflate if compressed
+        compressed_sz = compressed_size
+        if compressed_sz
+          begin
+            # read compressed msg header
+            @conn.read(@data_buffer, 8)
+
+            # read compressed message
+            @conn.read(@data_buffer, compressed_sz - 8)
+
+            # inflate the results
+            # TODO: reuse the current buffer
+            uncompressed = Zlib::inflate(@data_buffer.buf)
+            receive_size = uncompressed.size - 8
+
+            @compressed_data_buffer = Buffer.new(-1, uncompressed)
+            @compressed_data_offset = 0
+
+            # waste the first 8 header bytes
+            @compressed_data_buffer.eat!(8)
+          rescue => e
+            Aerospike.logger.error("parse result error: #{e}")
+            raise e
+          end
+        end
+
         if receive_size > 0
           status = parse_group(receive_size)
         else
@@ -59,10 +95,13 @@ module Aerospike
         read_bytes(MSG_REMAINING_HEADER_SIZE)
         result_code = @data_buffer.read(5).ord & 0xFF
 
-        # The only valid server return codes are "ok" and "not found".
+        # 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 && result_code != Aerospike::ResultCode::KEY_NOT_FOUND_ERROR
-          raise Aerospike::Exceptions::Aerospike.new(result_code)
+        if result_code != 0 
+            if result_code == Aerospike::ResultCode::KEY_NOT_FOUND_ERROR || result_code == Aerospike::ResultCode::FILTERED_OUT
+            else
+              raise Aerospike::Exceptions::Aerospike.new(result_code)
+            end
         end
 
         # If cmd is the end marker of the response, do not proceed further
@@ -150,7 +189,13 @@ module Aerospike
         @data_buffer = Buffer.new(length)
       end
 
-      @conn.read(@data_buffer, length)
+      if compressed?
+        @data_buffer.write_binary(@compressed_data_buffer.buf[@compressed_data_offset...@compressed_data_offset+length], 0)
+        @compressed_data_offset += length
+      else
+        @conn.read(@data_buffer, length)
+      end
+
       @data_offset += length
     end
 
@@ -169,6 +214,11 @@ module Aerospike
       res
     end
 
+    def compressed?
+      @compressed_data_buffer != nil
+    end
+
+
   end # class
 
 end # module

data/lib/aerospike/command/operate_command.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-# Copyright 2014-2017 Aerospike, Inc.
+# Copyright 2014-2020 Aerospike, Inc.
 #
 # Portions may be licensed to Aerospike, Inc. under one or more contributor
 # license agreements.
@@ -28,6 +28,11 @@ module Aerospike
       @operations = operations
     end
 
+    def get_node
+      @cluster.master_node(@partition)
+    end
+
+
     def write_bins
       @operations.select{|op| op.op_type == Aerospike::Operation::WRITE}.map(&:bin).compact
     end

data/lib/aerospike/command/read_command.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright 2014-2017 Aerospike, Inc.
+# Copyright 2014-2020 Aerospike, Inc.
 #
 # Portions may be licensed to Aerospike, Inc. under one or more contributor
 # license agreements.
@@ -15,6 +15,8 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
+require 'zlib'
+
 require 'aerospike/record'
 
 require 'aerospike/command/single_command'
@@ -39,6 +41,10 @@ module Aerospike
       self
     end
 
+    def get_node
+      @cluster.read_node(@partition, @policy.replica, @sequence)
+    end
+
     def write_buffer
       set_read(@policy, @key, @bin_names)
     end
@@ -46,12 +52,40 @@ module Aerospike
     def parse_result
       # Read header.
       begin
-        @conn.read(@data_buffer, MSG_TOTAL_HEADER_SIZE)
+        @conn.read(@data_buffer, 8)
       rescue => e
         Aerospike.logger.error("parse result error: #{e}")
         raise e
       end
 
+      # inflate if compressed
+      compressed_sz = compressed_size
+      if compressed_sz
+        begin
+          # waste 8 size bytes
+          @conn.read(@data_buffer, 8)
+
+          # read compressed message
+          @conn.read(@data_buffer, compressed_sz - 8)
+
+          # inflate the results
+          # TODO: reuse the current buffer
+          uncompressed = Zlib::inflate(@data_buffer.buf)
+
+          @data_buffer = Buffer.new(-1, uncompressed)
+        rescue => e
+          Aerospike.logger.error("parse result error: #{e}")
+          raise e
+        end
+      else
+        begin
+          bytes_read = @conn.read(@data_buffer, MSG_TOTAL_HEADER_SIZE - 8, 8)
+        rescue => e
+          Aerospike.logger.error("parse result error: #{e}")
+          raise e
+        end
+      end
+
       # A number of these are commented out because we just don't care enough to read
       # that section of the header. If we do care, uncomment and check!
       sz = @data_buffer.read_int64(0)
@@ -64,7 +98,9 @@ module Aerospike
       receive_size = (sz & 0xFFFFFFFFFFFF) - header_length
 
       # Read remaining message bytes.
-      if receive_size > 0
+      if compressed_sz 
+        @data_buffer.eat!(MSG_TOTAL_HEADER_SIZE)
+      elsif receive_size > 0
         size_buffer_sz(receive_size)
 
         begin
@@ -76,29 +112,36 @@ module Aerospike
 
       end
 
-      if result_code != 0
-        return nil if result_code == Aerospike::ResultCode::KEY_NOT_FOUND_ERROR
-        return nil if result_code == Aerospike::ResultCode::LARGE_ITEM_NOT_FOUND
-        if result_code == Aerospike::ResultCode::UDF_BAD_RESPONSE
-          begin
-            @record = parse_record(op_count, field_count, generation, expiration)
-            handle_udf_error(result_code)
-          rescue => e
-            Aerospike.logger.error("UDF execution error: #{e}")
-            raise e
-          end
-
+      if result_code == 0
+        if op_count == 0
+          @record = Record.new(@node, @key, nil, generation, expiration)
+          return
         end
-
-        raise Aerospike::Exceptions::Aerospike.new(result_code)
+  
+        @record = parse_record(op_count, field_count, generation, expiration)
+        return
       end
 
-      if op_count == 0
-        @record = Record.new(@node, @key, nil, generation, expiration)
+      return nil if result_code == Aerospike::ResultCode::KEY_NOT_FOUND_ERROR
+
+      if result_code == Aerospike::ResultCode::FILTERED_OUT
+        if @policy.fail_on_filtered_out
+          raise Aerospike::Exceptions::Aerospike.new(result_code)
+        end
         return
       end
 
-      @record = parse_record(op_count, field_count, generation, expiration)
+      if result_code == Aerospike::ResultCode::UDF_BAD_RESPONSE
+        begin
+          @record = parse_record(op_count, field_count, generation, expiration)
+          handle_udf_error(result_code)
+        rescue => e
+          Aerospike.logger.error("UDF execution error: #{e}")
+          raise e
+        end
+      end
+
+      raise Aerospike::Exceptions::Aerospike.new(result_code)
     end
 
     def handle_udf_error(result_code)

data/lib/aerospike/command/read_header_command.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-# Copyright 2014-2017 Aerospike, Inc.
+# Copyright 2014-2020 Aerospike, Inc.
 #
 # Portions may be licensed to Aerospike, Inc. under one or more contributor
 # license agreements.
@@ -33,6 +33,10 @@ module Aerospike
       self
     end
 
+    def get_node
+      @cluster.read_node(@partition, @policy.replica, @sequence)
+    end
+
     def write_buffer
       set_read_header(@policy, @key)
     end
@@ -47,15 +51,23 @@ module Aerospike
         generation = @data_buffer.read_int32(14)
         expiration = @data_buffer.read_int32(18)
         @record = Record.new(@node, @key, nil,  generation, expiration)
-      else
-        if result_code == Aerospike::ResultCode::KEY_NOT_FOUND_ERROR
-          @record = nil
-        else
+        return
+      end
+
+      if result_code == Aerospike::ResultCode::KEY_NOT_FOUND_ERROR
+        @record = nil
+        return
+      end
+
+      if result_code == Aerospike::ResultCode::FILTERED_OUT
+        @record = nil
+        if @policy.fail_on_filtered_out
           raise Aerospike::Exceptions::Aerospike.new(result_code)
         end
+        return
       end
 
-      empty_socket
+      raise Aerospike::Exceptions::Aerospike.new(result_code)
     end
 
   end # class

data/lib/aerospike/command/roles.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-# Copyright 2014-2017 Aerospike, Inc.
+# Copyright 2014-2020 Aerospike, Inc.
 #
 # Portions may be licensed to Aerospike, Inc. under one or more contributor
 # license agreements.

data/lib/aerospike/command/single_command.rb

@@ -1,4 +1,4 @@
-# Copyright 2014-2018 Aerospike, Inc.
+# Copyright 2014-2020 Aerospike, Inc.
 #
 # Portions may be licensed to Aerospike, Inc. under one or more contributor
 # license agreements.
@@ -27,12 +27,18 @@ module Aerospike
       @cluster = cluster
       @key = key
 
-      node = cluster.get_node_for_key(key)
-      super(node)
+      @partition = Partition.new_by_key(key)
+
+      super()
     end
 
     protected
 
+    def get_node
+      # abstract method
+      raise Aerospike::Exceptions::InvalidNode
+    end
+
     def empty_socket
       # There should not be any more bytes.
       # Empty the socket to be safe.