aerospike 2.10.0 → 2.15.0

data/lib/aerospike/query/filter.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-# Copyright 2014-2017 Aerospike, Inc.
+# Copyright 2014-2020 Aerospike, Inc.
 #
 # Portions may be licensed to Aerospike, Inc. under one or more contributor
 # license agreements.

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

@@ -1,5 +1,5 @@
 # encoding: utf-8
-# Copyright 2014-2017 Aerospike, Inc.
+# Copyright 2014-2020 Aerospike, Inc.
 #
 # Portions may be licensed to Aerospike, Inc. under one or more contributor
 # license agreements.
@@ -35,6 +35,7 @@ module Aerospike
       fieldCount = 0
       filterSize = 0
       binNameSize = 0
+      predSize = 0
 
       begin_cmd
 
@@ -81,6 +82,11 @@ module Aerospike
           fieldCount+=1
         end
       else
+        if @policy.records_per_second > 0
+          @data_offset += 4 + FIELD_HEADER_SIZE
+          fieldCount += 1
+        end
+
         # Calling query with no filters is more efficiently handled by a primary index scan.
         # Estimate scan options size.
         @data_offset += (2 + FIELD_HEADER_SIZE)
@@ -92,6 +98,15 @@ module Aerospike
       @data_offset += 8 + FIELD_HEADER_SIZE
       fieldCount+=1
 
+      predexp = @policy.predexp || @statement.predexp
+
+      if predexp
+        @data_offset += FIELD_HEADER_SIZE
+        predSize = Aerospike::PredExp.estimate_size(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
@@ -162,6 +177,10 @@ module Aerospike
           end
         end
       else
+        if @policy.records_per_second > 0
+          write_field_int(@policy.records_per_second, Aerospike::FieldType::RECORDS_PER_SECOND)
+        end
+
         # Calling query with no filters is more efficiently handled by a primary index scan.
         write_field_header(2, Aerospike::FieldType::SCAN_OPTIONS)
         priority = @policy.priority.ord
@@ -176,6 +195,13 @@ module Aerospike
       @data_buffer.write_int64(@statement.task_id, @data_offset)
       @data_offset += 8
 
+      if predexp
+        write_field_header(predSize, Aerospike::FieldType::PREDEXP)
+        @data_offset = Aerospike::PredExp.write(
+          predexp, @data_buffer, @data_offset
+        )
+      end
+
       if @statement.function_name
         write_field_header(1, Aerospike::FieldType::UDF_OP)
         if @statement.return_data