aerospike 2.6.0 → 2.7.0

data/lib/aerospike/cluster.rb

@@ -25,7 +25,7 @@ require 'aerospike/atomic/atomic'
 module Aerospike
   class Cluster
     attr_reader :connection_timeout, :connection_queue_size, :user, :password
-    attr_reader :features, :ssl_options
+    attr_reader :features, :tls_options
     attr_reader :cluster_id, :aliases
     attr_reader :cluster_name
 
@@ -36,7 +36,7 @@ module Aerospike
       @connection_timeout = policy.timeout
       @tend_interval = policy.tend_interval
       @cluster_name = policy.cluster_name
-      @ssl_options = policy.ssl_options
+      @tls_options = policy.tls
 
       @aliases = {}
       @cluster_nodes = []
@@ -75,7 +75,7 @@ module Aerospike
     end
 
     def tls_enabled?
-      !ssl_options.nil? && ssl_options[:enable] != false
+      !tls_options.nil? && tls_options[:enable] != false
     end
 
     def initialize_tls_host_names(hosts)
@@ -102,7 +102,9 @@ module Aerospike
       (node_array.length > 0) && !@closed.value
     end
 
-    def get_node(partition)
+    def get_node_for_key(key)
+      partition = Partition.new_by_key(key)
+
       # Must copy hashmap reference for copy on write semantics to work.
       nmap = partitions
       if node_array = nmap[partition.namespace]
@@ -268,6 +270,8 @@ module Aerospike
       if peers.generation_changed?
         # Refresh peers for all nodes that responded the first time even if only
         # one node's peers changed.
+        peers.reset_refresh_count!
+
         nodes.each do |node|
           node.refresh_peers(peers)
         end
@@ -371,7 +375,7 @@ module Aerospike
 
       seed_array.each do |seed|
         begin
-          seed_node_validator = NodeValidator.new(self, seed, @connection_timeout, @cluster_name, ssl_options)
+          seed_node_validator = NodeValidator.new(self, seed, @connection_timeout, @cluster_name, tls_options)
         rescue => e
           Aerospike.logger.error("Seed #{seed} failed: #{e}\n#{e.backtrace.join("\n")}")
           next
@@ -384,7 +388,7 @@ module Aerospike
             nv = seed_node_validator
           else
             begin
-              nv = NodeValidator.new(self, aliass, @connection_timeout, @cluster_name, ssl_options)
+              nv = NodeValidator.new(self, aliass, @connection_timeout, @cluster_name, tls_options)
             rescue => e
               Aerospike.logger.error("Seed #{seed} failed: #{e}")
               next
@@ -427,50 +431,7 @@ module Aerospike
     end
 
     def find_nodes_to_remove(refresh_count)
-      node_list = nodes
-
-      remove_list = []
-
-      node_list.each do |node|
-        if !node.active?
-          # Inactive nodes must be removed.
-          remove_list << node
-          next
-        end
-
-        case node_list.length
-        when 1
-          # Single node clusters rely solely on node health.
-          remove_list << node if node.unhealthy?
-
-        when 2
-          # Two node clusters require at least one successful refresh before removing.
-          if refresh_count == 2 && node.reference_count.value == 0 && !node.responded?
-            # Node is not referenced nor did it respond.
-            remove_list << node
-          end
-
-        else
-          # Multi-node clusters require two successful node refreshes before removing.
-          if refresh_count >= 2 && node.reference_count.value == 0
-            # Node is not referenced by other nodes.
-            # Check if node responded to info request.
-            if node.responded?
-              # Node is alive, but not referenced by other nodes.  Check if mapped.
-              unless find_node_in_partition_map(node)
-                # Node doesn't have any partitions mapped to it.
-                # There is not point in keeping it in the cluster.
-                remove_list << node
-              end
-            else
-              # Node not responding. Remove it.
-              remove_list << node
-            end
-          end
-        end
-      end
-
-      remove_list
+      FindNodesToRemove.(self, refresh_count)
     end
 
     def find_node_in_partition_map(filter)

data/lib/aerospike/cluster/create_connection.rb

@@ -28,7 +28,7 @@ module Aerospike
             host.port,
             tls_name: host.tls_name,
             timeout: cluster.connection_timeout,
-            ssl_options: cluster.ssl_options
+            tls_options: cluster.tls_options
           ).tap do |conn|
             if cluster.credentials_given?
               # Authenticate will raise and close connection if invalid credentials

data/lib/aerospike/cluster/find_nodes_to_remove.rb

@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+# 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 Cluster
+    # Calculates which nodes that should be removed from the cluster
+    module FindNodesToRemove
+      class << self
+        def call(cluster, refresh_count)
+          node_list = cluster.nodes
+
+          remove_list = []
+
+          node_list.each do |node|
+            unless node.active?
+              # Inactive nodes must be removed.
+              remove_list << node
+              next
+            end
+
+            if refresh_count.zero? && node.failed?(5) # 5 or more failures counts as failed
+              # All node info requests failed and this node had 5 consecutive failures.
+              # Remove node.  If no nodes are left, seeds will be tried in next cluster
+              # tend iteration.
+              remove_list << node
+              next
+            end
+
+            if node_list.size > 1 && refresh_count >= 1 && !node.referenced?
+              # Node is not referenced by other nodes.
+              # Check if node responded to info request.
+              if node.failed?
+                remove_list << node
+              else
+                # Node is alive, but not referenced by other nodes.  Check if mapped.
+                unless cluster.find_node_in_partition_map(node)
+                  # Node doesn't have any partitions mapped to it.
+                  # There is no point in keeping it in the cluster.
+                  remove_list << node
+                end
+              end
+            end
+          end
+
+          remove_list
+        end
+      end
+    end
+  end
+end

data/lib/aerospike/cluster/partition.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
@@ -19,6 +20,8 @@ module Aerospike
   private
 
   class Partition # :nodoc:
+    UNPACK_FORMAT = 'l<'
+
     attr_reader :namespace, :partition_id
 
     def initialize(namespace, partition_id)
@@ -31,7 +34,7 @@ module Aerospike
     def self.new_by_key(key)
       Partition.new(
         key.namespace,
-        (key.digest[0..3].unpack('l<')[0] & 0xFFFF) % Node::PARTITIONS
+        (key.digest[0..3].unpack(UNPACK_FORMAT)[0] & 0xFFFF) % Node::PARTITIONS
       )
     end
 

data/lib/aerospike/command/batch_direct_command.rb

@@ -0,0 +1,104 @@
+# 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
+#
+# 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(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
+    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

@@ -0,0 +1,51 @@
+# 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
+#
+# 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

@@ -0,0 +1,40 @@
+# 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
+#
+# 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, keys)
+      keys.group_by { |key| cluster.get_node_for_key(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/command/batch_index_command.rb

@@ -0,0 +1,119 @@
+# 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/multi_command'
+
+module Aerospike
+
+  class BatchIndexCommand < MultiCommand #:nodoc:
+
+    attr_accessor :batch
+    attr_accessor :policy
+    attr_accessor :bin_names
+    attr_accessor :results
+    attr_accessor :read_attr
+
+    def initialize(node, batch, policy, bin_names, results, read_attr)
+      super(node)
+      @batch = batch
+      @policy = policy
+      @bin_names = bin_names
+      @results = results
+      @read_attr = read_attr
+    end
+
+    def write_buffer
+      bin_name_size = 0
+      operation_count = 0
+      field_count = 1
+      if bin_names
+        bin_names.each do |bin_name|
+          bin_name_size += bin_name.bytesize + OPERATION_HEADER_SIZE
+        end
+        operation_count = bin_names.length
+      end
+      begin_cmd
+      @data_offset += FIELD_HEADER_SIZE + 4 + 1 # batch.keys.length + flags
+
+      prev = nil
+      batch.keys.each do |key|
+        @data_offset += key.digest.length + 4 # 4 byte batch offset
+
+        if prev != nil && prev.namespace == key.namespace
+          @data_offset += 1
+        else
+          @data_offset += key.namespace.bytesize + FIELD_HEADER_SIZE + 1 + 1 + 2 + 2 # repeat/no-repeat flag + read_attr flags + field_count + operation_count
+          @data_offset += bin_name_size
+        end
+      end
+      size_buffer
+      write_header(policy,read_attr | INFO1_BATCH, 0, 1, 0)
+      write_field_header(0, Aerospike::FieldType::BATCH_INDEX)
+      @data_offset += @data_buffer.write_int32(batch.keys.length, @data_offset)
+      @data_offset += @data_buffer.write_byte(1, @data_offset)
+
+      prev = nil
+
+      batch.each_key_with_index do |key, index|
+        @data_offset += @data_buffer.write_int32(index, @data_offset)
+        @data_offset += @data_buffer.write_binary(key.digest, @data_offset)
+
+        if (prev != nil && prev.namespace == key.namespace)
+          @data_offset += @data_buffer.write_byte(1, @data_offset)
+        else
+          @data_offset += @data_buffer.write_byte(0, @data_offset)
+          @data_offset += @data_buffer.write_byte(read_attr, @data_offset)
+          @data_offset += @data_buffer.write_int16(field_count, @data_offset)
+          @data_offset += @data_buffer.write_int16(operation_count, @data_offset)
+          write_field_string(key.namespace, Aerospike::FieldType::NAMESPACE)
+
+          if bin_names
+            bin_names.each do |bin_name|
+              write_operation_for_bin_name(bin_name, Aerospike::Operation::READ)
+            end
+          end
+          prev = key
+        end
+      end
+      end_cmd
+    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)
+      batch_index = @data_buffer.read_int32(14)
+      field_count = @data_buffer.read_int16(18)
+      op_count = @data_buffer.read_int16(20)
+
+      key = parse_key(field_count)
+      req_key = batch.key_for_index(batch_index)
+
+      if key.digest == req_key.digest
+        if result_code == 0
+          record = parse_record(req_key, op_count, generation, expiration)
+          results[batch_index] = record
+        end
+      else
+        Aerospike.logger.warn("Unexpected batch key returned: #{key}")
+      end
+    end
+
+  end # class
+
+end # module