aerospike 2.12.0 → 2.13.0

data/lib/aerospike/node_validator.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.
@@ -19,13 +19,11 @@
 
 module Aerospike
   class NodeValidator # :nodoc:
-    VERSION_REGEXP = /(?<v1>\d+)\.(?<v2>\d+)\.(?<v3>\d+).*/.freeze
 
-    attr_reader :host, :aliases, :name, :use_new_info, :features, :cluster_name, :tls_options, :conn
+    attr_reader :host, :aliases, :name, :features, :cluster_name, :tls_options, :conn
 
     def initialize(cluster, host, timeout, cluster_name, tls_options = {})
       @cluster = cluster
-      @use_new_info = true
       @features = Set.new
       @host = host
       @cluster_name = cluster_name
@@ -46,7 +44,7 @@ module Aerospike
       begin
         conn = Cluster::CreateConnection.(@cluster, Host.new(address, host.port, host.tls_name))
 
-        commands = %w[node build features]
+        commands = %w[node features]
         commands << address_command unless is_loopback?(address)
 
         info_map = Info.request(conn, *commands)
@@ -58,16 +56,10 @@ module Aerospike
           if features = info_map['features']
             @features = features.split(';').to_set
           end
-
-          # Check new info protocol support for >= 2.6.6 build
-          if build_version = info_map['build']
-            v1, v2, v3 = parse_version_string(build_version)
-            @use_new_info = v1.to_i > 2 || (v1.to_i == 2 && (v2.to_i > 6 || (v2.to_i == 6 && v3.to_i >= 6)))
-          end
         end
 
         unless is_loopback?(address)
-          aliases = info_map[address_command].split(',').map { |address| get_alias(*address.split(':')) }
+          aliases = info_map[address_command].split(',').map { |addr| get_alias(*addr.split(':')) }
         end
       ensure
         conn.close if conn
@@ -103,12 +95,5 @@ module Aerospike
       !!((hostname =~ Resolv::IPv4::Regex) || (hostname =~ Resolv::IPv6::Regex))
     end
 
-    def parse_version_string(version)
-      if v = VERSION_REGEXP.match(version)
-        return v['v1'], v['v2'], v['v3']
-      end
-
-      raise Aerospike::Exceptions::Parse.new("Invalid build version string in Info: #{version}")
-    end
   end # class
 end # module

data/lib/aerospike/operation.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/policy/admin_policy.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/policy/batch_policy.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/policy/client_policy.rb

@@ -1,6 +1,6 @@
 # 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/policy/commit_level.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-# Copyright 2014-2017 Aerospike, Inc.
+# Copyright 2014-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/policy/consistency_level.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-# Copyright 2014-2017 Aerospike, Inc.
+# Copyright 2014-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/policy/generation_policy.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-# Copyright 2014-2017 Aerospike, Inc.
+# Copyright 2014-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/policy/operate_policy.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-# Copyright 2016-2017 Aerospike, Inc.
+# Copyright 2016-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/policy/policy.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-# Copyright 2014-2017 Aerospike, Inc.
+# Copyright 2014-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.
@@ -15,6 +15,7 @@
 
 require 'aerospike/policy/priority'
 require 'aerospike/policy/consistency_level'
+require 'aerospike/policy/replica'
 
 
 module Aerospike
@@ -23,7 +24,7 @@ module Aerospike
   class Policy
 
     attr_accessor :priority, :timeout, :max_retries, :sleep_between_retries, :consistency_level,
-                  :predexp, :fail_on_filtered_out
+                  :predexp, :fail_on_filtered_out, :replica
 
     def initialize(opt={})
       # Container object for transaction policy attributes used in all database
@@ -82,7 +83,15 @@ module Aerospike
       # read operation.
       @consistency_level = opt[:consistency_level] || Aerospike::ConsistencyLevel::CONSISTENCY_ONE
 
-      # Transaction timeout.
+
+      # Send read commands to the node containing the key's partition replica type.
+      # Write commands are not affected by this setting, because all writes are directed 
+      # to the node containing the key's master partition.
+      #
+      # Default to sending read commands to the node containing the key's master partition.
+      @replica = opt[:replica] || Aerospike::Replica::MASTER;
+
+        # Transaction timeout.
       # This timeout is used to set the socket timeout and is also sent to the
       # server along with the transaction in the wire protocol.
       # Default to no timeout (0).

data/lib/aerospike/policy/priority.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-# Copyright 2014-2017 Aerospike, Inc.
+# Copyright 2014-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/policy/query_policy.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,6 +24,7 @@ module Aerospike
 
     attr_accessor :include_bin_data
     attr_accessor :record_queue_size
+    attr_accessor :records_per_second
 
     def initialize(opt={})
       super(opt)
@@ -42,6 +43,12 @@ module Aerospike
       # Default is 5000.
       @record_queue_size = opt[:record_queue_size] || 5000
 
+      # Limit returned records per second (rps) rate for each server.
+      # Will not apply rps limit if records_per_second is zero.
+      # Currently only applicable to a query without a defined filter (scan).
+      # Default is 0
+      @records_per_second = opt[:records_per_second] || 0
+
       self
     end
 

data/lib/aerospike/policy/record_bin_multiplicity.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-# Copyright 2016-2017 Aerospike, Inc.
+# Copyright 2016-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/policy/record_exists_action.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-# Copyright 2014-2017 Aerospike, Inc.
+# Copyright 2014-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/policy/replica.rb

@@ -0,0 +1,38 @@
+# encoding: utf-8
+# Copyright 2014-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.
+# 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
+
+  module Replica
+
+    # Read from node containing key's master partition.  This is the default behavior.
+    MASTER = 0
+
+    # Distribute reads across nodes containing key's master and replicated partitions
+    # in round-robin fashion.
+    MASTER_PROLES = 1
+
+    # Always try node containing master partition first. If connection fails and
+    # Policy#retryOnTimeout is true, try nodes containing prole partition.
+    SEQUENCE = 2
+
+    # Distribute reads across all nodes in cluster in round-robin fashion.
+    # This option is useful when the replication factor equals the number
+    # of nodes in the cluster and the overhead of requesting proles is not desired.
+    RANDOM = 4
+
+  end # module
+
+end # module

data/lib/aerospike/policy/scan_policy.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.
@@ -28,6 +28,7 @@ module Aerospike
     attr_accessor :fail_on_cluster_change
     attr_accessor :socket_timeout
     attr_accessor :record_queue_size
+    attr_accessor :records_per_second
 
     def initialize(opt={})
       super(opt)
@@ -59,6 +60,12 @@ module Aerospike
       # Default is 5000.
       @record_queue_size = opt[:record_queue_size] || 5000
 
+      # Limit returned records per second (rps) rate for each server.
+      # Will not apply rps limit if records_per_second is zero.
+      # Currently only applicable to a query without a defined filter (scan).
+      # Default is 0
+      @records_per_second = opt[:records_per_second] || 0
+
       self
     end
 

data/lib/aerospike/policy/write_policy.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-# Copyright 2014-2017 Aerospike, Inc.
+# Copyright 2014-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/query/filter.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/query/query_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.
@@ -82,6 +82,11 @@ module Aerospike
           fieldCount+=1
         end
       else
+        if @policy.records_per_second > 0
+          @data_offset += 4 + FIELD_HEADER_SIZE
+          fieldCount += 1
+        end
+
         # Calling query with no filters is more efficiently handled by a primary index scan.
         # Estimate scan options size.
         @data_offset += (2 + FIELD_HEADER_SIZE)
@@ -172,6 +177,10 @@ module Aerospike
           end
         end
       else
+        if @policy.records_per_second > 0
+          write_field_int(@policy.records_per_second, Aerospike::FieldType::RECORDS_PER_SECOND)
+        end
+
         # Calling query with no filters is more efficiently handled by a primary index scan.
         write_field_header(2, Aerospike::FieldType::SCAN_OPTIONS)
         priority = @policy.priority.ord

data/lib/aerospike/query/recordset.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/query/scan_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/query/statement.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/query/stream_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/record.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/result_code.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/socket/base.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/task/execute_task.rb

@@ -1,4 +1,4 @@
-# Copyright 2013-2017 Aerospike, Inc.
+# Copyright 2013-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/task/index_task.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/task/task.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/task/udf_register_task.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/task/udf_remove_task.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/ttl.rb

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

data/lib/aerospike/udf.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/user_role.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/utils/buffer.rb

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