aerospike 2.9.0 → 2.13.0

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

data/lib/aerospike/query/recordset.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.
@@ -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/scan_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.

data/lib/aerospike/query/statement.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.
@@ -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,16 @@ module Aerospike
       # aggregation function.
       @filters = []
 
+      # Predicate expressions in postfix notation. If the expression is evaluated to false,
+      # the record will be ommited in the results.
+      #
+      # This method is redundant because PredExp can now be set in the base Policy for
+      # any transaction (including queries).
+      #
+      # NOTE : Policy.predexp takes precedence to this value. This value will be 
+      # deprecated in the future.
+      @predexp = nil
+
       @package_name  = nil
       @function_name = nil
       @function_args = nil
@@ -76,5 +86,4 @@ module Aerospike
   RAND_MAX = 2**63
 
   end # class
-
 end

data/lib/aerospike/query/stream_command.rb

@@ -1,4 +1,4 @@
-# Copyright 2014-2018 Aerospike, Inc.
+# Copyright 2014-2020 Aerospike, Inc.
 #
 # Portions may be licensed to Aerospike, Inc. under one or more contributor
 # license agreements.
@@ -36,15 +36,14 @@ module Aerospike
 
         # The only valid server return codes are "ok" and "not found".
         # If other return codes are received, then abort the batch.
-        if result_code != 0
-          # 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
+        case result_code
+        when Aerospike::ResultCode::OK
+          # noop
+        when 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
+        else
           raise Aerospike::Exceptions::Aerospike.new(result_code)
         end
 

data/lib/aerospike/record.rb

@@ -1,4 +1,4 @@
-# Copyright 2014-2018 Aerospike, Inc.
+# Copyright 2014-2020 Aerospike, Inc.
 #
 # Portions may be licensed to Aerospike, Inc. under one or more contributor
 # license agreements.

data/lib/aerospike/result_code.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.
@@ -60,10 +60,6 @@ module Aerospike
     # exists.
     KEY_EXISTS_ERROR = 5
 
-    # On create-only (write unique) operations on a bin that already
-    # exists.
-    BIN_EXISTS_ERROR = 6
-
     # Expected cluster ID was not received.
     CLUSTER_KEY_MISMATCH = 7
 
@@ -95,9 +91,6 @@ module Aerospike
     # Unsupported Server Feature (e.g. Scan + UDF)
     UNSUPPORTED_FEATURE = 16
 
-    # Specified bin name does not exist in record.
-    BIN_NOT_FOUND = 17
-
     # Specified bin name does not exist in record.
     DEVICE_OVERLOAD = 18
 
@@ -123,6 +116,12 @@ module Aerospike
     # Enterprise-only feature not supported by the community edition
     ENTERPRISE_ONLY = 25
 
+    # The operation cannot be applied to the current bin value on the server.
+    OP_NOT_APPLICABLE = 26
+
+    # The transaction was not performed because the predexp was false.
+    FILTERED_OUT = 27
+
     # There are no more records left for query.
     QUERY_END = 50
 
@@ -174,9 +173,6 @@ module Aerospike
     # A user defined function returned an error code.
     UDF_BAD_RESPONSE = 100
 
-    # The requested item in a large collection was not found.
-    LARGE_ITEM_NOT_FOUND = 125
-
     # Secondary index already exists.
     INDEX_FOUND = 200
 
@@ -248,9 +244,6 @@ module Aerospike
       when KEY_EXISTS_ERROR
         "Key already exists"
 
-      when BIN_EXISTS_ERROR
-        "Bin already exists"
-
       when CLUSTER_KEY_MISMATCH
         "Cluster key mismatch"
 
@@ -281,9 +274,6 @@ module Aerospike
       when UNSUPPORTED_FEATURE
         "Unsupported Server Feature"
 
-      when BIN_NOT_FOUND
-        "Bin not found"
-
       when DEVICE_OVERLOAD
         "Device overload"
 
@@ -308,6 +298,12 @@ module Aerospike
       when ENTERPRISE_ONLY
         "Enterprise-only feature not supported by community edition"
 
+      when OP_NOT_APPLICABLE
+        "The operation cannot be applied to the current bin value on the server."
+
+      when FILTERED_OUT
+        "The transaction was not performed because the predexp was false."
+
       when QUERY_END
         "Query end"
 
@@ -365,9 +361,6 @@ module Aerospike
       when UDF_BAD_RESPONSE
         "UDF d error"
 
-      when LARGE_ITEM_NOT_FOUND
-         "Large collection item not found"
-
       when INDEX_FOUND
         "Index already exists"
 

data/lib/aerospike/socket/base.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright 2014-2018 Aerospike, Inc.
+# Copyright 2014-2020 Aerospike, Inc.
 #
 # Portions may be licensed to Aerospike, Inc. under one or more contributor
 # license agreements.

data/lib/aerospike/task/execute_task.rb

@@ -1,4 +1,4 @@
-# Copyright 2013-2017 Aerospike, Inc.
+# Copyright 2013-2020 Aerospike, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/aerospike/task/index_task.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/task/task.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/task/udf_register_task.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/task/udf_remove_task.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/ttl.rb

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

data/lib/aerospike/udf.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/user_role.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/utils/buffer.rb

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

data/lib/aerospike/utils/packer.rb

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

data/lib/aerospike/utils/pool.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# Copyright 2014-2018 Aerospike, Inc.
+# Copyright 2014-2020 Aerospike, Inc.
 #
 # Portions may be licensed to Aerospike, Inc. under one or more contributor
 # license agreements.

data/lib/aerospike/utils/unpacker.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-# Copyright 2016-2018 Aerospike, Inc.
+# Copyright 2016-2020 Aerospike, Inc.
 #
 # Portions may be licensed to Aerospike, Inc. under one or more contributor
 # license agreements.
@@ -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/value/particle_type.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-# Copyright 2014-2017 Aerospike, Inc.
+# Copyright 2014-2020 Aerospike, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License")
 # you may not use this file except in compliance with the License.

data/lib/aerospike/value/value.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-# Copyright 2014-2018 Aerospike, Inc.
+# Copyright 2014-2020 Aerospike, Inc.
 #
 # Portions may be licensed to Aerospike, Inc. under one or more contributor
 # license agreements.
@@ -22,14 +22,11 @@ require 'aerospike/aerospike_exception'
 module Aerospike
   # Polymorphic value classes used to efficiently serialize objects into the wire protocol.
   class Value #:nodoc:
-    INTEGER_RANGE = Range.new(-2**63, 2**63 - 1).freeze
 
     def self.of(value)
       case value
-      when nil
-        res = NULL
       when Integer
-        if INTEGER_RANGE.cover?(value)
+        if value.bit_length < 64
           res = IntegerValue.new(value)
         else
           # big nums > 2**63 are not supported
@@ -49,6 +46,8 @@ module Aerospike
         res = ListValue.new(value)
       when GeoJSON
         res = GeoJSONValue.new(value)
+      when nil
+        res = NULL
       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.")
@@ -57,6 +56,22 @@ module Aerospike
       res
     end
 
+    def self.validate_hash_key(value)
+      case value
+      when Integer
+        if value.bit_length >= 64
+          raise Aerospike::Exceptions::Aerospike.new(Aerospike::ResultCode::TYPE_NOT_SUPPORTED, "Value type #{value.class} not supported as hash key.")
+        end
+      when Float
+      when String
+      when Symbol
+      when nil
+      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 as hash key.")
+      end
+    end
+
   end # Value
 
   # Empty value.
@@ -137,7 +152,7 @@ module Aerospike
     end
   end
 
-  INFINITY = InfinityValue.new.freeze
+  INFINITY = Value::INFINITY = InfinityValue.new.freeze
 
   # Wildcard value.
   class WildcardValue < Value #:nodoc:
@@ -178,7 +193,7 @@ module Aerospike
     end
   end
 
-  WILDCARD = WildcardValue.new.freeze
+  WILDCARD = Value::WILDCARD = WildcardValue.new.freeze
 
   # Byte array value.
   class BytesValue < Value #:nodoc:
@@ -356,21 +371,16 @@ module Aerospike
   class ListValue < Value #:nodoc:
 
     def initialize(list)
-      @list = list || nil
-      Packer.use do |packer|
-        pack(packer)
-        @bytes = packer.bytes
-      end
-      self
+      @list = list || []
     end
 
     def estimate_size
-      @bytes.bytesize
+      bytes.bytesize
     end
 
     def write(buffer, offset)
-      buffer.write_binary(@bytes, offset)
-      @bytes.bytesize
+      buffer.write_binary(bytes, offset)
+      bytes.bytesize
     end
 
     def pack(packer)
@@ -389,13 +399,26 @@ module Aerospike
     end
 
     def to_bytes
-      @bytes
+      bytes
     end
 
     def to_s
       @list.map{|v| v.to_s}.to_s
     end
 
+    private
+
+    def bytes
+      return @bytes if @bytes
+
+      Packer.use do |packer|
+        pack(packer)
+        @bytes = packer.bytes
+      end
+
+      @bytes
+    end
+
   end
 
   # #######################################/
@@ -406,28 +429,22 @@ module Aerospike
 
     def initialize(vmap)
       @vmap = vmap || {}
-
-      Packer.use do |packer|
-        pack(packer)
-        @bytes = packer.bytes
-      end
-
-      self
     end
 
     def estimate_size
-      @bytes.bytesize
+      bytes.bytesize
     end
 
     def write(buffer, offset)
-      buffer.write_binary(@bytes, offset)
-      @bytes.bytesize
+      buffer.write_binary(bytes, offset)
+      bytes.bytesize
     end
 
     def pack(packer)
       packer.write_map_header(@vmap.length)
-      # @vmap.each do |key, val|
       for key, val in @vmap
+        Value.validate_hash_key(key)
+
         Value.of(key).pack(packer)
         Value.of(val).pack(packer)
       end
@@ -442,13 +459,26 @@ module Aerospike
     end
 
     def to_bytes
-      @bytes
+      bytes
     end
 
     def to_s
       @vmap.map{|k, v| "#{k.to_s} => #{v.to_s}" }.to_s
     end
 
+    private
+
+    def bytes
+      return @bytes if @bytes
+
+      Packer.use do |packer|
+        pack(packer)
+        @bytes = packer.bytes
+      end
+
+      @bytes
+    end
+
   end
 
   # #######################################/