aerospike 2.5.0 → 2.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d49c7d62bc7171c98eac791bf1ff48bc19eed19e
-  data.tar.gz: 10b103d7857eff070e3a4dbf23d03df2a4f73009
+SHA256:
+  metadata.gz: ccefb4dd82c2d6d15f9f0eac08d32acceacf2da1d93c8ca3a462f4c7e4e10e95
+  data.tar.gz: f133ccde7da4ea553d933a30c367ecf2a354c2e85ecce0b141c2071f94702237
 SHA512:
-  metadata.gz: 45ecde047634d1a23464184a27abaa701f742c9a6b4a29797e66d351fd1b080e3d205c797865e85dd9f70c1c239412de5214b4adfbdacaa6f5ac17048ee25a78
-  data.tar.gz: a19481a42cba1e64845a7bc98812c9ef73ff22d835a76fa3b0e815904de0574a080ae9dbcf09adbd57ca78606ac6e1743d3f56498a702e788b244f2cc6134932
+  metadata.gz: e9baa1554bad7b3f3f8625940ee2e62f08b7185a662401757b8b172d7b9734427245fd8a18fc2aaeb7e4a90c15f3fa3f2346bfc53cce41efe03c15794b63a01c
+  data.tar.gz: 52be62b23c582cdcc7fd12c5961c7ed82847a57b90bf8aea88a56580c7e05c1c416a0a51f7b8e170afde63763560a6acfa4200b95917ee5bc6542ae028954aec

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+v2.5.1 / 2018-01-25
+===================
+
+* **Bug Fixes**
+  * Some secondary index queries fail with parameter error on Aerospike Server v3.15.1.x [#57](https://github.com/aerospike/aerospike-client-ruby/issues/57)
+
+* **Updates**
+  * Added Ruby 2.5 to test matrix
+  * Updated documentation for Client#truncate command [CLIENT-985]
+
 v2.5.0 / 2017-10-10
 ===================
 

data/README.md

@@ -7,7 +7,7 @@
 
 An Aerospike library for Ruby.
 
-This library is compatible with Ruby 2.2+ and supports Linux, Mac OS X and various other BSDs. Rubinius is supported, but not JRuby.
+This library is compatible with Ruby 2.2+ and supports Linux, Mac OS X and various other BSDs.
 
 - [Usage](#Usage)
 - [Prerequisites](#Prerequisites)

data/lib/aerospike/client.rb

@@ -208,7 +208,9 @@ module Aerospike
     # Removes records in the specified namespace/set efficiently.
     #
     # This method is orders of magnitude faster than deleting records one at a
-    # time. Works with Aerospike Server versions >= 3.12.
+    # time. It requires Aerospike Server version 3.12 or later. See
+    # https://www.aerospike.com/docs/reference/info#truncate for further
+    # information.
     #
     # This asynchronous server call may return before the truncate is complete.
     # The user can still write new records after the server call returns

data/lib/aerospike/query/query_command.rb

@@ -53,7 +53,7 @@ module Aerospike
         fieldCount+=1
       end
 
-      if @statement.filters && @statement.filters.length > 0
+      if !is_scan?
         col_type = @statement.filters[0].collection_type
         if col_type > 0
           @data_offset += FIELD_HEADER_SIZE + 1
@@ -69,6 +69,17 @@ module Aerospike
         end
         @data_offset += filterSize
         fieldCount+=1
+
+        if @statement.bin_names && @statement.bin_names.length > 0
+          @data_offset += FIELD_HEADER_SIZE
+          binNameSize+=1 # num bin names
+
+          @statement.bin_names.each do |bin_name|
+            binNameSize += bin_name.bytesize + 1
+          end
+          @data_offset += binNameSize
+          fieldCount+=1
+        end
       else
         # Calling query with no filters is more efficiently handled by a primary index scan.
         # Estimate scan options size.
@@ -76,17 +87,6 @@ module Aerospike
         fieldCount+=1
       end
 
-      if @statement.bin_names && @statement.bin_names.length > 0
-        @data_offset += FIELD_HEADER_SIZE
-        binNameSize+=1 # num bin names
-
-        @statement.bin_names.each do |bin_name|
-          binNameSize += bin_name.bytesize + 1 #OPERATION_HEADER_SIZE
-        end
-        @data_offset += binNameSize
-        fieldCount+=1
-      end
-
       @statement.set_task_id
 
       @data_offset += 8 + FIELD_HEADER_SIZE
@@ -117,7 +117,7 @@ module Aerospike
       size_buffer
 
       readAttr = @policy.include_bin_data ? INFO1_READ : INFO1_READ | INFO1_NOBINDATA
-      operation_count = (@statement.filters.to_a.length == 0 && @statement.bin_names.to_a.length == 0) ? @statement.bin_names.length : 0
+      operation_count = (is_scan? && !@statement.bin_names.nil?) ? @statement.bin_names.length : 0
 
       write_header(@policy, readAttr, 0, fieldCount, operation_count)
 
@@ -133,7 +133,7 @@ module Aerospike
         write_field_string(@statement.set_name, Aerospike::FieldType::TABLE)
       end
 
-      if @statement.filters && @statement.filters.length > 0
+      if !is_scan?
         col_type = @statement.filters[0].collection_type
         if col_type > 0
           write_field_header(1, Aerospike::FieldType::INDEX_TYPE)
@@ -172,18 +172,6 @@ module Aerospike
         @data_offset+=1
       end
 
-      if @statement.bin_names && @statement.bin_names.length > 0
-        write_field_header(binNameSize, Aerospike::FieldType::QUERY_BINLIST)
-        @data_buffer.write_byte(@statement.bin_names.length, @data_offset)
-        @data_offset+=1
-
-        @statement.bin_names.each do |bin_name|
-          len = @data_buffer.write_binary(bin_name, @data_offset + 1)
-          @data_buffer.write_byte(len, @data_offset)
-          @data_offset += len + 1
-        end
-      end
-
       write_field_header(8, Aerospike::FieldType::TRAN_ID)
       @data_buffer.write_int64(@statement.task_id, @data_offset)
       @data_offset += 8
@@ -203,11 +191,21 @@ module Aerospike
         write_field_bytes(functionArgBuffer, Aerospike::FieldType::UDF_ARGLIST)
       end
 
+      if is_scan? && !@statement.bin_names.nil?
+        @statement.bin_names.each do |bin_name|
+          write_operation_for_bin_name(bin_name, Aerospike::Operation::READ)
+        end
+      end
+
       end_cmd
 
       return nil
     end
 
+    def is_scan?
+      @statement.filters.nil? || @statement.filters.empty?
+    end
+
   end # class
 
 end # module

data/lib/aerospike/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aerospike
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.5.1
 platform: ruby
 authors:
 - Khosrow Afroozeh
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-10 00:00:00.000000000 Z
+date: 2018-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -154,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: An Aerospike driver for Ruby.