aerospike 2.10.0 → 2.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61a847f7addabd7b9e7bf77326537e94cc437e99041e664fcd3496ffb7cba843
-  data.tar.gz: '033279bbc6e8410e585ace808aabf4ae469a4bd233c1d80f10c2a488894fc5ad'
+  metadata.gz: 02e8ccb3f64b4605bc10b58af760e35373209b7323b2c06cc04f133dd12c4b7d
+  data.tar.gz: 2b396aec824a2057daef8a6bd054c00bb103e2afd32f2d4c30de6e97853997f3
 SHA512:
-  metadata.gz: 5b19a2653c7464e185a0d50faff2ac735b990188eee1021627d6eaab55020130797f14b20eb1f98a79a7cc846962d0d45ba47cd03f8e48ddafba48de6b4ac85f
-  data.tar.gz: b550a9058c7c2eed384f1b3635a6f56836aa250248bd48837d72e1ac466a6bb8b06c051122b750e5ccc9f61c7f5736bad12627742e91cf61f215188d1e3dfce8
+  metadata.gz: 6eb54355ef98807e3523c93bce1b5c2b440a1340387d351da5fb310f11c513d69622f60e309129ac4ea8897d26f5f3bf38362b3c6995a8241d023e383e17a887
+  data.tar.gz: 217f6f2a2a0b782d0309e7a487416bf47be2e9225dce5899d1d9e54b2b7578a26e9e0535d9ce5dc1a53bf3b1be87c865218482a59ba4e216a68803328c7608ba

data/CHANGELOG.md

@@ -4,6 +4,15 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+## [2.11.0] - 2019-05-17
+
+* **New Features**
+  * Support for predicate expressions in queries. Thanks to [@Minus10Degrees](https://github.com/Minus10Degrees)! [[#78](https://github.com/aerospike/aerospike-client-ruby/issues/78)]
+
+* **Bug Fixes**
+  * Client#execute\_udf\_on\_query should not modify the statement argument. [[#79](https://github.com/aerospike/aerospike-client-ruby/issues/79)]
+  * Encoding::UndefinedConversionError when reading blob data from CDT list/map bin. [[#84](https://github.com/aerospike/aerospike-client-ruby/issues/84)]
+
 ## [2.10.0] - 2019-05-10
 
 * **New Features**

data/lib/aerospike.rb

@@ -142,6 +142,15 @@ require 'aerospike/query/stream_command'
 require 'aerospike/query/query_command'
 require 'aerospike/query/scan_command'
 require 'aerospike/query/statement'
+require 'aerospike/query/pred_exp'
+
+require 'aerospike/query/pred_exp/and_or'
+require 'aerospike/query/pred_exp/geo_json_value'
+require 'aerospike/query/pred_exp/integer_value'
+require 'aerospike/query/pred_exp/op'
+require 'aerospike/query/pred_exp/regex'
+require 'aerospike/query/pred_exp/regex_flags'
+require 'aerospike/query/pred_exp/string_value'
 
 module Aerospike
   extend Loggable

data/lib/aerospike/client.rb

@@ -526,7 +526,7 @@ module Aerospike
         raise Aerospike::Exceptions::Aerospike.new(Aerospike::ResultCode::SERVER_NOT_AVAILABLE, "Executing UDF failed because cluster is empty.")
       end
 
-      # TODO: wait until all migrations are finished
+      statement = statement.clone
       statement.set_aggregate_function(package_name, function_name, function_args, false)
 
       # Use a thread per node

data/lib/aerospike/command/field_type.rb

@@ -43,6 +43,7 @@ module Aerospike
     UDF_OP = 33
     QUERY_BINLIST = 40
     BATCH_INDEX = 41
+    PREDEXP = 43
 
   end # module
 

data/lib/aerospike/geo_json.rb

@@ -52,6 +52,75 @@ module Aerospike
       other.to_json == self.to_json
     end
 
+    def lng
+      case type
+      when 'Point'
+        coordinates.first
+      when 'AeroCircle'
+        coordinates.first.first
+      end
+    end
+
+    def lat
+      case type
+      when 'Point'
+        coordinates.last
+      when 'AeroCircle'
+        coordinates.first.last
+      end
+    end
+
+    def radius
+      return nil unless circle?
+
+      coordinates.last
+    end
+
+    def coordinates
+      to_h['coordinates']
+    end
+
+    def type
+      to_h['type']
+    end
+
+    def point?
+      type == 'Point'
+    end
+
+    def circle?
+      type == 'AeroCircle'
+    end
+
+    def polygon?
+      type == 'Polygon'
+    end
+
+    def self.point(lng, lat)
+      new(type: 'Point', coordinates: [lng, lat])
+    end
+
+    def self.circle(lng, lat, radius)
+      new(type: 'AeroCircle', coordinates: [[lng, lat], radius])
+    end
+
+    def self.polygon(coordinates)
+      new(type: 'Polygon', coordinates: coordinates)
+    end
+
+    def to_circle(radius)
+      raise TypeError, 'Cannot create a Circle from a Polygon' if polygon?
+
+      self.class.circle(lng, lat, radius)
+    end
+
+    def to_point
+      return self if point?
+      raise TypeError, 'Cannot create a Point from a Polygon' if polygon?
+
+      self.class.point(lng, lat)
+    end
+
     protected
 
     attr_accessor :json_data

data/lib/aerospike/query/pred_exp.rb

@@ -0,0 +1,192 @@
+# frozen_string_literal: true
+
+module Aerospike
+  class PredExp
+    AND                = 1
+    OR                 = 2
+    NOT                = 3
+    INTEGER_VALUE      = 10
+    STRING_VALUE       = 11
+    GEOJSON_VALUE      = 12
+    INTEGER_BIN        = 100
+    STRING_BIN         = 101
+    GEOJSON_BIN        = 102
+    LIST_BIN           = 103
+    MAP_BIN            = 104
+    INTEGER_VAR        = 120
+    STRING_VAR         = 121
+    GEOJSON_VAR        = 122
+    RECSIZE            = 150
+    LAST_UPDATE        = 151
+    VOID_TIME          = 152
+    INTEGER_EQUAL      = 200
+    INTEGER_UNEQUAL    = 201
+    INTEGER_GREATER    = 202
+    INTEGER_GREATEREQ  = 203
+    INTEGER_LESS       = 204
+    INTEGER_LESSEQ     = 205
+    STRING_EQUAL       = 210
+    STRING_UNEQUAL     = 211
+    STRING_REGEX       = 212
+    GEOJSON_WITHIN     = 220
+    GEOJSON_CONTAINS   = 221
+    LIST_ITERATE_OR    = 250
+    MAPKEY_ITERATE_OR  = 251
+    MAPVAL_ITERATE_OR  = 252
+    LIST_ITERATE_AND   = 253
+    MAPKEY_ITERATE_AND = 254
+    MAPVAL_ITERATE_AND = 255
+
+    def self.and(nexp)
+      AndOr.new(AND, nexp)
+    end
+
+    def self.or(nexp)
+      AndOr.new(OR, nexp)
+    end
+
+    def self.not
+      Op.new(NOT)
+    end
+
+    def self.integer_value(value)
+      IntegerValue.new(value, INTEGER_VALUE)
+    end
+
+    def self.string_value(value)
+      StringValue.new(value, STRING_VALUE)
+    end
+
+    def self.geojson_value(value)
+      raise(ArgumentError, "value must be a GeoJSON object!") unless value.is_a?(Aerospike::GeoJSON)
+      GeoJsonValue.new(value.to_s, GEOJSON_VALUE)
+    end
+
+    def self.integer_bin(name)
+      StringValue.new(name, INTEGER_BIN)
+    end
+
+    def self.string_bin(name)
+      StringValue.new(name, STRING_BIN)
+    end
+
+    def self.geojson_bin(name)
+      StringValue.new(name, GEOJSON_BIN)
+    end
+
+    def self.list_bin(name)
+      StringValue.new(name, LIST_BIN)
+    end
+
+    def self.map_bin(name)
+      StringValue.new(name, MAP_BIN)
+    end
+
+    def self.integer_var(name)
+      StringValue.new(name, INTEGER_VAR)
+    end
+
+    def self.string_var(name)
+      StringValue.new(name, STRING_VAR)
+    end
+
+    def self.geojson_var(name)
+      StringValue.new(name, GEOJSON_VAR)
+    end
+
+    def self.record_size
+      Op.new(RECSIZE)
+    end
+
+    def self.last_update
+      Op.new(LAST_UPDATE)
+    end
+
+    def self.void_time
+      Op.new(VOID_TIME)
+    end
+
+    def self.integer_equal
+      Op.new(INTEGER_EQUAL)
+    end
+
+    def self.integer_unequal
+      Op.new(INTEGER_UNEQUAL)
+    end
+
+    def self.integer_greater
+      Op.new(INTEGER_GREATER)
+    end
+
+    def self.integer_greater_eq
+      Op.new(INTEGER_GREATEREQ)
+    end
+
+    def self.integer_less
+      Op.new(INTEGER_LESS)
+    end
+
+    def self.integer_less_eq
+      Op.new(INTEGER_LESSEQ)
+    end
+
+    def self.string_equal
+      Op.new(STRING_EQUAL)
+    end
+
+    def self.string_unequal
+      Op.new(STRING_UNEQUAL)
+    end
+
+    def self.string_regex(flags)
+      Regex.new(STRING_REGEX, flags)
+    end
+
+    def self.geojson_within
+      Op.new(GEOJSON_WITHIN)
+    end
+
+    def self.geojson_contains
+      Op.new(GEOJSON_CONTAINS)
+    end
+
+    def self.list_iterate_or(var_name)
+      StringValue.new(var_name, LIST_ITERATE_OR)
+    end
+
+    def self.list_iterate_and(var_name)
+      StringValue.new(var_name, LIST_ITERATE_AND)
+    end
+
+    def self.mapkey_iterate_or(var_name)
+      StringValue.new(var_name, MAPKEY_ITERATE_OR)
+    end
+
+    def self.mapkey_iterate_and(var_name)
+      StringValue.new(var_name, MAPKEY_ITERATE_AND)
+    end
+
+    def self.mapval_iterate_or(var_name)
+      StringValue.new(var_name, MAPVAL_ITERATE_OR)
+    end
+
+    def self.mapval_iterate_and(var_name)
+      StringValue.new(var_name, MAPVAL_ITERATE_AND)
+    end
+
+
+
+    def self.estimate_size(predexp)
+      return 0 unless predexp
+      predexp.map(&:estimate_size).inject { |sum, size| sum + size }
+    end
+
+    def self.write(predexp, buffer, offset)
+      predexp.each do |p|
+        offset = p.write(buffer, offset)
+      end
+
+      offset
+    end
+  end
+end

data/lib/aerospike/query/pred_exp/and_or.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Aerospike
+  class PredExp
+    class AndOr < PredExp
+      def initialize(op, nexp)
+        @op = op
+        @nexp = nexp
+      end
+
+      def estimate_size
+        8
+      end
+
+      def write(buffer, offset)
+        # write type
+        buffer.write_int16(@op, offset)
+        offset += 2
+
+        # write length
+        buffer.write_int32(2, offset)
+        offset += 4
+
+        # write predicate count
+        buffer.write_int16(@nexp, offset)
+        offset += 2
+
+        offset
+      end
+    end
+  end
+end

data/lib/aerospike/query/pred_exp/geo_json_value.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module Aerospike
+  class PredExp
+    class GeoJsonValue < PredExp
+      def initialize(value, type)
+        @value = value
+        @type = type
+      end
+
+      def estimate_size
+        @value.bytesize + 9
+      end
+
+      def write(buffer, offset)
+        # tag
+        buffer.write_uint16(@type, offset)
+        offset += 2
+
+        # len
+        buffer.write_uint32(@value.bytesize + 3, offset)
+        offset += 4
+
+        # flags
+
+        buffer.write_byte(0, offset)
+        offset += 1
+
+        # ncells
+        buffer.write_uint16(0, offset)
+        offset += 2
+
+        # value
+        len = buffer.write_binary(@value, offset)
+        offset += len
+
+        offset
+      end
+    end
+  end
+end

data/lib/aerospike/query/pred_exp/integer_value.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Aerospike
+  class PredExp
+    class IntegerValue < PredExp
+      def initialize(value, type)
+        @value = value
+        @type = type
+      end
+
+      def estimate_size
+        14
+      end
+
+      def write(buffer, offset)
+        # Write type
+        buffer.write_int16(@type, offset)
+        offset += 2
+
+        # Write length
+        buffer.write_int32(8, offset)
+        offset += 4
+
+        # Write value.
+        buffer.write_int64(@value, offset)
+        offset += 8
+
+        offset
+      end
+    end
+  end
+end

data/lib/aerospike/query/pred_exp/op.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Aerospike
+  class PredExp
+    class Op < PredExp
+      def initialize(op)
+        @op = op
+      end
+
+      def estimate_size
+        6
+      end
+
+      def write(buffer, offset)
+        # write type
+        buffer.write_int16(@op, offset)
+        offset += 2
+
+        # write zero length
+        buffer.write_int32(0, offset)
+        offset += 4
+
+        offset
+      end
+    end
+  end
+end

data/lib/aerospike/query/pred_exp/regex.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Aerospike
+  class PredExp
+    class Regex < PredExp
+      def initialize(op, flag = Flags::NONE)
+        @op = op
+        @flag = flag
+      end
+
+      def estimate_size
+        10
+      end
+
+      def write(buffer, offset)
+        # write op type
+        buffer.write_int16(@op, offset)
+        offset += 2
+
+        # write length
+        buffer.write_int32(4, offset)
+        offset += 4
+
+        # write predicate count
+        buffer.write_int32(@flag, offset)
+        offset += 4
+
+        offset
+      end
+    end
+  end
+end

data/lib/aerospike/query/pred_exp/regex_flags.rb

@@ -0,0 +1,23 @@
+# fr# frozen_string_literal: true
+
+module Aerospike
+  class PredExp
+    # Regex bit flags
+    module RegexFlags
+      # Regex defaults
+      NONE = 0
+
+      # Use POSIX Extended Regular Expression syntax when interpreting regex.
+      EXTENDED = 1
+
+      # Do not differentiate case.
+      ICASE = 2
+
+      # Do not report position of matches.
+      NOSUB = 4
+
+      # Match-any-character operators don't match a newline.
+      NEWLINE = 8
+    end
+  end
+end

data/lib/aerospike/query/pred_exp/string_value.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Aerospike
+  class PredExp
+    class StringValue < PredExp
+      def initialize(value, type)
+        @value = value
+        @type = type
+      end
+
+      def estimate_size
+        @value.bytesize + 6
+      end
+
+      def write(buffer, offset)
+        buffer.write_int16(@type, offset)
+        offset += 2
+
+        buffer.write_int32(@value.bytesize, offset)
+        offset += 4
+
+        len = buffer.write_binary(@value, offset)
+        offset += len
+
+        offset
+      end
+    end
+  end
+end

data/lib/aerospike/query/query_command.rb

@@ -35,6 +35,7 @@ module Aerospike
       fieldCount = 0
       filterSize = 0
       binNameSize = 0
+      predSize = 0
 
       begin_cmd
 
@@ -92,6 +93,13 @@ module Aerospike
       @data_offset += 8 + FIELD_HEADER_SIZE
       fieldCount+=1
 
+      if @statement.predexp
+        @data_offset += FIELD_HEADER_SIZE
+        predSize = Aerospike::PredExp.estimate_size(@statement.predexp)
+        @data_offset += predSize
+        fieldCount += 1
+      end
+
       if @statement.function_name
         @data_offset += FIELD_HEADER_SIZE + 1 # udf type
         @data_offset += @statement.package_name.bytesize + FIELD_HEADER_SIZE
@@ -176,6 +184,13 @@ module Aerospike
       @data_buffer.write_int64(@statement.task_id, @data_offset)
       @data_offset += 8
 
+      if @statement.predexp
+        write_field_header(predSize, Aerospike::FieldType::PREDEXP)
+        @data_offset = Aerospike::PredExp.write(
+          @statement.predexp, @data_buffer, @data_offset
+        )
+      end
+
       if @statement.function_name
         write_field_header(1, Aerospike::FieldType::UDF_OP)
         if @statement.return_data

data/lib/aerospike/query/recordset.rb

@@ -20,7 +20,7 @@ module Aerospike
   # a producer is a thread that fetches records from one node and puts them on this queue
   # a consumer fetches records from this queue
   # so the production and the consumptoin are decoupled
-  # there can be an unlimited count of producer threads and consumer threads 
+  # there can be an unlimited count of producer threads and consumer threads
   class Recordset
 
     attr_reader :records
@@ -29,7 +29,7 @@ module Aerospike
       queue_size = thread_count if queue_size < thread_count
       @records = SizedQueue.new(queue_size)
 
-      # holds the count of active threads. 
+      # holds the count of active threads.
       # when it reaches zero it means the whole operations of fetching records from server nodes is finished
       @active_threads = Atomic.new(thread_count)
 
@@ -48,7 +48,7 @@ module Aerospike
     # if the operation is not finished and the queue is empty it blocks and waits for new records
     # it sets the exception if it reaches the EOF mark, and returns nil
     # EOF means the operation has finished and no more records are comming from server nodes
-    # it re-raises the exception occurred in threads, or which was set after reaching the EOF in the previous call 
+    # it re-raises the exception occurred in threads, or which was set after reaching the EOF in the previous call
     def next_record
       raise @thread_exception.get unless @thread_exception.get.nil?
 
@@ -76,7 +76,7 @@ module Aerospike
 
     # this is called by a thread who faced an exception to singnal to terminate the whole operation
     # it also may be called by the user to terminate the command in the middle of fetching records from server nodes
-    # it clears the queue so that if any threads are waiting for the queue get unblocked and find out about the cancellation 
+    # it clears the queue so that if any threads are waiting for the queue get unblocked and find out about the cancellation
     def cancel(expn=nil)
       set_exception(expn)
       @cancelled.set(true)

data/lib/aerospike/query/statement.rb

@@ -20,7 +20,7 @@ module Aerospike
 
     attr_accessor :namespace, :set_name, :index_name, :bin_names, :task_id
     attr_accessor :filters, :package_name, :function_name, :function_args
-    attr_accessor :return_data
+    attr_accessor :predexp, :return_data
 
     def initialize(namespace, set_name, bin_names=[])
       # Namespace determines query Namespace
@@ -43,6 +43,9 @@ module Aerospike
       # aggregation function.
       @filters = []
 
+      # Predicate expressions
+      @predexp = nil
+
       @package_name  = nil
       @function_name = nil
       @function_args = nil
@@ -76,5 +79,4 @@ module Aerospike
   RAND_MAX = 2**63
 
   end # class
-
 end

data/lib/aerospike/utils/unpacker.rb

@@ -85,7 +85,12 @@ module Aerospike
     def normalize_elem(elem)
       case elem
       when String
-       elem[1..-1].encode(Aerospike.encoding)
+        ptype = elem.ord
+        value = elem[1..-1]
+        if (ptype == ParticleType::STRING)
+          value.encode!(Aerospike.encoding)
+        end
+        value
       when Array
         normalize_strings_in_array(elem)
       when Hash

data/lib/aerospike/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aerospike
 version: !ruby/object:Gem::Version
-  version: 2.10.0
+  version: 2.11.0
 platform: ruby
 authors:
 - Khosrow Afroozeh
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-10 00:00:00.000000000 Z
+date: 2019-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -140,6 +140,14 @@ files:
 - lib/aerospike/policy/scan_policy.rb
 - lib/aerospike/policy/write_policy.rb
 - lib/aerospike/query/filter.rb
+- lib/aerospike/query/pred_exp.rb
+- lib/aerospike/query/pred_exp/and_or.rb
+- lib/aerospike/query/pred_exp/geo_json_value.rb
+- lib/aerospike/query/pred_exp/integer_value.rb
+- lib/aerospike/query/pred_exp/op.rb
+- lib/aerospike/query/pred_exp/regex.rb
+- lib/aerospike/query/pred_exp/regex_flags.rb
+- lib/aerospike/query/pred_exp/string_value.rb
 - lib/aerospike/query/query_command.rb
 - lib/aerospike/query/recordset.rb
 - lib/aerospike/query/scan_command.rb