aerospike 2.18.0 → 2.19.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 35e9a8a3ec876281db49c949373f2e1f34fb38ed86f4cf62074990ef66637e22
4
- data.tar.gz: 9fcd59bb4c7137be98624f6de64beff53ec0d526309ea7403e7e2596057c216b
3
+ metadata.gz: 85cdd4e1a2cbb3572cf4c84715a6a43e768e5b8b4b3adc583d45dd41280b9c31
4
+ data.tar.gz: faa4ae8908d9fca3798b59053a0753bf9df740ff006d6bdccaf39b45fd4b11d7
5
5
  SHA512:
6
- metadata.gz: da0e22181c8410de556a7f5baf7d14a53ad0ddacc95e3a24e7442ab15196b70bfd4c79259ea9502ec18dc9cb1978d68c1b5bc5192dbba4821d267d8497c0e8ba
7
- data.tar.gz: 02b0fe95378602aed2d7cb232f61453d87cac2824c4b832cd40187925376f37afef6df3a7b1c1261f426e898f8f4d82136f3da42edf454834a0c91f913318e5d
6
+ metadata.gz: 1137414c6f8d465650d88d3169710f4c860ce1938acc24998cbdcd33abed486b238f4ce8a3aee92158a610df99db756311d5aba6617bc464db81268e41529cf6
7
+ data.tar.gz: 7f9e276d0d4aab9843312cb3054305a82b4b59691473e869ad1fcefb1eaacb6ee19c46c2bdacd0cc081650b474a426a0dea845c1e678e23967b66ab34294a5ff
data/CHANGELOG.md CHANGED
@@ -2,6 +2,12 @@
2
2
 
3
3
  All notable changes to this project will be documented in this file.
4
4
 
5
+ ## [2.19.0] - 2020-02-09
6
+
7
+ * **Improvements**
8
+ * 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)]
9
+ * Adds `ResultCode::LOST_CONFLICT`
10
+
5
11
  ## [2.18.0] - 2020-12-01
6
12
 
7
13
  * **Bug Fixes**
@@ -63,7 +69,7 @@ All notable changes to this project will be documented in this file.
63
69
 
64
70
  * **Improvements**
65
71
  * Optimize serialization for nested structures. Thanks to [@Kacper Madej](https://github.com/madejejej)! [[#94](https://github.com/aerospike/aerospike-client-ruby/pull/94)]
66
- * 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)]
72
+ * 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)]
67
73
  * Does not allow values other than Integer, Float, String, Symbol and nil to be used as keys in Maps.
68
74
 
69
75
  * **Bug Fixes**
@@ -18,7 +18,6 @@
18
18
  # the License.
19
19
 
20
20
  require 'set'
21
- require 'timeout'
22
21
 
23
22
  require 'aerospike/atomic/atomic'
24
23
 
@@ -428,6 +427,7 @@ module Aerospike
428
427
 
429
428
  def wait_till_stablized
430
429
  count = -1
430
+ done = false
431
431
 
432
432
  # will run until the cluster is stablized
433
433
  thr = Thread.new do
@@ -438,20 +438,20 @@ module Aerospike
438
438
  # If not, assume cluster has stabilized and return.
439
439
  break if count == nodes.length
440
440
 
441
- sleep(0.001) # sleep for a miliseconds
441
+ # Break if timed out
442
+ break if done
443
+
444
+ sleep(0.001) # sleep for a milisecond
442
445
 
443
446
  count = nodes.length
444
447
  end
445
448
  end
446
449
 
447
450
  # wait for the thread to finish or timeout
448
- begin
449
- Timeout.timeout(@connection_timeout) do
450
- thr.join
451
- end
452
- rescue Timeout::Error
453
- thr.kill if thr.alive?
454
- end
451
+ thr.join(@connection_timeout)
452
+ done = true
453
+ sleep(0.001)
454
+ thr.kill if thr.alive?
455
455
 
456
456
  @closed.value = false if @cluster_nodes.length > 0
457
457
  end
@@ -129,6 +129,9 @@ module Aerospike
129
129
  # The transaction was not performed because the predexp was false.
130
130
  FILTERED_OUT = 27
131
131
 
132
+ # Write command loses conflict to XDR.
133
+ LOST_CONFLICT = 28
134
+
132
135
  # There are no more records left for query.
133
136
  QUERY_END = 50
134
137
 
@@ -364,6 +367,9 @@ module Aerospike
364
367
  when FILTERED_OUT
365
368
  "The transaction was not performed because the predexp was false."
366
369
 
370
+ when LOST_CONFLICT
371
+ "Write command loses conflict to XDR."
372
+
367
373
  when QUERY_END
368
374
  "Query end"
369
375
 
@@ -1,4 +1,4 @@
1
1
  # encoding: utf-8
2
2
  module Aerospike
3
- VERSION = "2.18.0"
3
+ VERSION = "2.19.0"
4
4
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: aerospike
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.18.0
4
+ version: 2.19.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Khosrow Afroozeh
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2020-12-01 00:00:00.000000000 Z
12
+ date: 2021-02-09 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: msgpack