aerospike 2.6.0 → 2.7.0

data/lib/aerospike/socket/ssl.rb

@@ -22,16 +22,16 @@ module Aerospike
     class SSL < ::OpenSSL::SSL::SSLSocket
       include Base
 
-      SUPPORTED_SSL_PARAMS = %i[ca_file ca_path min_version max_version].freeze
-      DEFAULT_SSL_PARAMS = {
+      SUPPORTED_TLS_PARAMS = %i[ca_file ca_path min_version max_version].freeze
+      DEFAULT_TLS_PARAMS = {
         min_version: :TLS1_2
       }.freeze
 
       class << self
-        def connect(host, port, timeout, tls_name, ssl_options)
-          Aerospike.logger.debug("Connecting to #{host}:#{tls_name}:#{port} using SSL options #{ssl_options}")
+        def connect(host, port, timeout, tls_name, tls_options)
+          Aerospike.logger.debug("Connecting to #{host}:#{tls_name}:#{port} using TLS options #{tls_options}")
           tcp_sock = TCP.connect(host, port, timeout)
-          ctx = build_ssl_context(ssl_options)
+          ctx = build_ssl_context(tls_options)
           new(tcp_sock, ctx).tap do |ssl_sock|
             ssl_sock.hostname = tls_name
             ssl_sock.connect
@@ -39,15 +39,15 @@ module Aerospike
           end
         end
 
-        def build_ssl_context(ssl_options)
-          ssl_options[:context] || create_context(ssl_options)
+        def build_ssl_context(tls_options)
+          tls_options[:context] || create_context(tls_options)
         end
 
-        def create_context(ssl_options)
+        def create_context(tls_options)
           OpenSSL::SSL::SSLContext.new.tap do |ctx|
-            if ssl_options[:cert_file] && ssl_options[:pkey_file]
-              cert = OpenSSL::X509::Certificate.new(File.read(ssl_options[:cert_file]))
-              pkey = OpenSSL::PKey.read(File.read(ssl_options[:pkey_file]), ssl_options[:pkey_pass])
+            if tls_options[:cert_file] && tls_options[:pkey_file]
+              cert = OpenSSL::X509::Certificate.new(File.read(tls_options[:cert_file]))
+              pkey = OpenSSL::PKey.read(File.read(tls_options[:pkey_file]), tls_options[:pkey_pass])
               if ctx.respond_to?(:add_certificate)
                 ctx.add_certificate(cert, pkey)
               else
@@ -56,13 +56,13 @@ module Aerospike
               end
             end
 
-            params = DEFAULT_SSL_PARAMS.merge(filter_params(ssl_options))
+            params = DEFAULT_TLS_PARAMS.merge(filter_params(tls_options))
             ctx.set_params(params) unless params.empty?
           end
         end
 
         def filter_params(params)
-          params.select { |key| SUPPORTED_SSL_PARAMS.include?(key) }
+          params.select { |key| SUPPORTED_TLS_PARAMS.include?(key) }
         end
       end
     end

data/lib/aerospike/socket/tcp.rb

@@ -26,7 +26,14 @@ module Aerospike
 
       def self.connect(host, port, timeout)
         Aerospike.logger.debug("Trying to connect to #{host}:#{port} with #{timeout}s timeout")
-        sock = new(::Socket::AF_INET, ::Socket::SOCK_STREAM, 0)
+
+        domain = if host.match(Resolv::IPv6::Regex)
+          ::Socket::AF_INET6
+        else
+          ::Socket::AF_INET
+        end
+
+        sock = new(domain, ::Socket::SOCK_STREAM, 0)
         sockaddr = ::Socket.sockaddr_in(port, host)
 
         begin

data/lib/aerospike/utils/string_parser.rb

@@ -21,6 +21,7 @@ module Aerospike
   module Utils
     class StringParser
       attr_reader :io
+
       def initialize(str)
         @io = ::StringIO.new(str)
       end
@@ -34,20 +35,23 @@ module Aerospike
         raise ::Aerospike::Exceptions::Parse unless @io.read(1) == char
       end
 
-      def read_until(char)
+      def read_until(*args)
         [].tap do |result|
           loop do
             chr = @io.read(1)
-            break if chr == char
+            break if args.include?(chr)
             result << chr
           end
         end.join
       end
 
+      def prev
+        @io.string[@io.tell - 1]
+      end
+
       def step(count = 1)
         @io.read(count)
       end
-
     end
   end
 end

data/lib/aerospike/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Aerospike
-  VERSION = "2.6.0"
+  VERSION = "2.7.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aerospike
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.7.0
 platform: ruby
 authors:
 - Khosrow Afroozeh
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-27 00:00:00.000000000 Z
+date: 2018-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -65,20 +65,24 @@ files:
 - lib/aerospike/cluster.rb
 - lib/aerospike/cluster/create_connection.rb
 - lib/aerospike/cluster/find_node.rb
+- lib/aerospike/cluster/find_nodes_to_remove.rb
 - lib/aerospike/cluster/partition.rb
 - lib/aerospike/cluster/partition_tokenizer_new.rb
 - lib/aerospike/cluster/partition_tokenizer_old.rb
 - lib/aerospike/command/admin_command.rb
-- lib/aerospike/command/batch_command.rb
-- lib/aerospike/command/batch_command_exists.rb
-- lib/aerospike/command/batch_command_get.rb
+- lib/aerospike/command/batch_direct_command.rb
+- lib/aerospike/command/batch_direct_exists_command.rb
+- lib/aerospike/command/batch_direct_node.rb
+- lib/aerospike/command/batch_index_command.rb
+- lib/aerospike/command/batch_index_exists_command.rb
+- lib/aerospike/command/batch_index_node.rb
 - lib/aerospike/command/batch_item.rb
-- lib/aerospike/command/batch_node.rb
 - lib/aerospike/command/command.rb
 - lib/aerospike/command/delete_command.rb
 - lib/aerospike/command/execute_command.rb
 - lib/aerospike/command/exists_command.rb
 - lib/aerospike/command/field_type.rb
+- lib/aerospike/command/multi_command.rb
 - lib/aerospike/command/operate_command.rb
 - lib/aerospike/command/read_command.rb
 - lib/aerospike/command/read_header_command.rb
@@ -177,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: An Aerospike driver for Ruby.

data/lib/aerospike/command/batch_command_exists.rb

@@ -1,93 +0,0 @@
-# encoding: utf-8
-# Copyright 2014-2017 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_command'
-
-module Aerospike
-
-  private
-
-  class BatchCommandExists < BatchCommand #:nodoc:
-
-    def initialize(node, batch_namespace, policy, key_map, exists_array)
-      super(node)
-
-      @batch_namespace = batch_namespace
-      @policy = policy
-      @key_map = key_map
-      @exists_array = exists_array
-
-      self
-    end
-
-    def write_buffer
-      set_batch_exists(@policy, @batch_namespace)
-    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_record_results(receive_size)
-      #Parse each message response and add it to the result array
-      @data_offset = 0
-
-      while @data_offset < receive_size
-        if !valid?
-          raise Aerospike::Exceptions::QueryTerminated.new
-        end
-
-        read_bytes(MSG_REMAINING_HEADER_SIZE)
-
-        result_code = @data_buffer.read(5).ord & 0xFF
-
-        # The only valid server return codes are "ok" and "not found".
-        # If other return codes are received, then abort the batch.
-        if result_code != 0 && result_code != Aerospike::ResultCode::KEY_NOT_FOUND_ERROR
-          raise Aerospike::Exceptions::Aerospike.new(result_code)
-        end
-
-        info3 = @data_buffer.read(3).ord
-
-        # If cmd is the end marker of the response, do not proceed further
-        return false if info3 & INFO3_LAST == INFO3_LAST
-
-        field_count = @data_buffer.read_int16(18)
-        op_count = @data_buffer.read_int16(20)
-
-        if op_count > 0
-          raise Aerospike::Exceptions::Parse('Received bins that were not requested!')
-        end
-
-        key = parse_key(field_count)
-        item = @key_map[key.digest]
-
-        if item
-          index = item.index
-
-          # only set the results to true; as a result, no synchronization is needed
-          @exists_array[index] = (result_code == 0)
-        else
-          Aerospike::logger.debug("Unexpected batch key returned: #{key.namespace}, #{key.digest}")
-        end
-
-      end # while
-
-      return true
-    end
-
-
-  end # class
-
-end # module

data/lib/aerospike/command/batch_command_get.rb

@@ -1,84 +0,0 @@
-# encoding: utf-8
-# Copyright 2014-2017 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_command'
-
-module Aerospike
-
-  private
-
-  class BatchCommandGet < BatchCommand #:nodoc:
-
-    def initialize(node, batch_namespace, policy, key_map, bin_names, records, read_attr)
-      super(node)
-
-      @batch_namespace = batch_namespace
-      @policy = policy
-      @key_map = key_map
-      @bin_names = bin_names
-      @records = records
-      @read_attr = read_attr
-    end
-
-    def write_buffer
-      set_batch_get(@policy, @batch_namespace, @bin_names, @read_attr)
-    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_record_results(receive_size)
-      #Parse each message response and add it to the result array
-      @data_offset = 0
-
-      while @data_offset < receive_size
-        read_bytes(MSG_REMAINING_HEADER_SIZE)
-        result_code = @data_buffer.read(5).ord & 0xFF
-
-        # The only valid server return codes are "ok" and "not found".
-        # If other return codes are received, then abort the batch.
-        if result_code != 0 && result_code != Aerospike::ResultCode::KEY_NOT_FOUND_ERROR
-          raise Aerospike::Exceptions::Aerospike.new(result_code)
-        end
-
-        info3 = @data_buffer.read(3).ord
-
-        # If cmd is the end marker of the response, do not proceed further
-        return false if (info3 & INFO3_LAST) == INFO3_LAST
-
-        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
-            @records[index] = parse_record(item.key, op_count, generation, expiration)
-          end
-        else
-          Aerospike.logger.debug("Unexpected batch key returned: #{key.namespace}, #{key.digest}")
-        end
-
-      end # while
-
-      true
-    end
-
-  end # class
-
-end # module

data/lib/aerospike/command/batch_node.rb

@@ -1,82 +0,0 @@
-# encoding: utf-8
-# Copyright 2014-2017 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 'thread'
-
-require 'aerospike/record'
-
-require 'aerospike/command/command'
-
-module Aerospike
-
-  private
-
-  BatchNamespace = Struct.new :namespace, :keys
-
-  class BatchNode #:nodoc:
-
-    attr_accessor :node, :batch_namespaces, :key_capacity
-
-    def self.generate_list(cluster, keys)
-      nodes = cluster.nodes
-
-      if nodes.length == 0
-        raise Aerospike::Exceptions::Connection.new("command failed because cluster is empty.")
-      end
-
-      node_count = nodes.length
-      keys_per_node = (keys.length/node_count).to_i + 10
-
-      # Split keys by server node.
-      batch_nodes = []
-
-      keys.each do |key|
-        partition = Partition.new_by_key(key)
-
-        # error not required
-        node = cluster.get_node(partition)
-        batch_node = batch_nodes.detect{|bn| bn.node == node}
-
-        unless batch_node
-          batch_nodes << BatchNode.new(node, keys_per_node, key)
-        else
-          batch_node.add_key(key)
-        end
-      end
-
-      batch_nodes
-    end
-
-
-    def initialize(node, key_capacity, key)
-      @node = node
-      @key_capacity = key_capacity
-      @batch_namespaces = [BatchNamespace.new(key.namespace, [key])]
-    end
-
-    def add_key(key)
-      batch_namespace = @batch_namespaces.detect{|bn| bn.namespace == key.namespace }
-
-      unless batch_namespace
-        @batch_namespaces << BatchNamespace.new(key.namespace, [key])
-      else
-        batch_namespace.keys << key
-      end
-    end
-
-  end # class
-
-end # module