aerospike 1.0.12 → 2.0.0

data/lib/aerospike/command/command.rb

@@ -56,7 +56,7 @@ module Aerospike
   # This is the last of a multi-part message.
   INFO3_LAST = Integer(1 << 0)
   # Commit to master only before declaring success.
-  INFO3_COMMIT_MASTER = Integer(1 << 1)  
+  INFO3_COMMIT_MASTER = Integer(1 << 1)
   # Update only. Merge bins.
   INFO3_UPDATE_ONLY = Integer(1 << 3)
 
@@ -460,7 +460,7 @@ module Aerospike
             else
               Aerospike.logger.error(e)
             end
-            
+
             # close the connection
             # cancelling/closing the batch/multi commands will return an error, which will
             # close the connection to throw away its data and signal the server about the

data/lib/aerospike/command/roles.rb

@@ -16,24 +16,24 @@
 
 module Aerospike
 
-	# Pre-defined user roles.
-	module Role
+  # Pre-defined user roles.
+  module Role
 
-		 # Manage users and their roles.
-		 USER_ADMIN = 'user-admin'
+    # Manage users and their roles.
+    USER_ADMIN = 'user-admin'
 
-		 # Manage indicies, user-defined functions and server configuration.
-		 SYS_ADMIN = 'sys-admin'
+    # 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, 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'
+    # Allow read and write transactions with the database.
+    READ_WRITE = 'read-write'
 
-		 # Allow read transactions with the database.
-		 READ = 'read'
+    # Allow read transactions with the database.
+    READ = 'read'
 
-	end # module
+  end # module
 
 end # module

data/lib/aerospike/key.rb

@@ -17,6 +17,7 @@
 require 'digest'
 
 require 'aerospike/value/value'
+require 'aerospike/utils/pool'
 
 module Aerospike
 
@@ -24,20 +25,31 @@ module Aerospike
 
     @@digest_pool = Pool.new
     @@digest_pool.create_block = Proc.new do
-      unless RUBY_PLATFORM == 'java'
-        Digest::RMD160.new
+      if RUBY_PLATFORM == 'java'
+        OpenSSL::Digest::RIPEMD160.new
       else
-        h = OpenSSL::Digest::RIPEMD160.new
+        Digest::RMD160.new
       end
     end
 
+    # enable backwards compatibility with v1 client for integer keys
+    # ref. https://github.com/aerospike/aerospike-client-ruby/pull/34
+    def self.enable_v1_compatibility!(comp = true)
+      @v1_compatibility = !!comp
+    end
+    def self.v1_compatible?
+      @v1_compatibility
+    end
 
     attr_reader :namespace, :set_name, :digest
+    attr_reader :v1_compatible
+    alias_method :v1_compatible?, :v1_compatible
 
-    def initialize(ns, set, val, digest=nil)
+    def initialize(ns, set, val, digest=nil, v1_compatible: self.class.v1_compatible?)
       @namespace = ns
       @set_name = set
       @user_key = Value.of(val)
+      @v1_compatible = v1_compatible
 
       unless digest
         compute_digest
@@ -48,6 +60,7 @@ module Aerospike
       self
     end
 
+
     def to_s
       "#{@namespace}:#{@set_name}:#{@user_key}:#{@digest.nil? ? '' : @digest.bytes}"
     end
@@ -75,11 +88,17 @@ module Aerospike
 
     def compute_digest
       key_type = @user_key.type
+      key_bytes = @user_key.to_bytes
 
       if key_type == Aerospike::ParticleType::NULL
         raise Aerospike::Exceptions::Aerospike.new(Aerospike::ResultCode::PARAMETER_ERROR, "Invalid key: nil")
       end
 
+      # v1.0.12 and prior computed integer key digest using little endian byte order
+      if key_type == Aerospike::ParticleType::INTEGER && v1_compatible?
+        key_bytes.reverse!
+      end
+
       # get a hash from pool and make it ready for work
       h = @@digest_pool.poll
       h.reset
@@ -87,7 +106,7 @@ module Aerospike
       # Compute a complete digest
       h.update(@set_name)
       h.update(key_type.chr)
-      h.update(@user_key.to_bytes)
+      h.update(key_bytes)
       @digest = h.digest
 
       # put the hash object back to the pool

data/lib/aerospike/operation.rb

@@ -25,6 +25,8 @@ module Aerospike
     READ        = 1
     READ_HEADER = 1
     WRITE       = 2
+    CDT_READ    = 3
+    CDT_MODIFY  = 4
     ADD         = 5
     APPEND      = 9
     PREPEND     = 10

data/lib/aerospike/policy/admin_policy.rb

@@ -16,18 +16,18 @@
 
 module Aerospike
 
-	# Policy attributes used for user administration commands.
-	class AdminPolicy
+  # Policy attributes used for user administration commands.
+  class AdminPolicy
 
-		# User administration command socket timeout in milliseconds.
-		# Default is one second timeout.
-		attr_accessor :timeout
+    # User administration command socket timeout in milliseconds.
+    # Default is one second timeout.
+    attr_accessor :timeout
 
-		# NewAdminPolicy generates a new AdminPolicy with default values.
-		def initialize(opt={})
-			@timeout = opt[:timeout] || 1
-		end
+    # NewAdminPolicy generates a new AdminPolicy with default values.
+    def initialize(opt={})
+      @timeout = opt[:timeout] || 1
+    end
 
-	end # class
+  end # class
 
 end # module

data/lib/aerospike/policy/consistency_level.rb

@@ -17,11 +17,11 @@ module Aerospike
 
   module ConsistencyLevel
 
-	# Involve a single replica in the operation.
-	CONSISTENCY_ONE = 0
+    # Involve a single replica in the operation.
+    CONSISTENCY_ONE = 0
 
-	# Involve all replicas in the operation.
-	CONSISTENCY_ALL = 1
+    # Involve all replicas in the operation.
+    CONSISTENCY_ALL = 1
 
   end # module
 

data/lib/aerospike/query/stream_command.rb

@@ -40,7 +40,7 @@ module Aerospike
           # 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
+            read_bytes(receive_size - @data_offset) if @data_offset < receive_size
 
             return nil
           end

data/lib/aerospike/result_code.rb

@@ -365,7 +365,7 @@ module Aerospike
         "Index not readable"
 
       when INDEX_GENERIC
-        "Index error"
+        "Index error - check server logs"
 
       when INDEX_NAME_MAXLEN
         "Index name max length exceeded"

data/lib/aerospike/task/execute_task.rb

@@ -14,72 +14,72 @@
 
 module Aerospike
 
-	private
-
-	# ExecuteTask is used to poll for long running server execute job completion.
-	class ExecuteTask < Task
-
-		# NewExecuteTask initializes task with fields needed to query server nodes.
-		def initialize(cluster, statement)
-			super(cluster, false)
-
-			@task_id = statement.task_id
-			@scan = statement.is_scan?
-
-			self
-		end
-
-		# IsDone queries all nodes for task completion status.
-		def all_nodes_done?
-
-			if @scan 
-				command = 'scan-list'
-			else 
-				command = 'query-list'
-			end
-
-			nodes = @cluster.nodes
-			done = false
-
-			nodes.each do |node|
-				conn = node.get_connection(0)
-				responseMap, err = Info.request(conn, command)
-				node.put_connection(conn)
-
-				response = responseMap[command]
-				find = "job_id=#{@task_id}:"
-				index = response.index(find)
-
-				unless index
-					# don't return on first check
-					done = true
-					next
-				end
-
-				b = index + find.length
-				response = response[b, response.length]
-				find = 'job_status='
-				index = response.index(find)
-
-				next unless index
-
-				b = index + find.length
-				response = response[b, response.length]
-				e = response.index(':')
-				status = response[0, e]
-
-				case status 
-				when 'ABORTED'
-					raise raise Aerospike::Exceptions::QueryTerminated
-				when 'IN PROGRESS'
-					return false
-				when 'DONE'
-					done = true
-				end
-			end
-
-			done
-		end
-
-	end
+  private
+
+  # ExecuteTask is used to poll for long running server execute job completion.
+  class ExecuteTask < Task
+
+    # NewExecuteTask initializes task with fields needed to query server nodes.
+    def initialize(cluster, statement)
+      super(cluster, false)
+
+      @task_id = statement.task_id
+      @scan = statement.is_scan?
+
+      self
+    end
+
+    # IsDone queries all nodes for task completion status.
+    def all_nodes_done?
+
+      if @scan
+        command = 'scan-list'
+      else
+        command = 'query-list'
+      end
+
+      nodes = @cluster.nodes
+      done = false
+
+      nodes.each do |node|
+        conn = node.get_connection(0)
+        responseMap, _ = Info.request(conn, command)
+        node.put_connection(conn)
+
+        response = responseMap[command]
+        find = "job_id=#{@task_id}:"
+        index = response.index(find)
+
+        unless index
+          # don't return on first check
+          done = true
+          next
+        end
+
+        b = index + find.length
+        response = response[b, response.length]
+        find = 'job_status='
+        index = response.index(find)
+
+        next unless index
+
+        b = index + find.length
+        response = response[b, response.length]
+        e = response.index(':')
+        status = response[0, e]
+
+        case status
+        when 'ABORTED'
+          raise raise Aerospike::Exceptions::QueryTerminated
+        when 'IN PROGRESS'
+          return false
+        when 'DONE'
+          done = true
+        end
+      end
+
+      done
+    end
+
+  end
 end

data/lib/aerospike/task/task.rb

@@ -38,7 +38,7 @@ module Aerospike
       # make sure there will be only ONE thread polling for completetion status
       @done_thread.update do |dt|
         dt ? dt : Thread.new do
-          abort_on_exception=true
+          Thread.current.abort_on_exception = true
           failures = 0
           while true
             begin
@@ -60,11 +60,7 @@ module Aerospike
     end
 
     def completed?
-      if @done.value == true
-        true
-      else
-        @done.value = all_nodes_done?
-      end
+      @done.value ||= all_nodes_done?
     end
 
   end # class

data/lib/aerospike/utils/packer.rb

@@ -0,0 +1,47 @@
+# encoding: utf-8
+# Copyright 2016 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 'msgpack'
+require 'aerospike/utils/pool'
+
+module Aerospike
+
+  private
+
+  class Packer < MessagePack::Packer #:nodoc:
+
+    @@pool = Pool.new
+    @@pool.create_block = Proc.new { Packer.new }
+
+    def self.use
+      packer = @@pool.poll
+      packer.clear
+      yield packer
+    ensure
+      @@pool.offer(packer)
+    end
+
+    # WARNING: This method is not compatible with message pack standard.
+    def write_raw_short(val)
+      buffer << [val].pack("S>")
+    end
+
+    def bytes
+      self.to_s.force_encoding('binary')
+    end
+  end
+
+end

data/lib/aerospike/utils/unpacker.rb

@@ -0,0 +1,106 @@
+# encoding: utf-8
+# Copyright 2016 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 'msgpack'
+require 'aerospike/utils/pool'
+
+module Aerospike
+
+  private
+
+  class Unpacker
+
+    @@pool = Pool.new
+    @@pool.create_block = Proc.new { Unpacker.new }
+
+    def self.use
+      unpacker = @@pool.poll
+      unpacker.reset
+      yield unpacker
+    ensure
+      @@pool.offer(unpacker)
+    end
+
+    MsgPackExt = Struct.new(:type, :data)
+    MsgPackExt::TYPES = [
+             # Map Create Flags:
+      0x00,  # UNORDERED
+      0x01,  # K_ORDERED
+      0x03,  # KV_ORDERED
+      0x08,  # PRESERVE_ORDER
+    ]
+
+    def initialize
+      @unpacker = MessagePack::Unpacker.new
+      MsgPackExt::TYPES.each do |type|
+        @unpacker.register_type(type) { |data| MsgPackExt.new(type, data) }
+      end
+    end
+
+    def unpack(bytes)
+      obj = @unpacker.feed(bytes).read
+      case obj
+      when Array then unpack_list(obj)
+      when Hash  then unpack_map(obj)
+      else obj
+      end
+    end
+
+    def reset
+      @unpacker.reset
+    end
+
+    private
+
+    def unpack_list(array)
+      normalize_strings_in_array(array)
+    end
+
+    def unpack_map(hash)
+      hash = normalize_strings_in_map(hash)
+      if hash.any?
+        (key, _) = hash.first
+        hash.shift if MsgPackExt === key
+      end
+      hash
+    end
+
+    def normalize_elem(elem)
+      case elem
+      when String
+       elem[1..-1].encode(Aerospike.encoding)
+      when Array
+        normalize_strings_in_array(elem)
+      when Hash
+        normalize_strings_in_map(elem)
+      else
+        elem
+      end
+    end
+
+    def normalize_strings_in_array(arr)
+      arr.map! { |elem| normalize_elem(elem) }
+    end
+
+    def normalize_strings_in_map(hash)
+      hash.inject({}) do |h, (k,v)|
+        h.update({ normalize_elem(k) => normalize_elem(v) })
+      end
+    end
+
+  end
+
+end