aerospike 1.0.10 → 1.0.11

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 7cb691e571b83e9b270f5de08850950f8cb61be6
+  data.tar.gz: 20ef98d1d88b118da73e6230c3bd2c1cc86cbdfa
+SHA512:
+  metadata.gz: 093c7bc1db1b636d607d63921cc50acb122a523314b64ce6f4de719672480c359473d5083ef07ae53b516e049cc4cacc9e041686bb717b4e42fd662e0a240a69
+  data.tar.gz: c5168149d2c0ce5ab34f29bd4c968126c61dec7e9923beec9727a77ccfb57cad926ce9554c59e726d9c6fc764886b1fa7830991dc478fa46faf04bb649f9b6ec

data/CHANGELOG.md

@@ -1,12 +1,41 @@
+## December 4 2015 (1.0.11)
+
+  Major feature and bug fix release.
+
+  * **Fixes**:
+
+    * Fix `ClientPolicy` to actually accept `fail_if_not_connected` parameter from constructor opts. PR #29, thanks to [Nick Recobra](https://github.com/oruen)
+
+    * Fix record initialization issue. PR #28, thanks to [jzhua](https://github.com/jzhua)
+
+    * Consume the rest of the stream when scan/query is finished.
+
+  * **Improvements**:
+
+    * Support for double precision floating point data type in record bins.
+      Requires server version 3.6.0 or later. [CLIENT-599]
+
+    * Support for geospatial data in record bins using GeoJSON format; support
+      for querying geospatial indexes using points-within-region and
+      region-contains-point filters. Requires server version 3.7.0 or later.
+      [CLIENT-594]
+
+    * Tend intervale is now configurable via the client policy. Default is 1
+      second as before.
+
+    * Only logs tend messages when the number of cluster nodes have changed.
+
+    * Scan and Query termination has been fixed.
+
 ## September 22 2015 (1.0.10)
 
   Major fix release.
 
   * **Fixes**:
 
-    * Fixes find_node_in_partition_map logic.
+    * Fixes `find_node_in_partition_map` logic.
 
-    * Fixes Node.Refresh logic.
+    * Fixes `Node.Refresh` logic.
 
     * Fixes an issue with dead connections that would cause an infinite loop.
 

data/README.md

@@ -104,7 +104,6 @@ To run all the test cases:
 ## Examples
 
 A variety of example applications are provided in the [`examples`](examples) directory.
-See the [`examples/README.md`](examples/README.md) for details.
 
 <a name="Tools"></a>
 ### Tools

data/lib/aerospike.rb

@@ -37,8 +37,10 @@ require 'aerospike/command/batch_command_exists'
 require 'aerospike/command/read_command'
 require 'aerospike/command/delete_command'
 require 'aerospike/command/admin_command'
+require 'aerospike/command/unsupported_particle_type_validator'
 require 'aerospike/key'
 require 'aerospike/operation'
+require 'aerospike/geo_json'
 
 require 'aerospike/policy/client_policy'
 require 'aerospike/policy/priority'

data/lib/aerospike/bin.rb

@@ -37,6 +37,10 @@ module Aerospike
       @value
     end
 
+    def type
+      @value.type if @value
+    end
+
     def to_s
       "#{@name}:#{@value.to_s}"
     end

data/lib/aerospike/client.rb

@@ -49,6 +49,8 @@ module Aerospike
       policy = opt_to_client_policy(options)
 
       @cluster = Cluster.new(policy, Host.new(host, port))
+      @cluster.add_cluster_config_change_listener(self)
+      @cluster.connect
 
       self
     end
@@ -65,7 +67,10 @@ module Aerospike
 
       policy = client.send(:opt_to_client_policy , options)
 
-      client.send(:cluster=, Cluster.new(policy, *hosts))
+      cluster = Cluster.new(policy, *hosts)
+      cluster.add_cluster_config_change_listener(client)
+      client.send(:cluster=, cluster)
+      cluster.connect
 
       client
     end
@@ -119,7 +124,7 @@ module Aerospike
     def put(key, bins, options={})
       policy = opt_to_write_policy(options)
       command = WriteCommand.new(@cluster, policy, key, hash_to_bins(bins), Aerospike::Operation::WRITE)
-      command.execute
+      execute_command(command)
     end
 
     #-------------------------------------------------------
@@ -142,7 +147,7 @@ module Aerospike
     def append(key, bins, options={})
       policy = opt_to_write_policy(options)
       command = WriteCommand.new(@cluster, policy, key, hash_to_bins(bins), Aerospike::Operation::APPEND)
-      command.execute
+      execute_command(command)
     end
 
     ##
@@ -161,7 +166,7 @@ module Aerospike
     def prepend(key, bins, options={})
       policy = opt_to_write_policy(options)
       command = WriteCommand.new(@cluster, policy, key, hash_to_bins(bins), Aerospike::Operation::PREPEND)
-      command.execute
+      execute_command(command)
     end
 
     #-------------------------------------------------------
@@ -184,7 +189,7 @@ module Aerospike
     def add(key, bins, options={})
       policy = opt_to_write_policy(options)
       command = WriteCommand.new(@cluster, policy, key, hash_to_bins(bins), Aerospike::Operation::ADD)
-      command.execute
+      execute_command(command)
     end
 
     #-------------------------------------------------------
@@ -206,7 +211,7 @@ module Aerospike
     def delete(key, options={})
       policy = opt_to_write_policy(options)
       command = DeleteCommand.new(@cluster, policy, key)
-      command.execute
+      execute_command(command)
       command.existed
     end
 
@@ -227,7 +232,7 @@ module Aerospike
     def touch(key, options={})
       policy = opt_to_write_policy(options)
       command = TouchCommand.new(@cluster, policy, key)
-      command.execute
+      execute_command(command)
     end
 
     #-------------------------------------------------------
@@ -240,7 +245,7 @@ module Aerospike
     def exists(key, options={})
       policy = opt_to_policy(options)
       command = ExistsCommand.new(@cluster, policy, key)
-      command.execute
+      execute_command(command)
       command.exists
     end
 
@@ -274,7 +279,7 @@ module Aerospike
       policy = opt_to_policy(options)
 
       command = ReadCommand.new(@cluster, policy, key, bin_names)
-      command.execute
+      execute_command(command)
       command.record
     end
 
@@ -283,7 +288,7 @@ module Aerospike
     def get_header(key, options={})
       policy = opt_to_policy(options)
       command = ReadHeaderCommand.new(@cluster, policy, key)
-      command.execute
+      execute_command(command)
       command.record
     end
 
@@ -355,7 +360,7 @@ module Aerospike
       policy = opt_to_write_policy(options)
 
       command = OperateCommand.new(@cluster, policy, key, operations)
-      command.execute
+      execute_command(command)
       command.record
     end
 
@@ -506,7 +511,7 @@ module Aerospike
       policy = opt_to_write_policy(options)
 
       command = ExecuteCommand.new(@cluster, policy, key, package_name, function_name, args)
-      command.execute
+      execute_command(command)
 
       record = command.record
 
@@ -553,7 +558,7 @@ module Aerospike
           abort_on_exception = true
           begin
             command = QueryCommand.new(node, policy, statement, nil)
-            command.execute
+            execute_command(command)
           rescue => e
             Aerospike.logger.error(e)
             raise e
@@ -571,7 +576,7 @@ module Aerospike
     #  IndexTask instance.
     #
     #  This method is only supported by Aerospike 3 servers.
-    #  index_type should be between :string or :numeric
+    #  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={})
       policy = opt_to_write_policy(options)
       str_cmd = "sindex-create:ns=#{namespace}"
@@ -651,7 +656,7 @@ module Aerospike
             abort_on_exception = true
             command = ScanCommand.new(node, new_policy, namespace, set_name, bin_names, recordset)
             begin
-              command.execute
+              execute_command(command)
             rescue => e
               Aerospike.logger.error(e.backtrace.join("\n")) unless e == SCAN_TERMINATED_EXCEPTION 
               recordset.cancel(e)
@@ -666,7 +671,7 @@ module Aerospike
           nodes.each do |node|
             command = ScanCommand.new(node, new_policy, namespace, set_name, bin_names, recordset)
             begin
-              command.execute
+              execute_command(command)
             rescue => e
               Aerospike.logger.error(e.backtrace.join("\n")) unless e == SCAN_TERMINATED_EXCEPTION 
               recordset.cancel(e)
@@ -701,7 +706,7 @@ module Aerospike
         abort_on_exception = true
         command = ScanCommand.new(node, new_policy, namespace, set_name, bin_names, recordset)
         begin
-          command.execute
+          execute_command(command)
         rescue => e
           Aerospike.logger.error(e.backtrace.join("\n")) unless e == SCAN_TERMINATED_EXCEPTION 
           recordset.cancel(e)
@@ -741,7 +746,7 @@ module Aerospike
           abort_on_exception = true
           command = QueryCommand.new(node, new_policy, statement, recordset)
           begin
-            command.execute
+            execute_command(command)
           rescue => e
             Aerospike.logger.error(e.backtrace.join("\n")) unless e == QUERY_TERMINATED_EXCEPTION 
             recordset.cancel(e)
@@ -906,6 +911,36 @@ module Aerospike
       @cluster = cluster
     end
 
+    def cluster_config_changed(cluster)
+      Aerospike.logger.debug { "Cluster config change detected; active nodes: #{cluster.nodes.map(&:name)}" }
+      setup_command_validators
+    end
+
+    def setup_command_validators
+      Aerospike.logger.debug { "Cluster features: #{@cluster.features.get.to_a}" }
+      validators = []
+
+      # guard against unsupported particle types
+      unsupported_particle_types = []
+      unsupported_particle_types << Aerospike::ParticleType::DOUBLE unless @cluster.supports_feature?("float")
+      unsupported_particle_types << Aerospike::ParticleType::GEOJSON unless @cluster.supports_feature?("geo")
+      validators << UnsupportedParticleTypeValidator.new(*unsupported_particle_types) unless unsupported_particle_types.empty?
+
+      @command_validators = validators
+    end
+
+    def validate_command(command)
+      return unless @command_validators
+      @command_validators.each do |validator|
+        validator.call(command)
+      end
+    end
+
+    def execute_command(command)
+      validate_command(command)
+      command.execute
+    end
+
     def batch_execute(keys, &cmd_gen)
       batch_nodes = BatchNode.generate_list(@cluster, keys)
       threads = []
@@ -918,7 +953,7 @@ module Aerospike
           threads << Thread.new do
             abort_on_exception=true
             command = cmd_gen.call(bn.node, bns)
-            command.execute
+            execute_command(command)
           end
         end
       end

data/lib/aerospike/cluster/cluster.rb

@@ -14,6 +14,7 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
+require 'set'
 require 'thread'
 require 'timeout'
 
@@ -26,17 +27,24 @@ module Aerospike
   class Cluster
 
     attr_reader :connection_timeout, :connection_queue_size, :user, :password
+    attr_reader :features
 
     def initialize(policy, *hosts)
       @cluster_seeds = hosts
+      @fail_if_not_connected = policy.fail_if_not_connected
       @connection_queue_size = policy.connection_queue_size
       @connection_timeout = policy.timeout
+      @tend_interval = policy.tend_interval
       @aliases = {}
       @cluster_nodes = []
       @partition_write_map = {}
       @node_index = Atomic.new(0)
+      @features = Atomic.new(Set.new)
       @closed = Atomic.new(true)
       @mutex = Mutex.new
+      @cluster_config_change_listeners = Atomic.new([])
+
+      @old_node_cound = 0
 
       # setup auth info for cluster
       if policy.requires_authentication
@@ -44,9 +52,13 @@ module Aerospike
         @password = AdminCommand.hash_password(policy.password)
       end
 
+      self
+    end
+
+    def connect
       wait_till_stablized
 
-      if policy.fail_if_not_connected && !connected?
+      if @fail_if_not_connected && !connected?
         raise Aerospike::Exceptions::Aerospike.new(Aerospike::ResultCode::SERVER_NOT_AVAILABLE)
       end
 
@@ -175,11 +187,27 @@ module Aerospike
       end
     end
 
+    def supports_feature?(feature)
+      @features.get.include?(feature.to_s)
+    end
+
     def change_password(user, password)
      # change password ONLY if the user is the same
      @password = password if @user == user
     end
 
+    def add_cluster_config_change_listener(listener)
+      @cluster_config_change_listeners.update do |listeners|
+        listeners.push(listener)
+      end
+    end
+
+    def remove_cluster_config_change_listener(listener)
+      @cluster_config_change_listeners.update do |listeners|
+        listeners.delete(listener)
+      end
+    end
+
     private
 
     def launch_tend_thread
@@ -188,7 +216,7 @@ module Aerospike
         while true
           begin
             tend
-            sleep 1 # 1 second
+            sleep(@tend_interval / 1000.0)
           rescue => e
             Aerospike.logger.error("Exception occured during tend: #{e}")
           end
@@ -198,12 +226,14 @@ module Aerospike
 
     def tend
       nodes = self.nodes
+      cluster_config_changed = false
 
       # All node additions/deletions are performed in tend thread.
       # If active nodes don't exist, seed cluster.
       if nodes.empty?
         Aerospike.logger.info("No connections available; seeding...")
         seed_nodes
+        cluster_config_changed = true
 
         # refresh nodes list after seeding
         nodes = self.nodes
@@ -231,14 +261,33 @@ module Aerospike
 
       # Add nodes in a batch.
       add_list = find_nodes_to_add(friend_list)
-      add_nodes(add_list) unless add_list.empty?
+      unless add_list.empty?
+        add_nodes(add_list)
+        cluster_config_changed = true
+      end
 
       # Handle nodes changes determined from refreshes.
       # Remove nodes in a batch.
       remove_list = find_nodes_to_remove(refresh_count)
-      remove_nodes(remove_list) unless remove_list.empty?
+      unless remove_list.empty?
+        remove_nodes(remove_list)
+        cluster_config_changed = true
+      end
+
+      if cluster_config_changed
+        update_cluster_features
+
+        # only log the tend finish IF the number of nodes has been changed.
+        # This prevents spamming the log on every tend interval
+        if @old_node_cound > nodes.length
+          Aerospike.logger.info("Tend finished. #{@old_node_cound - nodes.length} nodes have left the cluster. Old node count: #{@old_node_cound}, New node count #{nodes.length} #{nodes}")
+        else
+          Aerospike.logger.info("Tend finished. #{nodes.length - @old_node_cound} nodes have joined the cluster. Old node count: #{@old_node_cound}, New node count #{nodes.length} #{nodes}")
+        end
+        @old_node_cound = nodes.length
 
-      Aerospike.logger.info("Tend finished. Live node count: #{nodes.length} #{nodes}")
+        notify_cluster_config_changed
+      end
     end
 
     def wait_till_stablized
@@ -263,7 +312,7 @@ module Aerospike
 
       # wait for the thread to finish or timeout
       begin
-        Timeout.timeout(1) do
+        Timeout.timeout(@connection_timeout) do
           thr.join
         end
       rescue Timeout::Error
@@ -274,6 +323,21 @@ module Aerospike
 
     end
 
+    def update_cluster_features
+      # Cluster supports features that are supported by all nodes
+      @features.update do |cluster_features|
+        node_featues = self.nodes.map(&:features)
+        cluster_features.replace(node_featues.reduce(&:intersection))
+      end
+    end
+
+    def notify_cluster_config_changed
+      listeners = @cluster_config_change_listeners.get
+      listeners.each do |listener|
+        listener.send(:cluster_config_changed, self)
+      end
+    end
+
     def set_partitions(part_map)
       @mutex.synchronize do
         @partition_write_map = part_map

data/lib/aerospike/cluster/node.rb

@@ -22,7 +22,7 @@ module Aerospike
 
   class Node
 
-    attr_reader :reference_count, :responded, :name
+    attr_reader :reference_count, :responded, :name, :features
 
     PARTITIONS = 4096
     FULL_HEALTH = 100
@@ -34,6 +34,7 @@ module Aerospike
       @aliases = Atomic.new(nv.aliases)
       @host = nv.host
       @use_new_info = Atomic.new(nv.use_new_info)
+      @features = nv.features
 
       # Assign host to first IP alias because the server identifies nodes
       # by IP address (not hostname).
@@ -168,7 +169,10 @@ module Aerospike
       close_connections
     end
 
-    # Implements stringer interface
+    def supports_feature?(feature)
+      @features.include?(feature.to_s)
+    end
+
     def to_s
       "#{@name}:#{@host}"
     end

data/lib/aerospike/cluster/node_validator.rb

@@ -20,11 +20,12 @@ module Aerospike
 
   class NodeValidator # :nodoc:
 
-    attr_reader :host, :aliases, :name, :use_new_info
+    attr_reader :host, :aliases, :name, :use_new_info, :features
 
     def initialize(cluster, host, timeout)
       @cluster = cluster
       @use_new_info = true
+      @features = Set.new
       @host = host
 
       set_aliases(host)
@@ -70,10 +71,15 @@ module Aerospike
             end
           end
 
-          info_map= Info.request(conn, 'node', 'build')
+          info_map = Info.request(conn, 'node', 'build', 'features')
           if node_name = info_map['node']
             @name = node_name
 
+            # Set features
+            if features = info_map['features']
+              @features = features.split(';').to_set
+            end
+
             # Check new info protocol support for >= 2.6.6 build
             if build_version = info_map['build']
               v1, v2, v3 = parse_version_string(build_version)

data/lib/aerospike/command/command.rb

@@ -81,6 +81,12 @@ module Aerospike
       self
     end
 
+    # List of all bins that this command will write to - sub-classes should
+    # overrite this as appropriate.
+    def write_bins
+      []
+    end
+
     # Writes the command for write operations
     def set_write(policy, operation, key, bins)
       begin_cmd
@@ -447,7 +453,13 @@ module Aerospike
           begin
             parse_result
           rescue => e
-            Aerospike.logger.error(e)
+            case e
+            # do not log the following exceptions
+            when Aerospike::Exceptions::ScanTerminated
+            when Aerospike::Exceptions::QueryTerminated
+            else
+              Aerospike.logger.error(e)
+            end
             
             # close the connection
             # cancelling/closing the batch/multi commands will return an error, which will

data/lib/aerospike/command/operate_command.rb

@@ -28,6 +28,10 @@ module Aerospike
       @operations = operations
     end
 
+    def write_bins
+      @operations.select{|op| op.op_type == Aerospike::Operation::WRITE}.map(&:bin).compact
+    end
+
     def write_buffer
       set_operate(@policy, @key, @operations)
     end

data/lib/aerospike/command/read_command.rb

@@ -92,8 +92,7 @@ module Aerospike
       end
 
       if op_count == 0
-        # data Bin was not returned.
-        @record = Record.new(@node, @key, generation, expiration)
+        @record = Record.new(@node, @key, nil, generation, expiration)
         return
       end
 

data/lib/aerospike/command/roles.rb

@@ -19,12 +19,15 @@ module Aerospike
 	# Pre-defined user roles.
 	module Role
 
-		 # Manage users their roles.
+		 # Manage users and their roles.
 		 USER_ADMIN = 'user-admin'
 
-		 # Manage indicies, user defined functions and server configuration.
+		 # Manage indicies, user-defined functions and server configuration.
 		 SYS_ADMIN = 'sys-admin'
 
+		 # Allow read, write and UDF transactions with the database.
+		 READ_WRITE_UDF = "read-write-udf"
+
 		 # Allow read and write transactions with the database.
 		 READ_WRITE = 'read-write'
 

data/lib/aerospike/command/unsupported_particle_type_validator.rb

@@ -0,0 +1,34 @@
+# encoding: utf-8
+# Copyright 2015 Aerospike, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License")
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http:#www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+module Aerospike
+
+  class UnsupportedParticleTypeValidator
+
+    def initialize(*particle_types)
+      @unsupported_types = particle_types.to_set
+    end
+
+    def call(*commands)
+      used = commands.flat_map(&:write_bins).map(&:type)
+      unsupported = @unsupported_types.intersection(used)
+      unless unsupported.empty?
+        fail Aerospike::Exceptions::Aerospike.new(Aerospike::ResultCode::TYPE_NOT_SUPPORTED, "Particle type(s) not supported by cluster: #{@unsupported_types.to_a}")
+      end
+    end
+
+  end # class
+
+end # module

data/lib/aerospike/command/write_command.rb

@@ -33,6 +33,10 @@ module Aerospike
       self
     end
 
+    def write_bins
+      @bins
+    end
+
     def write_buffer
       set_write(@policy, @operation, @key, @bins)
     end

data/lib/aerospike/geo_json.rb

@@ -0,0 +1,61 @@
+# encoding: utf-8
+# Copyright 2015 Aerospike, Inc.
+#
+# Portions may be licensed to Aerospike, Inc. under one or more contributor
+# license agreements.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License. You may obtain a copy of
+# the License at http:#www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
+require "json"
+
+module Aerospike
+
+  ##
+  # Wrapper for GeoJSON data.
+  # GeoJSON data needs to be wrapped to allow the client to distinguish
+  # geospatial data from string (or hash) data. Geospatial data from a record's
+  # bin will be returned as an instance of this class.
+  # The wrapper accepts GeoJSON data either as a String or a Hash.
+
+  class GeoJSON
+
+    def initialize(data)
+      self.json_data =
+        case data
+        when String
+          data
+        else
+          data.to_json
+        end
+    end
+
+    def to_json
+      json_data
+    end
+    alias_method :to_s, :to_json
+
+    def to_hash
+      JSON.parse(json_data)
+    end
+    alias_method :to_h, :to_hash
+
+    def ==(other)
+      return false unless other.class == self.class
+      other.to_json == self.to_json
+    end
+
+    protected
+
+    attr_accessor :json_data
+
+  end # class
+
+end # module

data/lib/aerospike/operation.rb

@@ -37,6 +37,10 @@ module Aerospike
       self
     end
 
+    def bin
+      Aerospike::Bin.new(bin_name, bin_value) if bin_name && bin_value
+    end
+
     def self.get(bin_name=nil)
       Operation.new(READ, bin_name)
     end

data/lib/aerospike/policy/client_policy.rb

@@ -19,7 +19,7 @@ module Aerospike
   class ClientPolicy
 
     attr_accessor :user, :password
-    attr_accessor :timeout, :connection_queue_size, :fail_if_not_connected
+    attr_accessor :timeout, :connection_queue_size, :fail_if_not_connected, :tend_interval
 
     def initialize(opt={})
       # Initial host connection timeout in seconds. The timeout when opening a connection
@@ -30,7 +30,11 @@ module Aerospike
       @connection_queue_size = opt[:connection_queue_size] || 64
 
       # Throw exception if host connection fails during add_host.
-      @fail_if_not_connected = opt[:fail_if_not_connected] || true
+      @fail_if_not_connected = opt.has_key?(:fail_if_not_connected) ? opt[:fail_if_not_connected] : true
+
+      # Tend interval in milliseconds; determines the interval at
+      # which the client checks for cluster state changes. Minimum interval is 10ms.
+      self.tend_interval = opt[:tend_interval] || 1000 # 1 second
 
       # user name
       @user = opt[:user]
@@ -43,6 +47,14 @@ module Aerospike
       (@user && @user != '') || (@password && @password != '')
     end
 
+    def tend_interval=(interval)
+      if interval < 10
+        Aerospike.logger.warn("Minimum tend interval is 10 milliseconds (client policy: #{interval}).")
+        interval = 10
+      end
+      @tend_interval = interval
+    end
+
   end # class
 
 end # module

data/lib/aerospike/query/filter.rb

@@ -26,6 +26,26 @@ module Aerospike
       Filter.new(bin_name, from, to)
     end
 
+    def self.geoWithinGeoJSONRegion(bin_name, region)
+      region = region.to_json
+      Filter.new(bin_name, region, region, ParticleType::GEOJSON)
+    end
+
+    def self.geoWithinRadius(bin_name, lon, lat, radius_meter)
+      region = GeoJSON.new({type: "AeroCircle", coordinates: [[lon, lat], radius_meter]})
+      geoWithinGeoJSONRegion(bin_name, region)
+    end
+
+    def self.geoContainsGeoJSONPoint(bin_name, point)
+      point = point.to_json
+      Filter.new(bin_name, point, point, ParticleType::GEOJSON)
+    end
+
+    def self.geoContainsPoint(bin_name, lon, lat)
+      point = GeoJSON.new({type: "Point", coordinates: [lon, lat]})
+      geoContainsGeoJSONPoint(bin_name, point)
+    end
+
     def estimate_size
       return @name.bytesize + @begin.estimate_size + @end.estimate_size + 10
     end
@@ -37,7 +57,7 @@ module Aerospike
       offset += len + 1
 
       # Write particle type.
-      buf.write_byte(@begin.type, offset)
+      buf.write_byte(@val_type, offset)
       offset+=1
 
       # Write filter begin.
@@ -63,10 +83,14 @@ module Aerospike
 
     private
 
-    def initialize(bin_name, begin_value, end_value)
+    def initialize(bin_name, begin_value, end_value, val_type = nil)
       @name = bin_name
       @begin = Aerospike::Value.of(begin_value)
       @end = Aerospike::Value.of(end_value)
+
+      # 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
     end
 
   end # class

data/lib/aerospike/query/recordset.rb

@@ -115,7 +115,7 @@ module Aerospike
 
   private
 
-    SCAN_TERMINATED_EXCEPTION = Aerospike::Exceptions::Aerospike.new(Aerospike::ResultCode::SCAN_TERMINATED)
-    QUERY_TERMINATED_EXCEPTION = Aerospike::Exceptions::Aerospike.new(Aerospike::ResultCode::SCAN_TERMINATED)
+    SCAN_TERMINATED_EXCEPTION = Aerospike::Exceptions::ScanTerminated.new()
+    QUERY_TERMINATED_EXCEPTION = Aerospike::Exceptions::QueryTerminated.new()
 
 end

data/lib/aerospike/query/stream_command.rb

@@ -39,6 +39,9 @@ module Aerospike
           # if there is no recordset defined, it means this is an Execute UDF On Query command
           # return successfully
           if (@recordset == nil) && (result_code == Aerospike::ResultCode::KEY_NOT_FOUND_ERROR)
+            # consume the rest of the input buffer from the socket
+            read_bytes(receive_size - data_offset) if @data_offset < receive_size
+
             return nil
           end
           raise Aerospike::Exceptions::Aerospike.new(result_code)

data/lib/aerospike/result_code.rb

@@ -36,7 +36,6 @@ module Aerospike
     INVALID_NODE_ERROR = -3
 
     # Client parse error.
-
     PARSE_ERROR = -2
 
     # Client serialization error.

data/lib/aerospike/utils/buffer.rb

@@ -34,6 +34,7 @@ module Aerospike
     UINT32 = 'N'
     INT64 = 'q>'
     UINT64 = 'Q>'
+    DOUBLE = 'G'
 
     DEFAULT_BUFFER_SIZE = 16 * 1024
     MAX_BUFFER_SIZE = 10 * 1024 * 1024
@@ -104,6 +105,11 @@ module Aerospike
       8
     end
 
+    def write_double(f, offset)
+      @buf[offset, 8] = [f].pack(DOUBLE)
+      8
+    end
+
     def read(offset, len=nil)
       start = offset
 
@@ -140,6 +146,11 @@ module Aerospike
       val
     end
 
+    def read_double(offset)
+      vals = @buf[offset..offset+7]
+      vals.unpack(DOUBLE)[0]
+    end
+
     def to_s
       @buf[0..@slice_end-1]
     end

data/lib/aerospike/value/particle_type.rb

@@ -20,7 +20,7 @@ module Aerospike
     # Server particle types. Unsupported types are commented out.
     NULL = 0
     INTEGER = 1
-    #BIGNUM = 2
+    DOUBLE = 2
     STRING = 3
     BLOB = 4
     #TIMESTAMP = 5
@@ -39,6 +39,7 @@ module Aerospike
     #LUA_BLOB = 18
     MAP = 19
     LIST = 20
+    GEOJSON = 23
 
   end # module
 

data/lib/aerospike/value/value.rb

@@ -51,6 +51,8 @@ module Aerospike
           # big nums > 2**63 are not supported
           raise Aerospike::Exceptions::Aerospike.new(Aerospike::ResultCode::TYPE_NOT_SUPPORTED, "Value type #{value.class} not supported.")
         end
+      when Float
+        res = FloatValue.new(value)
       when String
         res = StringValue.new(value)
       when Symbol
@@ -61,6 +63,8 @@ module Aerospike
         res = MapValue.new(value)
       when Array
         res = ListValue.new(value)
+      when GeoJSON
+        res = GeoJSONValue.new(value)
       else
         # throw an exception for anything that is not supported.
         raise Aerospike::Exceptions::Aerospike.new(Aerospike::ResultCode::TYPE_NOT_SUPPORTED, "Value type #{value.class} not supported.")
@@ -234,6 +238,49 @@ module Aerospike
 
   end # IntegerValue
 
+  #######################################
+
+  # Float value.
+  class FloatValue < Value #:nodoc:
+
+    def initialize(val)
+      @value = val || 0.0
+      self
+    end
+
+    def estimate_size
+      8
+    end
+
+    def write(buffer, offset)
+      buffer.write_double(@value, offset)
+      8
+    end
+
+    def pack(packer)
+      packer.write(@value)
+    end
+
+    def type
+      Aerospike::ParticleType::DOUBLE
+    end
+
+    def get
+      @value
+    end
+
+    def to_bytes
+      [@value].pack('G')
+    end
+
+    def to_s
+      @value.to_s
+    end
+
+  end # FloatValue
+
+  #######################################
+
   # List value.
   # Supported by Aerospike 3 servers only.
   class ListValue < Value #:nodoc:
@@ -335,6 +382,51 @@ module Aerospike
 
   end
 
+  # #######################################/
+
+  # GeoJSON value.
+  # Supported by Aerospike server version 3.7 and later.
+  class GeoJSONValue < Value #:nodoc:
+
+    def initialize(json)
+      @json = json
+      @bytes = json.to_json
+      self
+    end
+
+    def estimate_size
+      # flags + ncells + jsonstr
+      1 + 2 + @bytes.bytesize
+    end
+
+    def write(buffer, offset)
+      buffer.write_byte(0, offset) # flags
+      buffer.write_uint16(0, offset + 1) # ncells
+      return 1 + 2 + buffer.write_binary(@bytes, offset + 3) # JSON string
+    end
+
+    def pack(packer)
+      raise Aerospike::Exceptions::Aerospike.new(Aerospike::ResultCode::PARAMETER_ERROR, "Can't pack GeoJSON")
+    end
+
+    def type
+      Aerospike::ParticleType::GEOJSON
+    end
+
+    def get
+      @json
+    end
+
+    def to_bytes
+      @bytes
+    end
+
+    def to_s
+      @json
+    end
+
+  end
+
   #######################################
 
   protected
@@ -371,6 +463,9 @@ module Aerospike
     when Aerospike::ParticleType::INTEGER
       buf.read_int64(offset)
 
+    when Aerospike::ParticleType::DOUBLE
+      buf.read_double(offset)
+
     when Aerospike::ParticleType::BLOB
       buf.read(offset,length)
 
@@ -380,6 +475,12 @@ module Aerospike
     when Aerospike::ParticleType::MAP
       normalize_strings_in_map(MessagePack.unpack(buf.read(offset, length)))
 
+    when Aerospike::ParticleType::GEOJSON
+      # ignore the flags for now
+      ncells = buf.read_int16(offset + 1)
+      hdrsz = 1 + 2 + (ncells * 8)
+      Aerospike::GeoJSON.new(buf.read(offset + hdrsz, length - hdrsz))
+
     else
       nil
     end

data/lib/aerospike/version.rb

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

metadata

@@ -1,46 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: aerospike
 version: !ruby/object:Gem::Version
-  version: 1.0.10
-  prerelease: 
+  version: 1.0.11
 platform: ruby
 authors:
 - Khosrow Afroozeh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-22 00:00:00.000000000 Z
+date: 2015-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
 - !ruby/object:Gem::Dependency
   name: bcrypt
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
 description: Official Aerospike Client for ruby. Access your Aerospike cluster with
@@ -51,6 +46,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
+- LICENSE
+- README.md
+- lib/aerospike.rb
 - lib/aerospike/aerospike_exception.rb
 - lib/aerospike/atomic/atomic.rb
 - lib/aerospike/bin.rb
@@ -79,7 +78,9 @@ files:
 - lib/aerospike/command/roles.rb
 - lib/aerospike/command/single_command.rb
 - lib/aerospike/command/touch_command.rb
+- lib/aerospike/command/unsupported_particle_type_validator.rb
 - lib/aerospike/command/write_command.rb
+- lib/aerospike/geo_json.rb
 - lib/aerospike/host.rb
 - lib/aerospike/info.rb
 - lib/aerospike/key.rb
@@ -124,35 +125,30 @@ files:
 - lib/aerospike/value/particle_type.rb
 - lib/aerospike/value/value.rb
 - lib/aerospike/version.rb
-- lib/aerospike.rb
-- CHANGELOG.md
-- LICENSE
-- README.md
 homepage: http://www.github.com/aerospike/aerospike-client-ruby
 licenses:
 - Apache2.0
-post_install_message: ! 'Thank you for using Aerospike!
-
-  You can report issues on github.com/aerospike/aerospike-client-ruby'
+metadata: {}
+post_install_message: |-
+  Thank you for using Aerospike!
+  You can report issues on github.com/aerospike/aerospike-client-ruby
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23.2
+rubygems_version: 2.4.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: An Aerospike driver for Ruby.
 test_files: []