aerospike 2.21.1 → 2.23.0

data/lib/aerospike/command/read_command.rb

@@ -98,7 +98,7 @@ module Aerospike
       receive_size = (sz & 0xFFFFFFFFFFFF) - header_length
 
       # Read remaining message bytes.
-      if compressed_sz 
+      if compressed_sz
         @data_buffer.eat!(MSG_TOTAL_HEADER_SIZE)
       elsif receive_size > 0
         size_buffer_sz(receive_size)
@@ -117,7 +117,7 @@ module Aerospike
           @record = Record.new(@node, @key, nil, generation, expiration)
           return
         end
-  
+
         @record = parse_record(op_count, field_count, generation, expiration)
         return
       end

data/lib/aerospike/connection/authenticate.rb

@@ -38,9 +38,7 @@ module Aerospike
 
         def call(conn, cluster)
           command = LoginCommand.new
-          if !cluster.session_valid?
-            command.authenticate_new(conn, cluster)
-          else
+          if cluster.session_valid?
             begin
               command.authenticate_via_token(conn, cluster)
             rescue => ae
@@ -49,11 +47,13 @@ module Aerospike
               if ae.is_a?(Exceptions::Aerospike)
                 if INVALID_SESSION_ERR.include?(ae.result_code)
                   command.authenticate_new(conn, cluster)
-                  return
+                  return true
                 end
               end
               raise ae
             end
+          else
+            command.authenticate_new(conn, cluster)
           end
 
           true

data/lib/aerospike/features.rb

@@ -23,10 +23,10 @@ module Aerospike
   module Features
 
     # Server supports List Complex Data Type (CDT)
-    CDT_LIST = :"cdt-list"
+    CDT_LIST = :'cdt-list'
 
     # Server supports Map Complex Data Type (CDT)
-    CDT_MAP = :"cdt-map"
+    CDT_MAP = :'cdt-map'
 
     # Server supports Float data type
     FLOAT = :float
@@ -34,16 +34,16 @@ module Aerospike
     # Server supports geo-spatial data type and indexing
     GEO = :geo
 
-    # Server requires "lut=now" in truncate command (AER-5955)
-    LUT_NOW = :"lut-now"
+    # Server requires 'lut=now' in truncate command (AER-5955)
+    LUT_NOW = :'lut-now'
 
-    # Server supports the new "peers" protocol for automatic node discovery
+    # Server supports the new 'peers' protocol for automatic node discovery
     PEERS = :peers
 
-    # Server supports the "truncate-namespace" command
-    TRUNCATE_NAMESPACE = :"truncate-namespace"
+    # Server supports the 'truncate-namespace' command
+    TRUNCATE_NAMESPACE = :'truncate-namespace'
 
-    # Server supports the "blob-bits" command
-    BLOB_BITS = :"blob-bits"
+    # Server supports the 'blob-bits' command
+    BLOB_BITS = :'blob-bits'
   end
 end

data/lib/aerospike/host/parse.rb

@@ -20,7 +20,7 @@
 module Aerospike
   class Host
     module Parse
-      INTEGER_REGEX = /\A\d+\z/
+      INTEGER_REGEX = /\A\d+\z/.freeze
 
       class << self
         ##
@@ -73,4 +73,4 @@ module Aerospike
       end
     end
   end
-end
+end

data/lib/aerospike/key.rb

@@ -53,15 +53,20 @@ module Aerospike
 
     attr_reader :namespace, :set_name, :digest
 
-    def initialize(ns, set, val, digest=nil, v1_compatible: self.class.v1_compatible?)
+    def initialize(ns, set, val, digest=nil, bval: nil, v1_compatible: self.class.v1_compatible?)
       @namespace = ns
       @set_name = set
       @user_key = Value.of(val)
       check_key!(@namespace, @set_name, @user_key, !digest.nil?)
       @digest = digest || compute_digest(v1_compatible)
+      @bval = bval
     end
 
 
+    def bval
+      @bval
+    end
+
     def to_s
       "#{@namespace}:#{@set_name}:#{@user_key}:#{@digest.nil? ? '' : @digest.bytes}"
     end
@@ -85,6 +90,10 @@ module Aerospike
       @digest.hash
     end
 
+    def partition_id
+      (@digest[0..3].unpack(Partition::UNPACK_FORMAT)[0] & 0xFFFF) % Node::PARTITIONS
+    end
+
     private
 
     def valid_key?(value, has_digest)

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

@@ -30,7 +30,7 @@ module Aerospike
           def call(node, peers)
             conn = node.tend_connection
             if peers.use_peers?
-              cmds = node.cluster.rack_aware ? CMDS_REBALANCE : CMDS_PEERS 
+              cmds = node.cluster.rack_aware ? CMDS_REBALANCE : CMDS_PEERS
               info_map = ::Aerospike::Info.request(conn, *cmds)
               Verify::PeersGeneration.(node, info_map, peers)
               Verify::PartitionGeneration.(node, info_map)

data/lib/aerospike/node/verify/name.rb

@@ -40,4 +40,4 @@ module Aerospike
       end
     end
   end
-end
+end

data/lib/aerospike/node/verify/partition_generation.rb

@@ -40,4 +40,4 @@ module Aerospike
       end
     end
   end
-end
+end

data/lib/aerospike/node/verify/peers_generation.rb

@@ -38,4 +38,4 @@ module Aerospike
       end
     end
   end
-end
+end

data/lib/aerospike/node/verify/rebalance_generation.rb

@@ -40,4 +40,4 @@ module Aerospike
       end
     end
   end
-end
+end

data/lib/aerospike/node_validator.rb

@@ -40,6 +40,7 @@ module Aerospike
 
     def get_hosts(address)
       aliases = [get_alias(address, host.port)]
+      res = []
 
       begin
         conn = Cluster::CreateConnection.(@cluster, Host.new(address, host.port, host.tls_name))
@@ -61,11 +62,15 @@ module Aerospike
         unless is_loopback?(address)
           aliases = info_map[address_command].split(',').map { |addr| get_alias(*addr.split(':')) }
         end
+
+        res = aliases.map { |al| Host.new(al[:address], al[:port], host.tls_name) }
+      rescue
+        # we don't care about the actual connection error; Just need to continue
       ensure
         conn.close if conn
       end
 
-      aliases.map { |al| Host.new(al[:address], al[:port], host.tls_name) }
+      res
     end
 
     def get_alias(address, port)

data/lib/aerospike/policy/policy.rb

@@ -26,6 +26,9 @@ module Aerospike
     attr_accessor :priority, :timeout, :max_retries, :sleep_between_retries, :consistency_level,
                   :predexp, :fail_on_filtered_out, :replica, :use_compression
 
+    alias total_timeout timeout
+    alias total_timeout= timeout=
+
     def initialize(opt={})
       # Container object for transaction policy attributes used in all database
       # operation calls.
@@ -85,7 +88,7 @@ module Aerospike
 
 
       # 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 
+      # 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.

data/lib/aerospike/policy/scan_policy.rb

@@ -22,6 +22,7 @@ module Aerospike
   # Container object for scan policy command.
   class ScanPolicy < Policy
 
+    attr_accessor :max_records
     attr_accessor :scan_percent
     attr_accessor :concurrent_nodes
     attr_accessor :include_bin_data
@@ -35,6 +36,16 @@ module Aerospike
 
       @max_retries = 0
 
+      # Approximates the number of records to return to the client. This number is divided by the
+      # number of nodes involved in the query. The actual number of records returned
+      # may be less than MaxRecords if node record counts are small and unbalanced across
+      # nodes.
+      #
+      # This field is supported on server versions >= 4.9.
+      #
+      # Default: 0 (do not limit record count)
+      @max_records = opt.fetch(:max_records) { 0 }
+
       # Percent of data to scan. Valid integer range is 1 to 100.
       # Default is 100.
       @scan_percent = opt[:scan_percent] || 100
@@ -51,7 +62,15 @@ module Aerospike
       # Default is true.
       @fail_on_cluster_change = opt.fetch(:fail_on_cluster_change) { true }
 
-      @socket_timeout = opt[:socket_timeout] || 10000
+      # Determines network timeout for each attempt.
+      #
+      # If socket_timeout is not zero and socket_timeout is reached before an attempt completes,
+      # the Timeout above is checked. If Timeout is not exceeded, the transaction
+      # is retried. If both socket_timeout and Timeout are non-zero, socket_timeout must be less
+      # than or equal to Timeout, otherwise Timeout will also be used for socket_timeout.
+      #
+      # Default: 30s
+      @socket_timeout = opt[:socket_timeout] || 30000
 
       # Number of records to place in queue before blocking. Records received
       # from multiple server nodes will be placed in a queue. A separate thread

data/lib/aerospike/privilege.rb

@@ -130,4 +130,4 @@ module Aerospike
 
 	end # class
 
-end
+end

data/lib/aerospike/query/node_partitions.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+# Copyright 2014-2020 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 NodePartitions
+    attr_accessor :node, :parts_full, :parts_partial, :record_count, :record_max, :parts_unavailable
+
+    def initialize(node)
+        @node= node
+        @parts_full=    []
+        @parts_partial= []
+        @record_count= 0
+        @parts_unavailable= 0
+        @record_max= 0
+    end
+
+    def to_s
+      "Node #{@node.inspect}: full: #{@parts_full.length}, partial: #{@parts_partial.length}"
+    end
+
+    def add_partition(partition_status)
+      partition_status.digest.nil? ? @parts_full << partition_status : @parts_partial << partition_status
+    end
+  end
+end

data/lib/aerospike/query/partition_filter.rb

@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+# Copyright 2014-2020 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 PartitionFilter
+    attr_reader :partition_begin, :count, :digest
+    attr_accessor :partitions, :done
+
+    alias done? done
+
+    # Creates a partition filter that
+    # reads all the partitions.
+    def self.all
+      PartitionFilter.new(0, Aerospike::Node::PARTITIONS)
+    end
+
+    # Creates a partition filter by partition id.
+    # Partition id is between 0 - 4095
+    def self.by_id(partition_id)
+      PartitionFilter.new(partition_id, 1)
+    end
+
+    # Creates a partition filter by partition range.
+    # begin partition id is between 0 - 4095
+    # count is the number of partitions, in the range of 1 - 4096 inclusive.
+    def self.by_range(partition_begin, count)
+      PartitionFilter.new(partition_begin, count)
+    end
+
+    # Creates a partition filter that will return
+    # records after key's digest in the partition containing the digest.
+    # Note that digest order is not the same as userKey order. This method
+    # only works for scan or query with nil filter.
+    def self.by_key(key)
+      PartitionFilter.new(key.partition_id, 1, key.digest)
+    end
+
+    def to_s
+      "PartitionFilter<begin: #{@partition_begin}, count: #{@count}, digest: #{@digest}, done: #{@done}>"
+    end
+
+    private
+
+    def initialize(partition_begin, count, digest = nil, partitions = nil, done = false)
+      @partition_begin = partition_begin
+      @count = count
+      @digest = digest
+      @partitions = partitions
+      @done = done
+    end
+  end
+end

data/lib/aerospike/query/partition_status.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+# Copyright 2014-2020 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 PartitionStatus #:nodoc:
+    attr_accessor :bval, :id, :digest, :retry
+
+    def initialize(id)
+      @id = id
+      @retry = true
+    end
+
+    #
+    # Show the PartitionStatus as String.
+    #
+    def to_s
+      "PartitionStatus<bval: #{@bval}, id: #{@id}, retry: #{@retry}, digest: #{@digest}>"
+    end
+
+  end
+end