aerospike 2.23.0 → 2.25.0

data/lib/aerospike/task/execute_task.rb

@@ -13,7 +13,6 @@
 # limitations under the License.
 
 module Aerospike
-
   private
 
   # ExecuteTask is used to poll for long running server execute job completion.
@@ -29,19 +28,24 @@ module Aerospike
       self
     end
 
-    # IsDone queries all nodes for task completion status.
+    # queries all nodes for task completion status.
     def all_nodes_done?
-
-      if @scan
-        command = 'scan-list'
-      else
-        command = 'query-list'
-      end
+      modul = @scan ? "scan" : "query"
+      cmd1 = "query-show:trid=#{@task_id}"
+      cmd2 = modul + "-show:trid=#{@task_id}"
+      cmd3 = "jobs:module=" + modul + ";cmd=get-job;trid=#{@task_id}"
 
       nodes = @cluster.nodes
       done = false
 
       nodes.each do |node|
+        command = cmd3
+        if node.supports_feature?(Aerospike::Features::PARTITION_QUERY)
+          command = cmd1
+        elsif node.supports_feature?(Aerospike::Features::QUERY_SHOW)
+          command = cmd2
+        end
+
         conn = node.get_connection(0)
         responseMap, _ = Info.request(conn, command)
         node.put_connection(conn)
@@ -58,28 +62,27 @@ module Aerospike
 
         b = index + find.length
         response = response[b, response.length]
-        find = 'job_status='
+        find = "job_status="
         index = response.index(find)
 
         next unless index
 
         b = index + find.length
         response = response[b, response.length]
-        e = response.index(':')
+        e = response.index(":")
         status = response[0, e]
 
         case status
-        when 'ABORTED'
+        when "ABORTED"
           raise Aerospike::Exceptions::QueryTerminated
-        when 'IN PROGRESS'
+        when "IN PROGRESS"
           return false
-        when 'DONE'
+        when "DONE"
           done = true
         end
       end
 
       done
     end
-
   end
 end

data/lib/aerospike/utils/buffer.rb

@@ -17,36 +17,34 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-require 'aerospike/utils/pool'
+require "aerospike/utils/pool"
 
 module Aerospike
-
   private
 
   # Buffer class to ease the work around
   class Buffer #:nodoc:
-
     @@buf_pool = Pool.new
     @@buf_pool.create_proc = Proc.new { Buffer.new }
 
     attr_accessor :buf
 
-    INT16 = 's>'
-    UINT16 = 'n'
-    UINT16LE = 'v'
-    INT32 = 'l>'
-    UINT32 = 'N'
-    INT64 = 'q>'
-    UINT64 = 'Q>'
-    UINT64LE = 'Q'
-    DOUBLE = 'G'
+    INT16 = "s>"
+    UINT16 = "n"
+    UINT16LE = "v"
+    INT32 = "l>"
+    UINT32 = "N"
+    INT64 = "q>"
+    UINT64 = "Q>"
+    UINT64LE = "Q"
+    DOUBLE = "G"
 
     DEFAULT_BUFFER_SIZE = 16 * 1024
     MAX_BUFFER_SIZE = 10 * 1024 * 1024
 
-    def initialize(size=DEFAULT_BUFFER_SIZE, buf = nil)
+    def initialize(size = DEFAULT_BUFFER_SIZE, buf = nil)
       @buf = (buf ? buf : ("%0#{size}d" % 0))
-      @buf.force_encoding('binary')
+      @buf.force_encoding("binary")
       @slice_end = @buf.bytesize
     end
 
@@ -61,6 +59,7 @@ module Aerospike
     def size
       @buf.bytesize
     end
+
     alias_method :length, :size
 
     def eat!(n)
@@ -125,12 +124,17 @@ module Aerospike
       8
     end
 
+    def write_uint64_little_endian(i, offset)
+      @buf[offset, 8] = [i].pack(UINT64LE)
+      8
+    end
+
     def write_double(f, offset)
       @buf[offset, 8] = [f].pack(DOUBLE)
       8
     end
 
-    def read(offset, len=nil)
+    def read(offset, len = nil)
       if len
         @buf[offset, len]
       else
@@ -139,37 +143,37 @@ module Aerospike
     end
 
     def read_int16(offset)
-      vals = @buf[offset..offset+1]
+      vals = @buf[offset..offset + 1]
       vals.unpack(INT16)[0]
     end
 
     def read_uint16(offset)
-      vals = @buf[offset..offset+1]
+      vals = @buf[offset..offset + 1]
       vals.unpack(UINT16)[0]
     end
 
     def read_int32(offset)
-      vals = @buf[offset..offset+3]
+      vals = @buf[offset..offset + 3]
       vals.unpack(INT32)[0]
     end
 
     def read_uint32(offset)
-      vals = @buf[offset..offset+3]
+      vals = @buf[offset..offset + 3]
       vals.unpack(UINT32)[0]
     end
 
     def read_int64(offset)
-      vals = @buf[offset..offset+7]
+      vals = @buf[offset..offset + 7]
       vals.unpack(INT64)[0]
     end
 
     def read_uint64_little_endian(offset)
-      vals = @buf[offset..offset+7]
+      vals = @buf[offset..offset + 7]
       vals.unpack(UINT64LE)[0]
     end
 
     def read_uint64(offset)
-      vals = @buf[offset..offset+7]
+      vals = @buf[offset..offset + 7]
       vals.unpack(UINT64)[0]
     end
 
@@ -178,14 +182,14 @@ module Aerospike
       i = 0
       while i < len
         val <<= 8
-        val |= @buf[offset+i].ord & 0xFF
+        val |= @buf[offset + i].ord & 0xFF
         i = i.succ
       end
       val
     end
 
     def read_double(offset)
-      vals = @buf[offset..offset+7]
+      vals = @buf[offset..offset + 7]
       vals.unpack(DOUBLE)[0]
     end
 
@@ -194,25 +198,48 @@ module Aerospike
     end
 
     def to_s
-      @buf[0..@slice_end-1]
+      @buf[0..@slice_end - 1]
     end
 
     def reset
-      for i in 0..@buf.size-1
-        @buf[i] = ' '
+      for i in 0..@buf.size - 1
+        @buf[i] = " "
       end
     end
 
-    def dump(from=nil, to=nil)
-      from ||= 0
-      to ||= @slice_end - 1
+    def dump(start = 0, finish = nil)
+      buf ||= @buf.bytes
+      finish ||= @slice_end - 1
+      width = 16
+
+      ascii = "|"
+      counter = 0
+
+      print "%08x  " % start
+      @buf.bytes[start...finish].each do |c|
+        if counter >= start
+          print "%02x " % c
+          ascii << (c.between?(32, 126) ? c : ?.)
+          print " " if ascii.length == (width / 2 + 1)
+          if ascii.length > width
+            ascii << "|"
+            puts ascii
+            ascii = "|"
+            print "%08x  " % (counter + 1)
+          end
+        end
+        counter += 1
+      end
 
-      @buf.bytes[from...to].each do |c|
-        print c.ord.to_s(16)
-        putc ' '
+      # print the remainder in buffer
+      if ascii.length.positive?
+        fill_size = ((width - ascii.length + 1) * 3)
+        fill_size += 1 if ascii.length <= (width / 2)
+        filler = " " * fill_size
+        print filler
+        ascii << "|"
+        puts ascii
       end
     end
-
   end # buffer
-
 end # module

data/lib/aerospike/utils/packer.rb

@@ -14,13 +14,11 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-require 'msgpack'
-require 'aerospike/utils/pool'
+require "msgpack"
+require "aerospike/utils/pool"
 
 module Aerospike
-
   class Packer < MessagePack::Packer #:nodoc:
-
     AS_EXT_TYPE = -1
 
     @@pool = Pool.new
@@ -44,9 +42,12 @@ module Aerospike
       buffer << [val].pack("S>")
     end
 
+    def write_raw(buf)
+      buffer.write(buf)
+    end
+
     def bytes
-      self.to_s.force_encoding('binary')
+      self.to_s.force_encoding("binary")
     end
   end
-
 end

data/lib/aerospike/value/value.rb

@@ -17,12 +17,11 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-require 'aerospike/aerospike_exception'
+require "aerospike/aerospike_exception"
 
 module Aerospike
   # Polymorphic value classes used to efficiently serialize objects into the wire protocol.
   class Value #:nodoc:
-
     def self.of(value, allow_64bits = false)
       case value
       when Integer
@@ -83,12 +82,10 @@ module Aerospike
         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.
   class NullValue < Value #:nodoc:
-
     def initialize
       self
     end
@@ -102,7 +99,7 @@ module Aerospike
     end
 
     def to_s
-      ''
+      ""
     end
 
     def estimate_size
@@ -118,13 +115,12 @@ module Aerospike
     end
 
     def to_bytes
-      ''
+      ""
     end
   end
 
   NULL = NullValue.new.freeze
 
-
   # Infinity value.
   class InfinityValue < Value #:nodoc:
     def initialize
@@ -156,7 +152,7 @@ module Aerospike
     end
 
     def to_bytes
-      ''
+      ""
     end
 
     def to_msgpack_ext
@@ -197,7 +193,7 @@ module Aerospike
     end
 
     def to_bytes
-      ''
+      ""
     end
 
     def to_msgpack_ext
@@ -209,10 +205,9 @@ module Aerospike
 
   # Byte array value.
   class BytesValue < Value #:nodoc:
-
     def initialize(value)
       @bytes = value
-      @bytes.force_encoding('binary')
+      @bytes.force_encoding("binary")
 
       self
     end
@@ -244,16 +239,14 @@ module Aerospike
     def pack(packer)
       packer.write(Aerospike::ParticleType::BLOB.chr + @bytes)
     end
-
   end # BytesValue
 
   #######################################
 
   # value string.
   class StringValue < Value #:nodoc:
-
     def initialize(val)
-      @value = val || ''
+      @value = val || ""
       self
     end
 
@@ -289,14 +282,12 @@ module Aerospike
     def to_sym
       @value.to_sym
     end
-
   end # StringValue
 
   #######################################
 
   # Integer value.
   class IntegerValue < Value #:nodoc:
-
     def initialize(val)
       @value = val || 0
       self
@@ -326,20 +317,18 @@ module Aerospike
     def to_bytes
       # Convert integer to big endian unsigned 64 bits.
       # @see http://ruby-doc.org/core-2.3.0/Array.html#method-i-pack
-      [@value].pack('Q>')
+      [@value].pack("Q>")
     end
 
     def to_s
       @value.to_s
     end
-
   end # IntegerValue
 
   #######################################
 
   # Float value.
   class FloatValue < Value #:nodoc:
-
     def initialize(val)
       @value = val || 0.0
       self
@@ -367,13 +356,12 @@ module Aerospike
     end
 
     def to_bytes
-      [@value].pack('G')
+      [@value].pack("G")
     end
 
     def to_s
       @value.to_s
     end
-
   end # FloatValue
 
   #######################################
@@ -381,7 +369,6 @@ module Aerospike
   # List value.
   # Supported by Aerospike 3 servers only.
   class ListValue < Value #:nodoc:
-
     def initialize(list)
       @list = list || []
     end
@@ -415,7 +402,7 @@ module Aerospike
     end
 
     def to_s
-      @list.map{|v| v.to_s}.to_s
+      @list.map { |v| v.to_s }.to_s
     end
 
     private
@@ -430,15 +417,13 @@ module Aerospike
 
       @bytes
     end
-
   end
 
   # #######################################/
 
   # Map value.
-  # Supported by Aerospike 3 servers only.
+  # Supported by Aerospike 3+ servers only.
   class MapValue < Value #:nodoc:
-
     def initialize(vmap)
       @vmap = vmap || {}
     end
@@ -475,7 +460,7 @@ module Aerospike
     end
 
     def to_s
-      @vmap.map{|k, v| "#{k.to_s} => #{v.to_s}" }.to_s
+      @vmap.map { |k, v| "#{k.to_s} => #{v.to_s}" }.to_s
     end
 
     private
@@ -490,7 +475,6 @@ module Aerospike
 
       @bytes
     end
-
   end
 
   # #######################################/
@@ -498,7 +482,6 @@ module Aerospike
   # GeoJSON value.
   # Supported by Aerospike server version 3.7 and later.
   class GeoJSONValue < Value #:nodoc:
-
     def initialize(json)
       @json = json
       @bytes = json.to_json
@@ -535,7 +518,6 @@ module Aerospike
     def to_s
       @json
     end
-
   end
 
   # #######################################/
@@ -543,14 +525,19 @@ module Aerospike
   # HLLValue value. Encapsulates a HyperLogLog value.
   # Supported by Aerospike server version 4.9 and later.
   class HLLValue < Value #:nodoc:
+    attr_reader :bytes
 
     def initialize(value)
       @bytes = value
-      @bytes.force_encoding('binary')
+      @bytes.force_encoding("binary")
 
       self
     end
 
+    def ==(other)
+      @bytes.to_s == other.to_s
+    end
+
     def type
       Aerospike::ParticleType::HLL
     end
@@ -578,7 +565,6 @@ module Aerospike
     def pack(packer)
       packer.write(Aerospike::ParticleType::BLOB.chr + @bytes)
     end
-
   end
 
   #######################################
@@ -594,63 +580,49 @@ module Aerospike
   protected
 
   def self.bytes_to_particle(type, buf, offset, length) # :nodoc:
-
     case type
     when Aerospike::ParticleType::STRING
       bytes = buf.read(offset, length)
       bytes.force_encoding(Aerospike.encoding)
-
     when Aerospike::ParticleType::INTEGER
       buf.read_int64(offset)
-
     when Aerospike::ParticleType::DOUBLE
       buf.read_double(offset)
-
     when Aerospike::ParticleType::BOOL
       buf.read_bool(offset, length)
-
     when Aerospike::ParticleType::BLOB
-      buf.read(offset,length)
-
+      buf.read(offset, length)
     when Aerospike::ParticleType::LIST
       Unpacker.use do |unpacker|
         data = buf.read(offset, length)
         unpacker.unpack(data)
       end
-
     when Aerospike::ParticleType::MAP
       Unpacker.use do |unpacker|
         data = buf.read(offset, length)
         unpacker.unpack(data)
       end
-
     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))
-
     when Aerospike::ParticleType::HLL
-      bytes = buf.read(offset,length)
+      bytes = buf.read(offset, length)
       Aerospike::HLLValue.new(bytes)
-
     else
       nil
     end
   end
 
   def self.bytes_to_key_value(type, buf, offset, len) # :nodoc:
-
     case type
     when Aerospike::ParticleType::STRING
       StringValue.new(buf.read(offset, len))
-
     when Aerospike::ParticleType::INTEGER
       IntegerValue.new(buf.read_var_int64(offset, len))
-
     when Aerospike::ParticleType::BLOB
-      BytesValue.new(buf.read(offset,len))
-
+      BytesValue.new(buf.read(offset, len))
     else
       nil
     end
@@ -663,7 +635,6 @@ module Aerospike
   # Boolean value.
   # Supported by Aerospike server 5.6+ only.
   class BoolValue < Value #:nodoc:
-
     def initialize(val)
       @value = val || false
       self
@@ -698,6 +669,5 @@ module Aerospike
     def to_s
       @value.to_s
     end
-
   end # BoolValue
 end # module

data/lib/aerospike/version.rb

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