aerospike 2.6.0 → 2.7.0

data/lib/aerospike/command/batch_index_exists_command.rb

@@ -0,0 +1,45 @@
+# Copyright 2018 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_index_command'
+
+module Aerospike
+
+  class BatchIndexExistsCommand < BatchIndexCommand #:nodoc:
+
+    def initialize(node, batch, policy, results)
+      super(node, batch, policy, 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)
+      batch_index = @data_buffer.read_int32(14)
+      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
+
+      parse_key(field_count)
+      results[batch_index] = (result_code == 0)
+    end
+
+  end # class
+
+end # module

data/lib/aerospike/command/batch_index_node.rb

@@ -0,0 +1,52 @@
+# Copyright 2018 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
+
+  class BatchIndexNode #:nodoc:
+
+    attr_accessor :node
+    attr_accessor :keys_by_idx
+
+    def self.generate_list(cluster, keys)
+      keys.each_with_index
+        .group_by { |key, _| cluster.get_node_for_key(key) }
+        .map { |node, keys_with_idx| BatchIndexNode.new(node, keys_with_idx) }
+    end
+
+    def initialize(node, keys_with_idx)
+      @node = node
+      @keys_by_idx = Hash[keys_with_idx.map(&:reverse)]
+    end
+
+    def keys
+      keys_by_idx.values
+    end
+
+    def each_key_with_index
+      keys_by_idx.each do |idx, key|
+        yield key, idx
+      end
+    end
+
+    def key_for_index(idx)
+      keys_by_idx[idx]
+    end
+
+  end
+
+end

data/lib/aerospike/command/batch_item.rb

@@ -1,12 +1,13 @@
-# encoding: utf-8
-# Copyright 2014-2017 Aerospike, Inc.
+# Copyright 2014-2018 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
+# 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
@@ -14,61 +15,31 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-require 'thread'
-
-require 'aerospike/record'
-
-require 'aerospike/command/command'
-
 module Aerospike
 
-  private
-
   class BatchItem #:nodoc:
 
-    def self.generate_map(keys)
-      key_map = {}
-      keys.each_with_index do |key, i|
-        item = key_map[key.digest]
-        unless item
-          item = BatchItem.new(key, i)
-          key_map[key.digest] = item
-        else
-          item.add_duplicate(i)
-        end
-      end
+    attr_accessor :key
+    attr_accessor :indexes
 
-      key_map
+    def self.generate_map(keys)
+      map = keys.each_with_index
+        .group_by { |key, _| key }
+        .map { |key, keys_with_idx|
+          [key.digest, BatchItem.new(key, keys_with_idx.map(&:last))]
+        }
+      Hash[map]
     end
 
-
-    def initialize(key, index)
+    def initialize(key, indexes)
       @key = key
-      @index = index
-    end
-
-    def add_duplicate(idx)
-      unless @duplicates
-        @duplicates = []
-        @duplicates << @index
-        @index = 0
-      end
-
-      @duplicates << idx
+      @indexes = indexes
     end
 
     def index
-      return @index unless @duplicates
-
-      r = @duplicates[@index]
-      @index+=1
-      return r
-    end
-
-    def key
-      @key
+      indexes.shift
     end
 
-  end # class
+  end
 
-end # module
+end

data/lib/aerospike/command/command.rb

@@ -1,12 +1,13 @@
-# encoding: utf-8
-# Copyright 2014-2017 Aerospike, Inc.
+# Copyright 2014-2018 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
+# 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
@@ -16,7 +17,6 @@
 
 require 'time'
 
-
 require 'msgpack'
 require 'aerospike/result_code'
 require 'aerospike/command/field_type'
@@ -34,6 +34,8 @@ module Aerospike
   # Get all bins.
   INFO1_GET_ALL = Integer(1 << 1)
 
+
+  INFO1_BATCH = Integer(1 << 3)
   # Do not read the bins
   INFO1_NOBINDATA = Integer(1 << 5)
 
@@ -257,67 +259,6 @@ module Aerospike
       end_cmd
     end
 
-    def set_batch_exists(policy, batch_namespace)
-      # Estimate buffer size
-      begin_cmd
-      keys = batch_namespace.keys
-      byte_size = keys.length * DIGEST_SIZE
-
-      @data_offset += (batch_namespace ? batch_namespace.namespace.bytesize : 0)  +
-        FIELD_HEADER_SIZE + byte_size + FIELD_HEADER_SIZE
-
-      size_buffer
-
-      write_header(policy, INFO1_READ|INFO1_NOBINDATA, 0, 2, 0)
-      write_field_string(batch_namespace.namespace, Aerospike::FieldType::NAMESPACE)
-      write_field_header(byte_size, Aerospike::FieldType::DIGEST_RIPE_ARRAY)
-
-      keys.each do |key|
-        @data_buffer.write_binary(key.digest, @data_offset)
-        @data_offset += key.digest.bytesize
-      end
-      end_cmd
-    end
-
-    def set_batch_get(policy, batch_namespace, bin_names, read_attr)
-      # Estimate buffer size
-      begin_cmd
-      byte_size = batch_namespace.keys.length * DIGEST_SIZE
-
-      @data_offset += batch_namespace.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(policy, read_attr, 0, 2, operation_count)
-      write_field_string(batch_namespace.namespace, Aerospike::FieldType::NAMESPACE)
-      write_field_header(byte_size, Aerospike::FieldType::DIGEST_RIPE_ARRAY)
-
-      batch_namespace.keys.each do |key|
-        @data_buffer.write_binary(key.digest, @data_offset)
-        @data_offset += key.digest.bytesize
-      end
-
-      if bin_names
-        bin_names.each do |bin_name|
-          write_operation_for_bin_name(bin_name, Aerospike::Operation::READ)
-        end
-      end
-
-      end_cmd
-    end
-
     def set_scan(policy, namespace, set_name, bin_names)
       # Estimate buffer size
       begin_cmd

data/lib/aerospike/command/field_type.rb

@@ -1,17 +1,19 @@
-# encoding: utf-8
-# Copyright 2014-2017 Aerospike, Inc.
+# Copyright 2014-2018 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
+# Portions may be licensed to Aerospike, Inc. under one or more contributor
+# license agreements.
 #
-# http:#www.apache.org/licenses/LICENSE-2.0
+# 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.
+# 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
 
@@ -40,6 +42,7 @@ module Aerospike
     UDF_ARGLIST = 32
     UDF_OP = 33
     QUERY_BINLIST = 40
+    BATCH_INDEX = 41
 
   end # module
 

data/lib/aerospike/command/{batch_command.rb → multi_command.rb}

@@ -1,12 +1,13 @@
-# encoding: utf-8
-# Copyright 2014-2017 Aerospike, Inc.
+# Copyright 2014-2018 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
+# 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
@@ -14,17 +15,13 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-require 'thread'
-
 require 'aerospike/record'
 
 require 'aerospike/command/command'
 
 module Aerospike
 
-  private
-
-  class BatchCommand < Command #:nodoc:
+  class MultiCommand < Command #:nodoc:
 
     def initialize(node)
       super(node)
@@ -48,13 +45,36 @@ module Aerospike
         receive_size = size & 0xFFFFFFFFFFFF
 
         if receive_size > 0
-          status = parse_record_results(receive_size)
+          status = parse_group(receive_size)
         else
           status = false
         end
       end
     end
 
+    def parse_group(receive_size)
+      @data_offset = 0
+
+      while @data_offset < receive_size
+        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".
+        # 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)
+        end
+
+        # If cmd is the end marker of the response, do not proceed further
+        info3 = @data_buffer.read(3).ord
+        return false if (info3 & INFO3_LAST) == INFO3_LAST
+
+        parse_row(result_code)
+      end
+
+      true
+    end
+
     def parse_key(field_count)
       # in Stream queries, there are no keys
       return unless field_count > 0

data/lib/aerospike/command/read_command.rb

@@ -1,4 +1,5 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 # Copyright 2014-2017 Aerospike, Inc.
 #
 # Portions may be licensed to Aerospike, Inc. under one or more contributor
@@ -25,6 +26,7 @@ module Aerospike
   private
 
   class ReadCommand < SingleCommand #:nodoc:
+    BIN_NAME_ENCODING = 'utf-8'
 
     attr_reader :record, :policy
 
@@ -127,7 +129,7 @@ module Aerospike
         op_size = @data_buffer.read_int32(receive_offset)
         particle_type = @data_buffer.read(receive_offset+5).ord
         name_size = @data_buffer.read(receive_offset+7).ord
-        name = @data_buffer.read(receive_offset+8, name_size).force_encoding('utf-8')
+        name = @data_buffer.read(receive_offset+8, name_size).force_encoding(BIN_NAME_ENCODING)
         receive_offset += 4 + 4 + name_size
 
         particle_bytes_size = op_size - (4 + name_size)

data/lib/aerospike/command/single_command.rb

@@ -1,12 +1,13 @@
-# encoding: utf-8
-# Copyright 2014-2017 Aerospike, Inc.
+# Copyright 2014-2018 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
+# 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
@@ -14,7 +15,6 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-require 'aerospike/cluster/partition'
 require 'aerospike/command/command'
 
 module Aerospike
@@ -26,14 +26,11 @@ module Aerospike
     def initialize(cluster, key)
       @cluster = cluster
       @key = key
-      @partition = Partition.new_by_key(key)
-
-      super(@cluster.get_node(@partition))
 
-      self
+      node = cluster.get_node_for_key(key)
+      super(node)
     end
 
-
     protected
 
     def empty_socket