aerospike 2.10.0 → 2.15.0

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,19 +30,63 @@ module Aerospike
       self
     end
 
+    def get_node
+      @cluster.master_node(@partition)
+    end
+
     def write_buffer
       set_touch(@policy, @key)
     end
 
     def parse_result
       # Read header.
-      @conn.read(@data_buffer, MSG_TOTAL_HEADER_SIZE)
+      begin
+        @conn.read(@data_buffer, 8)
+      rescue => e
+        Aerospike.logger.error("parse result error: #{e}")
+        raise e
+      end
+
+      # inflate if compressed
+      compressed_sz = compressed_size
+      if compressed_sz
+        begin
+          #waste 8 size bytes
+          @conn.read(@data_buffer, 8)
+
+          # read compressed message
+          @conn.read(@data_buffer, sz - 8)
+
+          # inflate the results
+          # TODO: reuse the current buffer
+          uncompressed = Zlib::inflate(@data_buffer.buf)
+
+          @data_buffer = Buffer.new(-1, uncompressed)
+        rescue => e
+          Aerospike.logger.error("parse result error: #{e}")
+          raise e
+        end
+      else
+        begin
+          bytes_read = @conn.read(@data_buffer, MSG_TOTAL_HEADER_SIZE - 8, 8)
+        rescue => e
+          Aerospike.logger.error("parse result error: #{e}")
+          raise e
+        end
+      end
 
       result_code = @data_buffer.read(13).ord & 0xFF
 
-      raise Aerospike::Exceptions::Aerospike.new(result_code) if result_code != 0
+      return if result_code == 0
+
+      if result_code == Aerospike::ResultCode::FILTERED_OUT
+        if @policy.fail_on_filtered_out
+          raise Aerospike::Exceptions::Aerospike.new(result_code)
+        end
+        return
+      end
 
-      empty_socket
+      raise Aerospike::Exceptions::Aerospike.new(result_code)
     end
 
   end # class

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
@@ -52,11 +56,16 @@ module Aerospike
 
       result_code = @data_buffer.read(13).ord & 0xFF
 
-      if result_code != 0
-        raise Aerospike::Exceptions::Aerospike.new(result_code)
+      return if result_code == 0
+
+      if result_code == Aerospike::ResultCode::FILTERED_OUT
+        if @policy.fail_on_filtered_out
+          raise Aerospike::Exceptions::Aerospike.new(result_code)
+        end
+        return
       end
 
-      empty_socket
+      raise Aerospike::Exceptions::Aerospike.new(result_code)
     end
 
   end # class

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.
@@ -40,5 +40,7 @@ module Aerospike
     # Server supports the new "peers" protocol for automatic node discovery
     PEERS = :peers
 
+    # Server supports the "truncate-namespace" command
+    TRUNCATE_NAMESPACE = :"truncate-namespace"
   end
 end

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.
@@ -52,6 +52,75 @@ module Aerospike
       other.to_json == self.to_json
     end
 
+    def lng
+      case type
+      when 'Point'
+        coordinates.first
+      when 'AeroCircle'
+        coordinates.first.first
+      end
+    end
+
+    def lat
+      case type
+      when 'Point'
+        coordinates.last
+      when 'AeroCircle'
+        coordinates.first.last
+      end
+    end
+
+    def radius
+      return nil unless circle?
+
+      coordinates.last
+    end
+
+    def coordinates
+      to_h['coordinates']
+    end
+
+    def type
+      to_h['type']
+    end
+
+    def point?
+      type == 'Point'
+    end
+
+    def circle?
+      type == 'AeroCircle'
+    end
+
+    def polygon?
+      type == 'Polygon'
+    end
+
+    def self.point(lng, lat)
+      new(type: 'Point', coordinates: [lng, lat])
+    end
+
+    def self.circle(lng, lat, radius)
+      new(type: 'AeroCircle', coordinates: [[lng, lat], radius])
+    end
+
+    def self.polygon(coordinates)
+      new(type: 'Polygon', coordinates: coordinates)
+    end
+
+    def to_circle(radius)
+      raise TypeError, 'Cannot create a Circle from a Polygon' if polygon?
+
+      self.class.circle(lng, lat, radius)
+    end
+
+    def to_point
+      return self if point?
+      raise TypeError, 'Cannot create a Point from a Polygon' if polygon?
+
+      self.class.point(lng, lat)
+    end
+
     protected
 
     attr_accessor :json_data

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.
@@ -22,7 +22,7 @@ require 'aerospike/atomic/atomic'
 module Aerospike
   class Node
 
-    attr_reader :reference_count, :responded, :name, :features, :cluster_name, :partition_generation, :peers_generation, :failures, :cluster, :peers_count, :host
+    attr_reader :reference_count, :responded, :name, :features, :cluster_name, :partition_generation, :rebalance_generation, :peers_generation, :failures, :cluster, :peers_count, :host
 
     PARTITIONS = 4096
     FULL_HEALTH = 100
@@ -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
 
@@ -47,14 +46,29 @@ module Aerospike
       @peers_count = Atomic.new(0)
       @peers_generation = ::Aerospike::Node::Generation.new
       @partition_generation = ::Aerospike::Node::Generation.new
+      @rebalance_generation = ::Aerospike::Node::Rebalance.new
       @reference_count = Atomic.new(0)
       @responded = Atomic.new(false)
       @active = Atomic.new(true)
       @failures = Atomic.new(0)
 
+      @replica_index = Atomic.new(0)
+      @racks = Atomic.new(nil)
+
       @connections = ::Aerospike::ConnectionPool.new(cluster, host)
     end
 
+    def update_racks(parser)
+      new_racks = parser.update_racks
+      @racks.value = new_racks if new_racks
+    end
+
+    def has_rack(ns, rack_id)
+      racks = @racks.value
+      return false if !racks
+      racks[ns] == rack_id
+    end
+
     # Get a connection to the node. If no cached connection is not available,
     # a new connection will be created
     def get_connection(timeout)
@@ -178,10 +192,6 @@ module Aerospike
     end
     alias eql? ==
 
-    def use_new_info?
-      @use_new_info.value
-    end
-
     def hash
       @name.hash
     end
@@ -202,6 +212,10 @@ module Aerospike
       Node::Refresh::Partitions.(self, peers)
     end
 
+    def refresh_racks()
+      Node::Refresh::Racks.(self)
+    end
+
     def refresh_peers(peers)
       Node::Refresh::Peers.(self, peers)
     end

data/lib/aerospike/node/rebalance.rb

@@ -0,0 +1,50 @@
+# 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 Node
+    # generic class for representing changes in eg. peer and partition generation
+    class Rebalance
+      attr_reader :generation
+
+      def initialize(generation = -1)
+        @generation = ::Aerospike::Atomic.new(generation)
+        @changed = ::Aerospike::Atomic.new(false)
+      end
+
+      def changed?
+        @changed.value == true
+      end
+
+      def eql?(generation)
+        @generation.value == generation
+      end
+
+      def reset_changed!
+        @changed.value = false
+      end
+
+      def update(new_generation)
+        return if @generation.value == new_generation
+        @generation.value = new_generation
+        @changed.value = true
+      end
+    end
+  end
+end

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

@@ -24,14 +24,17 @@ module Aerospike
         CMDS_BASE = %w[node partition-generation cluster-name].freeze
         CMDS_PEERS = (CMDS_BASE + ['peers-generation']).freeze
         CMDS_SERVICES = (CMDS_BASE + ['services']).freeze
+        CMDS_REBALANCE = (CMDS_PEERS + ['rebalance-generation']).freeze
 
         class << self
           def call(node, peers)
             conn = node.tend_connection
             if peers.use_peers?
-              info_map = ::Aerospike::Info.request(conn, *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)
+              Verify::RebalanceGeneration.(node, info_map) if node.cluster.rack_aware
               Verify::Name.(node, info_map)
               Verify::ClusterName.(node, info_map)
             else

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

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

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+# Copyright 2018-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 Node
+    module Refresh
+      module Racks
+        class << self
+          def call(node)
+            return unless should_refresh?(node)
+
+            Aerospike.logger.info("Updating racks for node #{node.name}")
+            conn = node.tend_connection
+            parser = RackParser.new(node, conn)
+            node.update_racks(parser)
+          rescue ::Aerospike::Exceptions::Aerospike => e
+            conn.close
+            Refresh::Failed.(node, e)
+          end
+
+          # Do not refresh racks when node connection has already failed
+          # during this cluster tend iteration.
+          def should_refresh?(node)
+            return false if node.failed? || !node.active?
+            true
+          end
+        end
+      end
+    end
+  end
+end