aerospike 2.1.1 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 291a0bd794307c4287931048cacb5588fa0cf963
-  data.tar.gz: d91a674c710b1cc49dde762261d65de3aa58e675
+  metadata.gz: 903b61fdf1d17d80049e051d70b90ce8159d0403
+  data.tar.gz: d87f7a61c12f457c94ebe2319adf06f3ce0fa8db
 SHA512:
-  metadata.gz: 825242c46dc27ee6fe674387c639e9968978d4509c2a27f82f8d3a49102674525a9ca293c488621f2df3bff8ec2cd2fea1074582761acb48b05c90f82c254d8c
-  data.tar.gz: 05636b87e30ed3087f2efd5f5af92399b8ee9bdba7b9360b03599e3d4b275283319642d5e9bea410fce7b9e77550c2b2659f452c8991d0ea24b4896f1e9a4420
+  metadata.gz: feaa5085e9fb331fc43f5b8c45b4f765f75c0b5ed02e056623ceacf57b7a9c4d39ea817e5c18b7b059c2564273ba106793adb632923719c2ffcb0f5825e36115
+  data.tar.gz: 72985529453d486919b11827d74ad4d6884a038e4390d740c90ef48246341727435bcb47e6d2563a3aa5ca4a11904c02c42a2fa1b6b068d2a309c10a1ae47193

data/CHANGELOG.md

@@ -1,3 +1,23 @@
+v2.2.0 / 2016-09-20
+===================
+
+* **New Features**
+  * Support for durable delete write policy [CLIENT-768]; requires Aerospike
+    Server Enterprise Edition v3.10 or later.
+  * Support Cluster Name verification [CLIENT-776]; requires Aerospike Server v3.10 or later.
+
+* **Bug Fixes**
+  * Fix error handling in node refresh during cluster tend.
+
+* **Improvements**
+  * Optionally return multiple results from read operations on same record bin.
+    [#39](https://github.com/aerospike/aerospike-client-ruby/issues/39) Thanks
+    to [@zingoba](https://github.com/zingoba).
+
+* **Documentation**
+  * Added note about potential issues with usage in Ruby on Rails with Phusion Passenger.
+  * Amend/clean up documentation of client policies.
+
 v2.1.1 / 2016-08-16
 ===================
 

data/README.md

@@ -13,7 +13,6 @@ This library is compatible with Ruby 2.0+ and supports Linux, Mac OS X and vario
 - [Usage](#Usage)
 - [Prerequisites](#Prerequisites)
 - [Installation](#Installation)
-- [Tweaking Performance](#Performance)
 - [Benchmarks](#Benchmarks)
 - [API Documentaion](#API-Documentation)
 - [Tests](#Tests)
@@ -75,11 +74,13 @@ Supported operating systems:
 - other BSDs (untested)
 
 <a name="Installation"></a>
-## Installation from Ruby gems:
+## Installation
+
+### Installation from Ruby gems
 
 1. gem install aerospike
 
-## Installation from source:
+### Installation from source
 
 1. Install Ruby 2.0+
 2. Install RubyGems
@@ -88,13 +89,6 @@ Supported operating systems:
 5. Build and Install the gem locally: ```rake build && rake install```
 6. Run the benchmark: ```./tools/benchmark/benchmark.rb -u```
 
-<a name="Performance"></a>
-## Performance Tweaking
-
-We are bending all efforts to improve the client's performance. In out reference benchmarks, Go client performs almost as good as the C client.
-
-To read about performance variables, please refer to [`docs/performance.md`](docs/performance.md)
-
 <a name="Tests"></a>
 ## Tests
 
@@ -104,7 +98,6 @@ To run all the test cases:
 
     $ bundle exec rspec
 
-
 <a name="Examples"></a>
 ## Examples
 

data/lib/aerospike/atomic/atomic.rb

@@ -40,6 +40,8 @@ module Aerospike
       ret
     end
     alias_method :value, :get
+    alias_method :to_s, :value
+    alias_method :inspect, :to_s
 
     def set(value)
       @mutex.synchronize do

data/lib/aerospike/client.rb

@@ -88,9 +88,7 @@ module Aerospike
     #  Returns list of active server node names in the cluster.
 
     def node_names
-      @cluster.nodes.map do |node|
-        node.get_name
-      end
+      @cluster.nodes.map(&:get_name)
     end
 
     def supports_feature?(feature)
@@ -252,11 +250,9 @@ module Aerospike
 
       key_map = BatchItem.generate_map(keys)
 
-      cmd_gen = Proc.new do |node, bns|
+      batch_execute(keys) do |node, bns|
         BatchCommandExists.new(node, bns, policy, key_map, exists_array)
       end
-
-      batch_execute(keys, &cmd_gen)
       exists_array
     end
 
@@ -304,11 +300,9 @@ module Aerospike
 
       key_map = BatchItem.generate_map(keys)
 
-      cmd_gen = Proc.new do |node, bns|
+      batch_execute(keys) do |node, bns|
         BatchCommandGet.new(node, bns, policy, key_map, bin_names.uniq, records, INFO1_READ)
       end
-
-      batch_execute(keys, &cmd_gen)
       records
     end
 
@@ -329,11 +323,10 @@ module Aerospike
 
       key_map = BatchItem.generate_map(keys)
 
-      cmd_gen = Proc.new do |node, bns|
+      batch_execute(keys) do |node, bns|
         BatchCommandGet.new(node, bns, policy, key_map, nil, records, INFO1_READ | INFO1_NOBINDATA)
       end
 
-      batch_execute(keys, &cmd_gen)
       records
     end
 
@@ -343,10 +336,8 @@ module Aerospike
 
     #  Perform multiple read/write operations on a single key in one batch call.
     #  An example would be to add an integer value to an existing record and then
-    #  read the result, all in one database call.
-    #
-    #  Write operations are always performed first, regardless of operation order
-    #  relative to read operations.
+    #  read the result, all in one database call. Operations are executed in
+    #  the order they are specified.
     def operate(key, operations, options={})
       policy = create_policy(options, WritePolicy)
 
@@ -410,7 +401,7 @@ module Aerospike
     #  This method is only supported by Aerospike 3 servers.
     def register_udf_from_file(client_path, server_path, language, options={})
       udf_body = File.read(client_path)
-      register_udf(udf_body, server_path, language, options={})
+      register_udf(udf_body, server_path, language, options)
     end
 
     #  Register package containing user defined functions with server.
@@ -510,22 +501,17 @@ module Aerospike
 
       record = command.record
 
-      return nil if !record || record.bins.length == 0
+      return nil if !record || record.bins.empty?
 
       result_map = record.bins
 
       # User defined functions don't have to return a value.
-      key, obj = result_map.detect{|k, v| k.include?('SUCCESS')}
-      if key
-        return obj
-      end
-
-      key, obj = result_map.detect{|k, v| k.include?('FAILURE')}
-      if key
-        raise Aerospike::Exceptions::Aerospike.new(UDF_BAD_RESPONSE, "#{obj}")
-      end
+      key, obj = result_map.detect{ |k, _| k.include?('SUCCESS') }
+      return obj if key
 
-      raise Aerospike::Exceptions::Aerospike.new(UDF_BAD_RESPONSE, "Invalid UDF return value")
+      key, obj = result_map.detect{ |k, _| k.include?('FAILURE') }
+      message = key ? obj.to_s : "Invalid UDF return value"
+      raise Aerospike::Exceptions::Aerospike.new(Aerospike::ResultCode::UDF_BAD_RESPONSE, message)
     end
 
     # execute_udf_on_query applies user defined function on records that match the statement filter.
@@ -540,7 +526,7 @@ module Aerospike
       policy = create_policy(options, QueryPolicy)
 
       nodes = @cluster.nodes
-      if nodes.length == 0
+      if nodes.empty?
         raise Aerospike::Exceptions::Aerospike.new(Aerospike::ResultCode::SERVER_NOT_AVAILABLE, "Executing UDF failed because cluster is empty.")
       end
 
@@ -644,7 +630,7 @@ module Aerospike
       new_policy = policy.clone
 
       nodes = @cluster.nodes
-      if nodes.length == 0
+      if nodes.empty?
         raise Aerospike::Exceptions::Aerospike.new(Aerospike::ResultCode::SERVER_NOT_AVAILABLE, "Scan failed because cluster is empty.")
       end
 
@@ -699,7 +685,7 @@ module Aerospike
       new_policy = policy.clone
       new_policy.max_retries = 0
 
-      node = @cluster.get_node_by_name(node) if !node.is_a?(Aerospike::Node)
+      node = @cluster.get_node_by_name(node) unless node.is_a?(Aerospike::Node)
 
       recordset = Recordset.new(policy.record_queue_size, 1, :scan)
 
@@ -735,7 +721,7 @@ module Aerospike
       new_policy = policy.clone
 
       nodes = @cluster.nodes
-      if nodes.length == 0
+      if nodes.empty?
         raise Aerospike::Exceptions::Aerospike.new(Aerospike::ResultCode::SERVER_NOT_AVAILABLE, "Scan failed because cluster is empty.")
       end
 
@@ -782,10 +768,8 @@ module Aerospike
 
     # Change user's password. Clear-text password will be hashed using bcrypt before sending to server.
     def change_password(user, password, options={})
+      raise Aerospike::Exceptions::Aerospike.new(INVALID_USER) unless @cluster.user && @cluster.user != ""
       policy = create_policy(options, AdminPolicy)
-      if @cluster.user == ''
-        return NewAerospikeError(INVALID_USER)
-      end
 
       hash = AdminCommand.hash_password(password)
       command = AdminCommand.new
@@ -832,7 +816,8 @@ module Aerospike
     private
 
     def send_info_command(policy, command)
-      @cluster.request_info(@default_policy, command)
+      policy ||= default_policy
+      @cluster.request_info(policy, command)
     end
 
     def hash_to_bins(hash)
@@ -912,7 +897,7 @@ module Aerospike
       command.execute
     end
 
-    def batch_execute(keys, &cmd_gen)
+    def batch_execute(keys)
       batch_nodes = BatchNode.generate_list(@cluster, keys)
       threads = []
 
@@ -923,15 +908,15 @@ module Aerospike
         bn.batch_namespaces.each do |bns|
           threads << Thread.new do
             Thread.current.abort_on_exception = true
-            command = cmd_gen.call(bn.node, bns)
+            command = yield bn.node, bns
             execute_command(command)
           end
         end
       end
 
-      threads.each { |thr| thr.join }
+      threads.each(&:join)
     end
 
   end # class
 
-end #module
+end # module

data/lib/aerospike/cluster/cluster.rb

@@ -35,6 +35,7 @@ module Aerospike
       @connection_queue_size = policy.connection_queue_size
       @connection_timeout = policy.timeout
       @tend_interval = policy.tend_interval
+      @cluster_name = policy.cluster_name
       @aliases = {}
       @cluster_nodes = []
       @partition_write_map = {}
@@ -44,7 +45,7 @@ module Aerospike
       @mutex = Mutex.new
       @cluster_config_change_listeners = Atomic.new([])
 
-      @old_node_cound = 0
+      @old_node_count = 0
 
       # setup auth info for cluster
       if policy.requires_authentication
@@ -208,6 +209,10 @@ module Aerospike
       end
     end
 
+    def inspect
+      "#<Aerospike::Cluster @cluster_nodes=#{@cluster_nodes}>"
+    end
+
     private
 
     def launch_tend_thread
@@ -254,7 +259,8 @@ module Aerospike
             refresh_count += 1
             friend_list.concat(friends) if friends
           rescue => e
-            Aerospike.logger.error("Node `#{node}` refresh failed: #{e.backtrace.join("\n")}")
+            Aerospike.logger.error("Node `#{node}` refresh failed: #{e}")
+            Aerospike.logger.error(e.backtrace.join("\n"))
           end
         end
       end
@@ -279,12 +285,10 @@ module Aerospike
 
         # only log the tend finish IF the number of nodes has been changed.
         # This prevents spamming the log on every tend interval
-        if @old_node_cound > nodes.length
-          Aerospike.logger.info("Tend finished. #{@old_node_cound - nodes.length} nodes have left the cluster. Old node count: #{@old_node_cound}, New node count #{nodes.length} #{nodes}")
-        else
-          Aerospike.logger.info("Tend finished. #{nodes.length - @old_node_cound} nodes have joined the cluster. Old node count: #{@old_node_cound}, New node count #{nodes.length} #{nodes}")
-        end
-        @old_node_cound = nodes.length
+        diff = nodes.length - @old_node_count
+        action = "#{diff.abs} #{diff.abs == 1 ? "node has" : "nodes have"} #{diff > 0 ? "joined" : "left"} the cluster."
+        Aerospike.logger.info("Tend finished. #{action} Old node count: #{@old_node_count}, New node count: #{nodes.length}")
+        @old_node_count = nodes.length
 
         notify_cluster_config_changed
       end
@@ -362,7 +366,7 @@ module Aerospike
 
       seed_array.each do |seed|
         begin
-          seed_node_validator = NodeValidator.new(self, seed, @connection_timeout)
+          seed_node_validator = NodeValidator.new(self, seed, @connection_timeout, @cluster_name)
         rescue => e
           Aerospike.logger.error("Seed #{seed.to_s} failed: #{e.backtrace.join("\n")}")
           next
@@ -376,7 +380,7 @@ module Aerospike
             nv = seed_node_validator
           else
             begin
-              nv = NodeValidator.new(self, aliass, @connection_timeout)
+              nv = NodeValidator.new(self, aliass, @connection_timeout, @cluster_name)
             rescue Exection => e
               Aerospike.logger.error("Seed #{seed.to_s} failed: #{e}")
               next

data/lib/aerospike/cluster/node.rb

@@ -22,7 +22,7 @@ module Aerospike
 
   class Node
 
-    attr_reader :reference_count, :responded, :name, :features
+    attr_reader :reference_count, :responded, :name, :features, :cluster_name
 
     PARTITIONS = 4096
     FULL_HEALTH = 100
@@ -35,17 +35,18 @@ module Aerospike
       @host = nv.host
       @use_new_info = Atomic.new(nv.use_new_info)
       @features = nv.features
+      @cluster_name = nv.cluster_name
 
       # Assign host to first IP alias because the server identifies nodes
       # by IP address (not hostname).
-      @host =                nv.aliases[0]
-      @health =              Atomic.new(FULL_HEALTH)
+      @host = nv.aliases[0]
+      @health = Atomic.new(FULL_HEALTH)
       @partition_generation = Atomic.new(-1)
-      @reference_count =      Atomic.new(0)
-      @responded =           Atomic.new(false)
-      @active =              Atomic.new(true)
+      @reference_count = Atomic.new(0)
+      @responded = Atomic.new(false)
+      @active = Atomic.new(true)
 
-      @connections =         Pool.new(@cluster.connection_queue_size)
+      @connections = Pool.new(@cluster.connection_queue_size)
       @connections.create_block = Proc.new do
         while conn = Connection.new(@host.name, @host.port, @cluster.connection_timeout)
 
@@ -75,9 +76,10 @@ module Aerospike
 
       begin
         conn = get_connection(1)
-        info_map = Info.request(conn, "node", "partition-generation", "services")
+        info_map = Info.request(conn, "node", "partition-generation", "services", "cluster-name")
       rescue => e
         Aerospike.logger.error("Error during refresh for node #{self}: #{e}")
+        Aerospike.logger.error(e.backtrace.join("\n"))
 
         conn.close if conn
         decrease_health
@@ -85,7 +87,7 @@ module Aerospike
         return friends
       end
 
-      verify_node_name(info_map)
+      verify_node_name_and_cluster_name(info_map)
       restore_health
 
       @responded.update{|v| true}
@@ -173,10 +175,6 @@ module Aerospike
       @features.include?(feature.to_s)
     end
 
-    def to_s
-      "#{@name}:#{@host}"
-    end
-
     def ==(other)
       other && other.is_a?(Node) && (@name == other.name)
     end
@@ -190,6 +188,10 @@ module Aerospike
       @name.hash
     end
 
+    def inspect
+      "#<Aerospike::Node: @name=#{@name}, @host=#{@host}>"
+    end
+
     private
 
     def close_connections
@@ -206,18 +208,23 @@ module Aerospike
       @aliases.value = aliases
     end
 
-    def verify_node_name(info_map)
+    def verify_node_name_and_cluster_name(info_map)
       info_name = info_map['node']
 
       if !info_name
         decrease_health
-        raise Aerospike::Exceptions.Aerospike.new("Node name is empty")
+        raise Aerospike::Exceptions::Aerospike.new(Aerospike::ResultCode::INVALID_NODE_ERROR, "Node name is empty")
       end
 
       if !(@name == info_name)
         # Set node to inactive immediately.
         @active.update{|v| false}
-        raise Aerospike::Exceptions.Aerospike.new("Node name has changed. Old=#{@name} New= #{info_name}")
+        raise Aerospike::Exceptions::Aerospike.new(Aerospike::ResultCode::INVALID_NODE_ERROR, "Node name has changed. Old=#{@name} New= #{info_name}")
+      end
+
+      if cluster_name && cluster_name != info_map['cluster-name']
+        @active.update{|v| false}
+        raise Aerospike::Exceptions::Aerospike.new(Aerospike::ResultCode::INVALID_NODE_ERROR, "Cluster name does not match. expected: #{cluster_name}, got: #{info_map['cluster-name']}")
       end
     end
 
@@ -239,7 +246,7 @@ module Aerospike
         if node
           node.reference_count.update{|v| v + 1}
         else
-          unless friends.any? {|host| host == aliass}
+          unless friends.any? {|h| h == aliass}
             friends << aliass
           end
         end

data/lib/aerospike/cluster/node_validator.rb

@@ -20,13 +20,14 @@ module Aerospike
 
   class NodeValidator # :nodoc:
 
-    attr_reader :host, :aliases, :name, :use_new_info, :features
+    attr_reader :host, :aliases, :name, :use_new_info, :features, :cluster_name
 
-    def initialize(cluster, host, timeout)
+    def initialize(cluster, host, timeout, cluster_name)
       @cluster = cluster
       @use_new_info = true
       @features = Set.new
       @host = host
+      @cluster_name = cluster_name
 
       set_aliases(host)
       set_address(timeout)

data/lib/aerospike/command/command.rb

@@ -48,8 +48,8 @@ module Aerospike
   INFO2_GENERATION = Integer(1 << 2)
   # Update if new generation >= old, good for restore.
   INFO2_GENERATION_GT = Integer(1 << 3)
-  # Create a duplicate on a generation collision.
-  INFO2_GENERATION_DUP = Integer(1 << 4)
+  # Transaction resulting in record deletion leaves tombstone (Enterprise only).
+  INFO2_DURABLE_DELETE = Integer(1 << 4)
   # Create only. Fail if record already exists.
   INFO2_CREATE_ONLY = Integer(1 << 5)
 
@@ -600,6 +600,7 @@ module Aerospike
 
       info_attr |= INFO3_COMMIT_MASTER if policy.commit_level == Aerospike::CommitLevel::COMMIT_MASTER
       read_attr |= INFO1_CONSISTENCY_ALL if policy.consistency_level == Aerospike::ConsistencyLevel::CONSISTENCY_ALL
+      write_attr |= INFO2_DURABLE_DELETE if policy.durable_delete
 
       # Write all header data except total size which must be written last.
       @data_buffer.write_byte(MSG_REMAINING_HEADER_SIZE, 8) # Message heade.length.

data/lib/aerospike/command/read_command.rb

@@ -17,6 +17,7 @@
 require 'aerospike/record'
 
 require 'aerospike/command/single_command'
+require 'aerospike/policy/operate_policy'
 require 'aerospike/utils/epoc'
 require 'aerospike/value/value'
 
@@ -26,7 +27,7 @@ module Aerospike
 
   class ReadCommand < SingleCommand #:nodoc:
 
-    attr_reader :record
+    attr_reader :record, :policy
 
     def initialize(cluster, policy, key, bin_names)
       super(cluster, key)
@@ -108,6 +109,7 @@ module Aerospike
     def parse_record(op_count, field_count, generation, expiration)
       bins = op_count > 0 ? {} : nil
       receive_offset = 0
+      single_bin_value = (!(OperatePolicy === policy) || policy.record_bin_multiplicity == RecordBinMultiplicity::SINGLE)
 
       # There can be fields in the response (setname etc).
       # But for now, ignore them. Expose them to the API if needed in the future.
@@ -129,12 +131,17 @@ module Aerospike
         name = @data_buffer.read(receive_offset+8, name_size).force_encoding('utf-8')
         receive_offset += 4 + 4 + name_size
 
-
         particle_bytes_size = op_size - (4 + name_size)
         value = Aerospike.bytes_to_particle(particle_type, @data_buffer, receive_offset, particle_bytes_size)
         receive_offset += particle_bytes_size
 
-        bins[name] = value
+        if single_bin_value || !bins.has_key?(name)
+          bins[name] = value
+        elsif (prev = bins[name]).kind_of?(OpResults)
+          prev << value
+        else
+          bins[name] = OpResults.new << prev << value
+        end
 
         i = i.succ
       end
@@ -144,4 +151,6 @@ module Aerospike
 
   end # class
 
+  class OpResults < Array; end
+
 end # module

data/lib/aerospike/host.rb

@@ -26,8 +26,9 @@ module Aerospike
     end
 
     def to_s
-      "#{@name}:#{@port.to_s}"
+      "#{@name}:#{@port}"
     end
+    alias_method :inspect, :to_s
 
     def ==(other)
       other && other.is_a?(Host) && other.name == @name && other.port == @port

data/lib/aerospike/policy/client_policy.rb

@@ -20,6 +20,7 @@ module Aerospike
 
     attr_accessor :user, :password
     attr_accessor :timeout, :connection_queue_size, :fail_if_not_connected, :tend_interval
+    attr_accessor :cluster_name
 
     def initialize(opt={})
       # Initial host connection timeout in seconds. The timeout when opening a connection
@@ -41,6 +42,9 @@ module Aerospike
 
       # password
       @password = opt[:password]
+
+      # Cluster Name
+      @cluster_name = opt[:cluster_name]
     end
 
     def requires_authentication

data/lib/aerospike/policy/operate_policy.rb

@@ -0,0 +1,35 @@
+# encoding: utf-8
+# Copyright 2016 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.
+
+require 'aerospike/policy/write_policy'
+require 'aerospike/policy/record_bin_multiplicity'
+
+module Aerospike
+
+  class OperatePolicy < WritePolicy
+
+    attr_accessor :record_bin_multiplicity
+
+    def initialize(opt = {})
+      super(opt)
+
+      # Specifies how to merge results from multiple operations returning
+      # results for the same record bin.
+      @record_bin_multiplicity = opt[:record_bin_multiplicity] || RecordBinMultiplicity::SINGLE
+    end
+
+  end
+
+end

data/lib/aerospike/policy/record_bin_multiplicity.rb

@@ -0,0 +1,28 @@
+# encoding: utf-8
+# Copyright 2016 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 RecordBinMultiplicity
+
+    # Returns only the result of the last operation on a given record bin.
+    SINGLE = 0
+
+    # Returns the results of all operations on a given record bin as a list.
+    ARRAY = 1
+
+  end
+
+end

data/lib/aerospike/policy/write_policy.rb

@@ -24,7 +24,8 @@ module Aerospike
   class WritePolicy < Policy
 
     attr_accessor :record_exists_action, :generation_policy,
-      :generation, :expiration, :send_key, :commit_level
+      :generation, :expiration, :send_key, :commit_level,
+      :durable_delete
 
     def initialize(opt={})
       super(opt)
@@ -59,6 +60,12 @@ module Aerospike
       # The default is to send the user defined key.
       @send_key = opt[:send_key].nil? ? true : opt[:send_key]
 
+      # If the transaction results in a record deletion, leave a tombstone for
+      # the record. This prevents deleted records from reappearing after node
+      # failures.
+      # Valid for Aerospike Server Enterprise Edition 3.10+ only.
+      @durable_delete = opt.fetch(:durable_delete, false)
+
       self
     end
 

data/lib/aerospike/result_code.rb

@@ -120,6 +120,9 @@ module Aerospike
     # Returned by Map put and put_items operations when policy is CREATE_ONLY but key already exists
     ELEMENT_EXISTS = 24
 
+    # Enterprise-only feature not supported by the community edition
+    ENTERPRISE_ONLY = 25
+
     # There are no more records left for query.
     QUERY_END = 50
 
@@ -302,6 +305,9 @@ module Aerospike
       when ELEMENT_EXISTS
         "Element already exists"
 
+      when ENTERPRISE_ONLY
+        "Enterprise-only feature not supported by community edition"
+
       when QUERY_END
         "Query end"
 

data/lib/aerospike/utils/pool.rb

@@ -14,9 +14,6 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-require 'thread'
-require 'timeout'
-
 module Aerospike
 
   private
@@ -43,13 +40,10 @@ module Aerospike
     alias_method :<<, :offer
 
     def poll(create_new=true)
-      res = nil
-      begin
-        res = @pool.pop(true) # non_blocking
-        return res
-      rescue
-        return @create_block.call if @create_block && create_new
-      end
+      non_block = true
+      @pool.pop(non_block)
+    rescue
+      @create_block.call() if @create_block && create_new
     end
 
     def empty?
@@ -59,6 +53,11 @@ module Aerospike
     def length
       @pool.length
     end
+    alias_method :size, :length
+
+    def inspect
+      "#<Aerospike::Pool: size=#{size}>"
+    end
 
   end
 

data/lib/aerospike/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aerospike
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.0
 platform: ruby
 authors:
 - Khosrow Afroozeh
@@ -9,14 +9,9 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-16 00:00:00.000000000 Z
+date: 2016-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
   name: msgpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -25,12 +20,12 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '1.0'
+- !ruby/object:Gem::Dependency
   name: bcrypt
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -39,6 +34,11 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
 description: Official Aerospike Client for ruby. Access your Aerospike cluster with
   ease of Ruby.
 email:
@@ -106,9 +106,11 @@ files:
 - lib/aerospike/policy/commit_level.rb
 - lib/aerospike/policy/consistency_level.rb
 - lib/aerospike/policy/generation_policy.rb
+- lib/aerospike/policy/operate_policy.rb
 - lib/aerospike/policy/policy.rb
 - lib/aerospike/policy/priority.rb
 - lib/aerospike/policy/query_policy.rb
+- lib/aerospike/policy/record_bin_multiplicity.rb
 - lib/aerospike/policy/record_exists_action.rb
 - lib/aerospike/policy/scan_policy.rb
 - lib/aerospike/policy/write_policy.rb
@@ -157,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: An Aerospike driver for Ruby.