aerospike 2.18.0 → 2.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35e9a8a3ec876281db49c949373f2e1f34fb38ed86f4cf62074990ef66637e22
-  data.tar.gz: 9fcd59bb4c7137be98624f6de64beff53ec0d526309ea7403e7e2596057c216b
+  metadata.gz: 85cdd4e1a2cbb3572cf4c84715a6a43e768e5b8b4b3adc583d45dd41280b9c31
+  data.tar.gz: faa4ae8908d9fca3798b59053a0753bf9df740ff006d6bdccaf39b45fd4b11d7
 SHA512:
-  metadata.gz: da0e22181c8410de556a7f5baf7d14a53ad0ddacc95e3a24e7442ab15196b70bfd4c79259ea9502ec18dc9cb1978d68c1b5bc5192dbba4821d267d8497c0e8ba
-  data.tar.gz: 02b0fe95378602aed2d7cb232f61453d87cac2824c4b832cd40187925376f37afef6df3a7b1c1261f426e898f8f4d82136f3da42edf454834a0c91f913318e5d
+  metadata.gz: 1137414c6f8d465650d88d3169710f4c860ce1938acc24998cbdcd33abed486b238f4ce8a3aee92158a610df99db756311d5aba6617bc464db81268e41529cf6
+  data.tar.gz: 7f9e276d0d4aab9843312cb3054305a82b4b59691473e869ad1fcefb1eaacb6ee19c46c2bdacd0cc081650b474a426a0dea845c1e678e23967b66ab34294a5ff

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 All notable changes to this project will be documented in this file.
 
+## [2.19.0] - 2020-02-09
+
+* **Improvements**
+  * Remove Timeout in `wait_till_stabilized` in favor of `thread.join(timeout)` . Thanks to [Marcelo](https://github.com/MarcPer) [[#104](https://github.com/aerospike/aerospike-client-ruby/pull/104)]
+  * Adds `ResultCode::LOST_CONFLICT`
+
 ## [2.18.0] - 2020-12-01
 
 * **Bug Fixes**
@@ -63,7 +69,7 @@ All notable changes to this project will be documented in this file.
 
 * **Improvements**
   * Optimize serialization for nested structures. Thanks to [@Kacper Madej](https://github.com/madejejej)! [[#94](https://github.com/aerospike/aerospike-client-ruby/pull/94)]
-  * Remove `Thread#abort_on_exception` from `batch_index_command`. Thanks to [@Kacper Madej](https://github.com/madejejej)! [[#94](https://github.com/aerospike/aerospike-client-ruby/pull/92)]
+  * Remove `Thread#abort_on_exception` from `batch_index_command`. Thanks to [@Kacper Madej](https://github.com/madejejej)! [[#92](https://github.com/aerospike/aerospike-client-ruby/pull/92)]
   * Does not allow values other than Integer, Float, String, Symbol and nil to be used as keys in Maps.
 
 * **Bug Fixes**

data/lib/aerospike/cluster.rb

@@ -18,7 +18,6 @@
 # the License.
 
 require 'set'
-require 'timeout'
 
 require 'aerospike/atomic/atomic'
 
@@ -428,6 +427,7 @@ module Aerospike
 
     def wait_till_stablized
       count = -1
+      done = false
 
       # will run until the cluster is stablized
       thr = Thread.new do
@@ -438,20 +438,20 @@ module Aerospike
           # If not, assume cluster has stabilized and return.
           break if count == nodes.length
 
-          sleep(0.001) # sleep for a miliseconds
+          # Break if timed out
+          break if done
+
+          sleep(0.001) # sleep for a milisecond
 
           count = nodes.length
         end
       end
 
       # wait for the thread to finish or timeout
-      begin
-        Timeout.timeout(@connection_timeout) do
-          thr.join
-        end
-      rescue Timeout::Error
-        thr.kill if thr.alive?
-      end
+      thr.join(@connection_timeout)
+      done = true
+      sleep(0.001)
+      thr.kill if thr.alive?
 
       @closed.value = false if @cluster_nodes.length > 0
     end

data/lib/aerospike/result_code.rb

@@ -129,6 +129,9 @@ module Aerospike
     # The transaction was not performed because the predexp was false.
     FILTERED_OUT = 27
 
+    # Write command loses conflict to XDR.
+    LOST_CONFLICT = 28
+
     # There are no more records left for query.
     QUERY_END = 50
 
@@ -364,6 +367,9 @@ module Aerospike
       when FILTERED_OUT
         "The transaction was not performed because the predexp was false."
 
+      when LOST_CONFLICT
+        "Write command loses conflict to XDR."
+
       when QUERY_END
         "Query end"
 

data/lib/aerospike/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aerospike
 version: !ruby/object:Gem::Version
-  version: 2.18.0
+  version: 2.19.0
 platform: ruby
 authors:
 - Khosrow Afroozeh
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-01 00:00:00.000000000 Z
+date: 2021-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack