aerospike 2.7.0 → 2.8.0

data/lib/aerospike/cdt/map_policy.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-# Copyright 2016-2017 Aerospike, Inc.
+# Copyright 2016-2018 Aerospike, Inc.
 #
 # Portions may be licensed to Aerospike, Inc. under one or more contributor
 # license agreements.
@@ -16,22 +16,22 @@
 
 module Aerospike
   module CDT
-
     class MapPolicy
 
-      attr_accessor :order, :write_mode
+      attr_accessor :order, :write_mode, :flags
+
+      def initialize(order: nil, write_mode: nil, flags: nil)
+        if write_mode && flags
+          raise ArgumentError, "Use write mode for server versions < 4.3; use write flags for server versions >= 4.3."
+        end
 
-      def initialize(order: nil, write_mode: nil)
         @order = order || MapOrder::DEFAULT
         @write_mode = write_mode || MapWriteMode::DEFAULT
+        @flags = flags || MapWriteFlags::DEFAULT
       end
 
       DEFAULT = MapPolicy.new
 
-      def value
-        order.to_int
-      end
     end
-
   end
 end

data/lib/aerospike/cdt/map_write_flags.rb

@@ -0,0 +1,51 @@
+# encoding: utf-8
+# 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
+  module CDT
+
+    ##
+    # Map write bit flags.
+    # Requires server versions >= 4.3.
+    module MapWriteFlags
+
+      ##
+      # Default. Allow create or update.
+      DEFAULT = 0
+
+      ##
+      # If the key already exists, the item will be denied.
+      # If the key does not exist, a new item will be created.
+      CREATE_ONLY = 1
+
+      ##
+      # If the key already exists, the item will be overwritten.
+      # If the key does not exist, the item will be denied.
+      UPDATE_ONLY = 2
+
+      ##
+      # Do not raise error, if a map item is denied due to write flag
+      # constraints.
+      NO_FAIL = 4
+
+      ##
+      # Allow other valid map items to be committed, if a map item is denied
+      # due to write flag constraints.
+      PARTIAL = 8
+
+    end
+  end
+end

data/lib/aerospike/cdt/map_write_mode.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-# Copyright 2016-2017 Aerospike, Inc.
+# Copyright 2016-2018 Aerospike, Inc.
 #
 # Portions may be licensed to Aerospike, Inc. under one or more contributor
 # license agreements.
@@ -16,6 +16,12 @@
 
 module Aerospike
   module CDT
+
+    ##
+    # Unique key map write type.
+    #
+    # This enum should only be used for server versions < 4.3.
+    # MapWriteFlags are recommended for server versions >= 4.3.
     module MapWriteMode
 
       ##

data/lib/aerospike/cluster.rb

@@ -430,6 +430,10 @@ module Aerospike
       ::Aerospike::Node.new(self, nv)
     end
 
+    def create_connection(host)
+      ::Aerospike::Cluster::CreateConnection.(self, host)
+    end
+
     def find_nodes_to_remove(refresh_count)
       FindNodesToRemove.(self, refresh_count)
     end

data/lib/aerospike/key.rb

@@ -24,7 +24,7 @@ module Aerospike
   class Key
 
     @@digest_pool = Pool.new
-    @@digest_pool.create_block = Proc.new do
+    @@digest_pool.create_proc = Proc.new do
       if RUBY_PLATFORM == 'java'
         OpenSSL::Digest::RIPEMD160.new
       else

data/lib/aerospike/node.rb

@@ -52,19 +52,7 @@ module Aerospike
       @active = Atomic.new(true)
       @failures = Atomic.new(0)
 
-      @connections = Pool.new(@cluster.connection_queue_size)
-
-      # TODO: put in separate methods
-      @connections.create_block = Proc.new do
-        conn = nil
-        loop do
-          conn = Cluster::CreateConnection.(cluster, host)
-          break if conn.connected?
-        end
-        conn
-      end
-
-      @connections.cleanup_block = Proc.new { |conn| conn.close if conn }
+      @connections = ::Aerospike::ConnectionPool.new(cluster, host)
     end
 
     # Get a connection to the node. If no cached connection is not available,

data/lib/aerospike/socket/base.rb

@@ -35,16 +35,8 @@ module Aerospike
       end
 
       def read_from_socket(length)
-        begin
+        with_timeout(@timeout) do
           read_nonblock(length)
-        rescue ::IO::WaitReadable => e
-          if ::IO::select([self], nil, nil, @timeout)
-            retry
-          else
-            raise ::Aerospike::Exceptions::Connection.new("#{e}")
-          end
-        rescue => e
-          raise ::Aerospike::Exceptions::Connection.new("#{e}")
         end
       end
 
@@ -56,16 +48,8 @@ module Aerospike
       end
 
       def write_to_socket(data)
-        begin
+        with_timeout(@timeout) do
           write_nonblock(data)
-        rescue ::IO::WaitWritable => e
-          if ::IO::select(nil, [self], nil, @timeout)
-            retry
-          else
-            raise ::Aerospike::Exceptions::Connection.new("#{e}")
-          end
-        rescue => e
-          raise ::Aerospike::Exceptions::Connection.new("#{e}")
         end
       end
 
@@ -77,10 +61,53 @@ module Aerospike
         !closed?
       end
 
+      # Returns whether the connection to the server is alive.
+      #
+      # It is useful to call this method before making a call to the server
+      # that would change data on the server.
+      #
+      # Note: This method is only useful if the server closed the connection or
+      # if a previous connection failure occurred. If the server is hard killed
+      # this will still return true until one or more writes are attempted.
+      def alive?
+        return false if closed?
+
+        if IO.select([self], nil, nil, 0)
+          !eof? rescue false
+        else
+          true
+        end
+      rescue IOError
+        false
+      end
+
       def close
         return if closed?
         super()
       end
+
+      private
+
+      # Note: For SSL connections, read_nonblock may invoke write system call,
+      # which may raise IO::WaitWritable, and vice versa, due to SSL
+      # renegotiation, so we should always rescue both.
+      def with_timeout(timeout, &block)
+        block.call
+      rescue IO::WaitReadable => e
+        if IO::select([self], nil, nil, timeout)
+          retry
+        else
+          fail Aerospike::Exceptions::Connection, "Socket timeout: #{e}"
+        end
+      rescue IO::WaitWritable => e
+        if IO::select(nil, [self], nil, timeout)
+          retry
+        else
+          fail Aerospike::Exceptions::Connection, "Socket timeout: #{e}"
+        end
+      rescue => e
+        raise Aerospike::Exceptions::Connection, "Socket error: #{e}"
+      end
     end
   end
 end

data/lib/aerospike/socket/ssl.rb

@@ -17,6 +17,8 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
+require 'openssl'
+
 module Aerospike
   module Socket
     class SSL < ::OpenSSL::SSL::SSLSocket

data/lib/aerospike/utils/buffer.rb

@@ -27,7 +27,7 @@ module Aerospike
   class Buffer #:nodoc:
 
     @@buf_pool = Pool.new
-    @@buf_pool.create_block = Proc.new { Buffer.new }
+    @@buf_pool.create_proc = Proc.new { Buffer.new }
 
     attr_accessor :buf
 

data/lib/aerospike/utils/connection_pool.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+# Copyright 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.
+
+module Aerospike
+  class ConnectionPool < Pool
+
+    attr_accessor :cluster, :host
+
+    def initialize(cluster, host)
+      self.cluster = cluster
+      self.host = host
+      super(cluster.connection_queue_size)
+    end
+
+    def create
+      conn = nil
+      loop do
+        conn = cluster.create_connection(host)
+        break if conn.connected?
+      end
+      conn
+    end
+
+    def check(conn)
+      conn.alive?
+    end
+
+    def cleanup(conn)
+      conn.close if conn
+    end
+  end
+end

data/lib/aerospike/utils/packer.rb

@@ -24,7 +24,7 @@ module Aerospike
   class Packer < MessagePack::Packer #:nodoc:
 
     @@pool = Pool.new
-    @@pool.create_block = Proc.new { Packer.new }
+    @@pool.create_proc = Proc.new { Packer.new }
 
     def self.use
       packer = @@pool.poll

data/lib/aerospike/utils/pool.rb

@@ -1,5 +1,5 @@
-# encoding: utf-8
-# Copyright 2014-2017 Aerospike, Inc.
+# frozen_string_literal: true
+# Copyright 2014-2018 Aerospike, Inc.
 #
 # Portions may be licensed to Aerospike, Inc. under one or more contributor
 # license agreements.
@@ -16,15 +16,14 @@
 
 module Aerospike
 
-  private
-
   class Pool #:nodoc:
 
-    attr_accessor :create_block, :cleanup_block
+    attr_accessor :create_proc, :cleanup_proc, :check_proc
 
     def initialize(max_size = 256, &block)
-      @create_block = block
-      @cleanup_block = nil
+      @create_proc = block
+      @cleanup_proc = nil
+      @check_proc = nil
 
       @pool = Queue.new
       @max_size = max_size
@@ -33,17 +32,24 @@ module Aerospike
     def offer(obj)
       if @pool.length < @max_size
         @pool << obj
-      elsif @cleanup_block
-        @cleanup_block.call(obj)
+      else
+        cleanup(obj)
       end
     end
     alias_method :<<, :offer
 
     def poll(create_new=true)
       non_block = true
-      @pool.pop(non_block)
-    rescue
-      @create_block.call() if @create_block && create_new
+      begin
+        obj = @pool.pop(non_block)
+        if !check(obj)
+          cleanup(obj)
+          obj = nil
+        end
+      end until obj
+      obj
+    rescue ThreadError
+      create if create_new
     end
 
     def empty?
@@ -59,6 +65,23 @@ module Aerospike
       "#<Aerospike::Pool: size=#{size}>"
     end
 
+    protected
+
+    def create
+      return unless create_proc
+      create_proc.()
+    end
+
+    def check(obj)
+      return true unless check_proc
+      check_proc.(obj)
+    end
+
+    def cleanup(obj)
+      return unless cleanup_proc
+      cleanup_proc.(obj)
+    end
+
   end
 
 end

data/lib/aerospike/utils/unpacker.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-# Copyright 2016-2017 Aerospike, Inc.
+# Copyright 2016-2018 Aerospike, Inc.
 #
 # Portions may be licensed to Aerospike, Inc. under one or more contributor
 # license agreements.
@@ -24,7 +24,7 @@ module Aerospike
   class Unpacker
 
     @@pool = Pool.new
-    @@pool.create_block = Proc.new { Unpacker.new }
+    @@pool.create_proc = Proc.new { Unpacker.new }
 
     def self.use
       unpacker = @@pool.poll
@@ -36,9 +36,9 @@ module Aerospike
 
     MsgPackExt = Struct.new(:type, :data)
     MsgPackExt::TYPES = [
-             # Map Create Flags:
-      0x00,  # UNORDERED
-      0x01,  # K_ORDERED
+             # Map Create Flags:         List Create Flags:
+      0x00,  # UNORDERED                 UNORDERED
+      0x01,  # K_ORDERED                 ORDERED
       0x03,  # KV_ORDERED
       0x08,  # PRESERVE_ORDER
     ]
@@ -66,12 +66,16 @@ module Aerospike
     private
 
     def unpack_list(array)
-      normalize_strings_in_array(array)
+      list = normalize_strings_in_array(array)
+      unless list.empty?
+        list.shift if MsgPackExt === list.first
+      end
+      list
     end
 
     def unpack_map(hash)
       hash = normalize_strings_in_map(hash)
-      if hash.any?
+      unless hash.empty?
         (key, _) = hash.first
         hash.shift if MsgPackExt === key
       end