aerospike 2.12.0 → 2.13.0

data/lib/aerospike/command/admin_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/batch_direct_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.

data/lib/aerospike/command/batch_direct_exists_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.

data/lib/aerospike/command/batch_direct_node.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.
@@ -24,8 +24,8 @@ module Aerospike
     attr_accessor :node
     attr_accessor :batch_namespaces
 
-    def self.generate_list(cluster, keys)
-      keys.group_by { |key| cluster.get_node_for_key(key) }
+    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
 

data/lib/aerospike/command/batch_index_node.rb

@@ -22,9 +22,9 @@ module Aerospike
     attr_accessor :node
     attr_accessor :keys_by_idx
 
-    def self.generate_list(cluster, keys)
+    def self.generate_list(cluster, replica_policy, keys)
       keys.each_with_index
-        .group_by { |key, _| cluster.get_node_for_key(key) }
+        .group_by { |key, _| cluster.get_node_for_key(replica_policy, key) }
         .map { |node, keys_with_idx| BatchIndexNode.new(node, keys_with_idx) }
     end
 

data/lib/aerospike/command/batch_item.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.

data/lib/aerospike/command/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.
@@ -77,12 +77,15 @@ module Aerospike
 
   class Command #:nodoc:
 
-    def initialize(node)
+    def initialize(node=nil)
       @data_offset = 0
       @data_buffer = nil
 
       @node = node
 
+      # will add before use
+      @sequence = Atomic.new(-1)
+
       self
     end
 
@@ -324,6 +327,11 @@ module Aerospike
         field_count += 1
       end
       
+      if policy.records_per_second > 0
+        @data_offset += 4 + FIELD_HEADER_SIZE
+        field_count += 1
+      end
+
       predexp_size = estimate_predexp(policy.predexp)
       field_count += 1 if predexp_size > 0
 
@@ -363,6 +371,10 @@ module Aerospike
         write_field_string(set_name, Aerospike::FieldType::TABLE)
       end
 
+      if policy.records_per_second > 0
+        write_field_int(policy.records_per_second, Aerospike::FieldType::RECORDS_PER_SECOND)
+      end
+
       write_predexp(policy.predexp, predexp_size)
 
       write_field_header(2, Aerospike::FieldType::SCAN_OPTIONS)
@@ -410,6 +422,7 @@ module Aerospike
         break if @policy.timeout > 0 && Time.now > limit
 
         begin
+          @node = get_node
           @conn = @node.get_connection(@policy.timeout)
         rescue => e
           # Socket connection error has occurred. Decrease health and retry.
@@ -746,15 +759,19 @@ module Aerospike
       @data_offset += len
     end
 
+    def write_field_int(i, ftype)
+      @data_buffer.write_int32(i, @data_offset+FIELD_HEADER_SIZE)
+      write_field_header(4, ftype)
+      @data_offset += 4
+    end
+
     def write_field_bytes(bytes, ftype)
       @data_buffer.write_binary(bytes, @data_offset+FIELD_HEADER_SIZE)
-
       write_field_header(bytes.bytesize, ftype)
       @data_offset += bytes.bytesize
     end
 
     def write_field_header(size, ftype)
-      # Buffer.Int32ToBytes(size+1), @data_buffer, @data_offset
       @data_buffer.write_int32(size+1, @data_offset)
       @data_offset += 4
       @data_buffer.write_byte(ftype, @data_offset)

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

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

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.
@@ -32,6 +32,10 @@ module Aerospike
       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.

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.
@@ -39,6 +39,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

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

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.

data/lib/aerospike/command/touch_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.
@@ -30,6 +30,10 @@ module Aerospike
       self
     end
 
+    def get_node
+      @cluster.master_node(@partition)
+    end
+
     def write_buffer
       set_touch(@policy, @key)
     end

data/lib/aerospike/command/unsupported_particle_type_validator.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-# Copyright 2015-2017 Aerospike, Inc.
+# Copyright 2015-2020 Aerospike, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License")
 # you may not use this file except in compliance with the License.

data/lib/aerospike/command/write_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_bins
       @bins
     end

data/lib/aerospike/connection/create.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright 2014-2018 Aerospike, Inc.
+# Copyright 2014-2020 Aerospike, Inc.
 #
 # Portions may be licensed to Aerospike, Inc. under one or more contributor
 # license agreements.

data/lib/aerospike/features.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.

data/lib/aerospike/geo_json.rb

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

data/lib/aerospike/host.rb

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

data/lib/aerospike/info.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/key.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/language.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/node.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright 2014-2018 Aerospike, Inc.
+# Copyright 2014-2020 Aerospike, Inc.
 #
 # Portions may be licensed to Aerospike, Inc. under one or more contributor
 # license agreements.
@@ -33,7 +33,6 @@ module Aerospike
       @name = nv.name
       @aliases = Atomic.new(nv.aliases)
       @host = nv.host
-      @use_new_info = Atomic.new(nv.use_new_info)
       @features = nv.features
       @cluster_name = nv.cluster_name
 
@@ -52,6 +51,8 @@ module Aerospike
       @active = Atomic.new(true)
       @failures = Atomic.new(0)
 
+      @replica_index = Atomic.new(0)
+
       @connections = ::Aerospike::ConnectionPool.new(cluster, host)
     end
 
@@ -178,10 +179,6 @@ module Aerospike
     end
     alias eql? ==
 
-    def use_new_info?
-      @use_new_info.value
-    end
-
     def hash
       @name.hash
     end

data/lib/aerospike/node/refresh/partitions.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright 2018 Aerospike, Inc.
+# Copyright 2018-2020 Aerospike, Inc.
 #
 # Portions may be licensed to Aerospike, Inc. under one or more contributor
 # license agreements.
@@ -25,24 +25,15 @@ module Aerospike
           def call(node, peers)
             return unless should_refresh?(node, peers)
 
-            node.cluster.update_partitions(tokenizer(node), node)
+            Aerospike.logger.info("Updating partitions for node #{node.name}")
+            conn = node.tend_connection
+            parser = PartitionParser.new(node, conn)
+            node.cluster.update_partitions(parser)
           rescue ::Aerospike::Exceptions::Aerospike => e
-            node.tend_connection.close
+            conn.close
             Refresh::Failed.(node, e)
           end
 
-          # Return correct tokenizer depending on version
-          def tokenizer(node)
-            conn = node.tend_connection
-            if node.use_new_info?
-              Aerospike.logger.info("Updating partitions for node #{node.name} using new protocol")
-              PartitionTokenizerNew.new(conn)
-            else
-              Aerospike.logger.info("Updating partitions for node #{node.name} using old protocol")
-              PartitionTokenizerOld.new(conn)
-            end
-          end
-
           # Do not refresh partitions when node connection has already failed
           # during this cluster tend iteration. Also, avoid "split cluster"
           # case where this node thinks it's a 1-node cluster. Unchecked, such