aerospike 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 235bd4afc86f8bf263a458a22f7e13a247bdda6c
-  data.tar.gz: 35e141ffb29702a9cf1ea046fe731a89e2de9bb5
+  metadata.gz: cb0b09f9246802aab13bc29789ab3745101d110b
+  data.tar.gz: 374cce797743de7a035133e8b2407ade713bd6d5
 SHA512:
-  metadata.gz: e4e54c1051e29cf790f4df58ee1822c3e20fb8120f3d2aef61c69c0da516a6389d429a99d71ad8d1df8fd05b92f18c245b9e0bd2215610ee4c527dca36ae72ed
-  data.tar.gz: be8ec2b6d0247dc6fdec77eba9269561970a6688d0a328cfda38cb7a822c9b9047cdb6ff34a101dfcf60b10de629daf9113cebfa3095bd4b3d2c3cb20e04bfca
+  metadata.gz: 8a14eef40cd28d4d510c9e283e835c33529442981626e335b9c040027cdfbc97ad11d9186afdeffd3f2d4098e4a2ce33a9462672c47c7112a88919dfc95afa1a
+  data.tar.gz: 703bf2bdf23479a7a8a101e38aa4fc613148ab01c5c5901006e1bf4b2a1873f888a41352f0893152df2fa61e19d930ac6202cfc515dea6eb07cca0d6a0ea9ef5

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+v2.1.0 / 2016-07-19
+===================
+
+* **Fixes**
+  * Fix a typo in the `max_retries` policy parameter name. [PR #37](https://github.com/aerospike/aerospike-client-ruby/pull/37) Thanks to [@murphyslaw](https://github.com/murphyslaw)!
+  * Fix license identifier in gemspec.
+
+* **Improvements**
+  * Support for queries on Lists and Maps (keys & values)
+  * Support for creating indexes on Lists and Maps
+  * Support GeoJSON values in Lists and Maps
+
 v2.0.0 / 2016-05-27
 ===================
 

data/README.md

@@ -7,7 +7,7 @@
 
 An Aerospike library for Ruby.
 
-This library is compatible with Ruby 1.9.3+ and supports Linux, Mac OS X and various other BSDs. Rubinius is supported, but not JRuby - yet.
+This library is compatible with Ruby 2.0+ and supports Linux, Mac OS X and various other BSDs. Rubinius is supported, but not JRuby - yet.
 
 
 - [Usage](#Usage)
@@ -63,7 +63,7 @@ Details about the API are available in the [`docs`](docs) directory.
 <a name="Prerequisites"></a>
 ## Prerequisites
 
-[Ruby](https://ruby-lang.org) version v1.9.3+ is required.
+[Ruby](https://ruby-lang.org) version v2.0+ is required.
 
 Aerospike Ruby client implements the wire protocol, and does not depend on the C client.
 It is thread friendly.
@@ -81,7 +81,7 @@ Supported operating systems:
 
 ## Installation from source:
 
-1. Install Ruby 1.9.3+
+1. Install Ruby 2.0+
 2. Install RubyGems
 3. Install Bundler: ```gem install bundler```
 4. Install dependencies: ```bundler install```

data/lib/aerospike/client.rb

@@ -572,11 +572,17 @@ module Aerospike
     #
     #  This method is only supported by Aerospike 3 servers.
     #  index_type should be :string, :numeric or :geo2dsphere (requires server version 3.7 or later)
-    def create_index(namespace, set_name, index_name, bin_name, index_type, options={})
+    #  collection_type should be :list, :mapkeys or :mapvalues
+    def create_index(namespace, set_name, index_name, bin_name, index_type, collection_type=nil, options={})
+      if options.nil? && collection_type.is_a?(Hash)
+        options, collection_type = collection_type, nil
+      end
       policy = create_policy(options, WritePolicy)
       str_cmd = "sindex-create:ns=#{namespace}"
       str_cmd << ";set=#{set_name}" unless set_name.to_s.strip.empty?
-      str_cmd << ";indexname=#{index_name};numbins=1;indexdata=#{bin_name},#{index_type.to_s.upcase}"
+      str_cmd << ";indexname=#{index_name};numbins=1"
+      str_cmd << ";indextype=#{collection_type.to_s.upcase}" if collection_type
+      str_cmd << ";indexdata=#{bin_name},#{index_type.to_s.upcase}"
       str_cmd << ";priority=normal"
 
       # Send index command to one node. That node will distribute the command to other nodes.

data/lib/aerospike/command/field_type.rb

@@ -33,6 +33,7 @@ module Aerospike
     INDEX_FILTER = 23
     INDEX_LIMIT = 24
     INDEX_ORDER_BY = 25
+    INDEX_TYPE = 26
     UDF_PACKAGE_NAME = 30
     UDF_FUNCTION = 31
     UDF_ARGLIST = 32

data/lib/aerospike/policy/policy.rb

@@ -47,7 +47,7 @@ module Aerospike
       # A retry is attempted when there is a network error other than timeout.
       # If max_retries is exceeded, the abort will occur even if the timeout
       # has not yet been exceeded.
-      @max_retries = opt[:max_retiries] || 2
+      @max_retries = opt[:max_retries] || 2
 
       # Duration to sleep between retries if a transaction fails and the
       # timeout was not exceeded. Enter zero to skip sleep.

data/lib/aerospike/query/filter.rb

@@ -22,28 +22,32 @@ module Aerospike
       Filter.new(bin_name, value, value)
     end
 
-    def self.Range(bin_name, from, to)
-      Filter.new(bin_name, from, to)
+    def self.Contains(bin_name, value, col_type)
+      Filter.new(bin_name, value, value, nil, col_type)
     end
 
-    def self.geoWithinGeoJSONRegion(bin_name, region)
+    def self.Range(bin_name, from, to, col_type = nil)
+      Filter.new(bin_name, from, to, nil, col_type)
+    end
+
+    def self.geoWithinGeoJSONRegion(bin_name, region, col_type = nil)
       region = region.to_json
-      Filter.new(bin_name, region, region, ParticleType::GEOJSON)
+      Filter.new(bin_name, region, region, ParticleType::GEOJSON, col_type)
     end
 
-    def self.geoWithinRadius(bin_name, lon, lat, radius_meter)
+    def self.geoWithinRadius(bin_name, lon, lat, radius_meter, col_type = nil)
       region = GeoJSON.new({type: "AeroCircle", coordinates: [[lon, lat], radius_meter]})
-      geoWithinGeoJSONRegion(bin_name, region)
+      geoWithinGeoJSONRegion(bin_name, region, col_type)
     end
 
-    def self.geoContainsGeoJSONPoint(bin_name, point)
+    def self.geoContainsGeoJSONPoint(bin_name, point, col_type = nil)
       point = point.to_json
-      Filter.new(bin_name, point, point, ParticleType::GEOJSON)
+      Filter.new(bin_name, point, point, ParticleType::GEOJSON, col_type)
     end
 
-    def self.geoContainsPoint(bin_name, lon, lat)
+    def self.geoContainsPoint(bin_name, lon, lat, col_type = nil)
       point = GeoJSON.new({type: "Point", coordinates: [lon, lat]})
-      geoContainsGeoJSONPoint(bin_name, point)
+      geoContainsGeoJSONPoint(bin_name, point, col_type)
     end
 
     def estimate_size
@@ -73,6 +77,17 @@ module Aerospike
       offset
     end
 
+    # for internal use
+    def collection_type
+      case @col_type
+      when :default then 0
+      when :list then 1
+      when :mapkeys then 2
+      when :mapvalues then 3
+      else 0
+      end
+    end
+
     #
     # Show the filter as String. This is util to show filters in logs.
     #
@@ -83,7 +98,7 @@ module Aerospike
 
     private
 
-    def initialize(bin_name, begin_value, end_value, val_type = nil)
+    def initialize(bin_name, begin_value, end_value, val_type = nil, col_type = nil)
       @name = bin_name
       @begin = Aerospike::Value.of(begin_value)
       @end = Aerospike::Value.of(end_value)
@@ -91,6 +106,7 @@ module Aerospike
       # The type of the filter values can usually be inferred automatically;
       # but in certain cases caller can override the type.
       @val_type = val_type || @begin.type
+      @col_type = col_type
     end
 
   end # class

data/lib/aerospike/query/query_command.rb

@@ -54,6 +54,12 @@ module Aerospike
       end
 
       if @statement.filters && @statement.filters.length > 0
+        col_type = @statement.filters[0].collection_type
+        if col_type > 0
+          @data_offset += FIELD_HEADER_SIZE + 1
+          fieldCount += 1
+        end
+
         @data_offset += FIELD_HEADER_SIZE
         filterSize+=1 # num filters
 
@@ -128,6 +134,13 @@ module Aerospike
       end
 
       if @statement.filters && @statement.filters.length > 0
+        col_type = @statement.filters[0].collection_type
+        if col_type > 0
+          write_field_header(1, Aerospike::FieldType::INDEX_TYPE)
+          @data_buffer.write_byte(col_type, @data_offset)
+          @data_offset+=1
+        end
+
         write_field_header(filterSize, Aerospike::FieldType::INDEX_RANGE)
         @data_buffer.write_byte(@statement.filters.length, @data_offset)
         @data_offset+=1

data/lib/aerospike/value/value.rb

@@ -392,7 +392,7 @@ module Aerospike
     end
 
     def pack(packer)
-      raise Aerospike::Exceptions::Aerospike.new(Aerospike::ResultCode::PARAMETER_ERROR, "Can't pack GeoJSON")
+      packer.write(Aerospike::ParticleType::GEOJSON.chr + @bytes)
     end
 
     def type

data/lib/aerospike/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aerospike
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Khosrow Afroozeh
@@ -9,23 +9,28 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-27 00:00:00.000000000 Z
+date: 2016-07-19 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:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '1.0'
   type: :runtime
   prerelease: false
+- !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
-- !ruby/object:Gem::Dependency
+        version: '3.1'
   name: bcrypt
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -34,11 +39,6 @@ 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:
@@ -157,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.2
 signing_key: 
 specification_version: 4
 summary: An Aerospike driver for Ruby.