aerospike 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb0b09f9246802aab13bc29789ab3745101d110b
-  data.tar.gz: 374cce797743de7a035133e8b2407ade713bd6d5
+  metadata.gz: 291a0bd794307c4287931048cacb5588fa0cf963
+  data.tar.gz: d91a674c710b1cc49dde762261d65de3aa58e675
 SHA512:
-  metadata.gz: 8a14eef40cd28d4d510c9e283e835c33529442981626e335b9c040027cdfbc97ad11d9186afdeffd3f2d4098e4a2ce33a9462672c47c7112a88919dfc95afa1a
-  data.tar.gz: 703bf2bdf23479a7a8a101e38aa4fc613148ab01c5c5901006e1bf4b2a1873f888a41352f0893152df2fa61e19d930ac6202cfc515dea6eb07cca0d6a0ea9ef5
+  metadata.gz: 825242c46dc27ee6fe674387c639e9968978d4509c2a27f82f8d3a49102674525a9ca293c488621f2df3bff8ec2cd2fea1074582761acb48b05c90f82c254d8c
+  data.tar.gz: 05636b87e30ed3087f2efd5f5af92399b8ee9bdba7b9360b03599e3d4b275283319642d5e9bea410fce7b9e77550c2b2659f452c8991d0ea24b4896f1e9a4420

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+v2.1.1 / 2016-08-16
+===================
+
+* **Bug Fixes**
+  * Fix incorrect expiration times on records fetched via batch_get or query operations. [#38](https://github.com/aerospike/aerospike-client-ruby/issues/38)
+
+* **Improvements**
+  * Add support for two new server error codes (23 & 24) introduced in Aerospike Server v3.9.1.
+  * Records returned by batch_get operation should include the full key incl. the user key part.
+
 v2.1.0 / 2016-07-19
 ===================
 
@@ -7,7 +17,7 @@ v2.1.0 / 2016-07-19
 
 * **Improvements**
   * Support for queries on Lists and Maps (keys & values)
-  * Support for creating indexes on Lists and Maps
+  * Support for creating indexes on Lists and Maps [CLIENT-685]
   * Support GeoJSON values in Lists and Maps
 
 v2.0.0 / 2016-05-27

data/lib/aerospike/command/batch_command_get.rb

@@ -58,17 +58,17 @@ module Aerospike
         # 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).ord
-        expiration = @data_buffer.read_int32(10).ord
-        field_count = @data_buffer.read_int16(18).ord
-        op_count = @data_buffer.read_int16(20).ord
+        generation = @data_buffer.read_int32(6)
+        expiration = Aerospike.TTL(@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(key, op_count, generation, expiration)
+            @records[index] = parse_record(item.key, op_count, generation, expiration)
           end
         else
           Aerospike.logger.debug("Unexpected batch key returned: #{key.namespace}, #{key.digest}")

data/lib/aerospike/command/batch_item.rb

@@ -31,7 +31,7 @@ module Aerospike
       keys.each_with_index do |key, i|
         item = key_map[key.digest]
         unless item
-          item = BatchItem.new(i)
+          item = BatchItem.new(key, i)
           key_map[key.digest] = item
         else
           item.add_duplicate(i)
@@ -42,7 +42,8 @@ module Aerospike
     end
 
 
-    def initialize(index)
+    def initialize(key, index)
+      @key = key
       @index = index
     end
 
@@ -64,6 +65,10 @@ module Aerospike
       return r
     end
 
+    def key
+      @key
+    end
+
   end # class
 
 end # module

data/lib/aerospike/query/stream_command.rb

@@ -53,7 +53,7 @@ module Aerospike
         return false if (info3 & INFO3_LAST) == INFO3_LAST
 
         generation = @data_buffer.read_int32(6)
-        expiration = @data_buffer.read_int32(10)
+        expiration = Aerospike.TTL(@data_buffer.read_int32(10))
         field_count = @data_buffer.read_int16(18)
         op_count = @data_buffer.read_int16(20)
         key = parse_key(field_count)

data/lib/aerospike/result_code.rb

@@ -114,6 +114,12 @@ module Aerospike
     # Operation not allowed at this time.
     FAIL_FORBIDDEN = 22
 
+    # Returned by Map put and put_items operations when policy is REPLACE but key was not found
+    ELEMENT_NOT_FOUND = 23
+
+    # Returned by Map put and put_items operations when policy is CREATE_ONLY but key already exists
+    ELEMENT_EXISTS = 24
+
     # There are no more records left for query.
     QUERY_END = 50
 
@@ -129,11 +135,9 @@ module Aerospike
 
     ILLEGAL_STATE = 56
 
-
     # User name is invalid.
     INVALID_USER = 60
 
-
     # User was previously created.
     USER_ALREADY_EXISTS = 61
 
@@ -292,6 +296,12 @@ module Aerospike
       when FAIL_FORBIDDEN
         "Operation not allowed at this time"
 
+      when ELEMENT_NOT_FOUND
+        "Element not found"
+
+      when ELEMENT_EXISTS
+        "Element already exists"
+
       when QUERY_END
         "Query end"
 

data/lib/aerospike/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aerospike
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Khosrow Afroozeh
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-19 00:00:00.000000000 Z
+date: 2016-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement