aerospike 0.1.3 → 0.1.5

data/lib/aerospike/cluster/node.rb

@@ -14,7 +14,7 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
-require 'atomic'
+require 'aerospike/atomic/atomic'
 
 module Aerospike
 
@@ -63,6 +63,8 @@ module Aerospike
       begin
         info_map = Info.request(conn, "node", "partition-generation", "services")
       rescue => e
+        Aerospike.logger.error(e)
+
         conn.close
         decrease_health
 

data/lib/aerospike/command/batch_command.rb

@@ -31,7 +31,6 @@ module Aerospike
 
       @valid = true
       @mutex = Mutex.new
-      @records = Queue.new
 
       self
     end
@@ -79,13 +78,82 @@ module Aerospike
         when Aerospike::FieldType::TABLE
           set_name = @data_buffer.read(1, size).force_encoding('utf-8')
         when Aerospike::FieldType::KEY
-          user_key = Value.bytes_to_key_value(@data_buffer.read(1).ord, @data_buffer, 2, size-1)
+          user_key = Aerospike::bytes_to_key_value(@data_buffer.read(1).ord, @data_buffer, 2, size-1)
         end
       end
 
       Aerospike::Key.new(namespace, set_name, user_key, digest)
     end
 
+    # Parses the given byte buffer and populate the result object.
+    # Returns the number of bytes that were parsed from the given buffer.
+    def parse_record(key, op_count, generation, expiration)
+      bins = nil
+      duplicates = nil
+
+      for i in 0...op_count
+        raise Aerospike::Exceptions::QueryTerminated.new unless valid?
+
+        read_bytes(8)
+
+        op_size = @data_buffer.read_int32(0).ord
+        particle_type = @data_buffer.read(5).ord
+        version = @data_buffer.read(6).ord
+        name_size = @data_buffer.read(7).ord
+
+        read_bytes(name_size)
+        name = @data_buffer.read(0, name_size).force_encoding('utf-8')
+
+        particle_bytes_size = op_size - (4 + name_size)
+        read_bytes(particle_bytes_size)
+        value = Aerospike.bytes_to_particle(particle_type, @data_buffer, 0, particle_bytes_size)
+
+        # Currently, the batch command returns all the bins even if a subset of
+        # the bins are requested. We have to filter it on the client side.
+        # TODO: Filter batch bins on server!
+        # if !@bin_names || @bin_names.any?{|bn| bn == name}
+        # if !@bin_names || (@bin_names == []) || @bin_names.any?{|bn| bn == name}
+        if !@bin_names || (@bin_names.empty?) || @bin_names.any?{|bn| bn == name}
+
+          vmap = nil
+
+          if version > 0 || duplicates
+            unless duplicates
+              duplicates = []
+              duplicates << bins
+              bins = nil
+
+              for j in 0...version
+                duplicates << nil
+              end
+            else
+              for j in duplicates.length..version
+                duplicates << nil
+              end
+            end
+
+            vmap = duplicates[version]
+            unless vmap
+              vmap = {}
+              duplicates[version] = vmap
+            end
+          else
+            unless bins
+              bins = {}
+            end
+            vmap = bins
+          end
+          vmap[name] = value
+        end
+      end
+
+      # Remove nil duplicates just in case there were holes in the version number space.
+      # TODO: this seems to be a bad idea; O(n) algorithm after another O(n) algorithm
+      duplicates.compact! if duplicates
+
+      Record.new(@node, key, bins, duplicates, generation, expiration)
+    end
+
     def read_bytes(length)
       if length > @data_buffer.length
         # Corrupted data streams can result in a huge length.

data/lib/aerospike/command/batch_command_get.rb

@@ -79,72 +79,6 @@ module Aerospike
       true
     end
 
-    # Parses the given byte buffer and populate the result object.
-    # Returns the number of bytes that were parsed from the given buffer.
-    def parse_record(key, op_count, generation, expiration)
-      bins = nil
-      duplicates = nil
-
-      for i in 0...op_count
-        raise Aerospike::Exceptions::QueryTerminated.new unless valid?
-
-        read_bytes(8)
-
-        op_size = @data_buffer.read_int32(0).ord
-        particle_type = @data_buffer.read(5).ord
-        version = @data_buffer.read(6).ord
-        name_size = @data_buffer.read(7).ord
-
-        read_bytes(name_size)
-        name = @data_buffer.read(0, name_size).force_encoding('utf-8')
-
-        particle_bytes_size = op_size - (4 + name_size)
-        read_bytes(particle_bytes_size)
-        value = Aerospike.bytes_to_particle(particle_type, @data_buffer, 0, particle_bytes_size)
-
-        # Currently, the batch command returns all the bins even if a subset of
-        # the bins are requested. We have to filter it on the client side.
-        # TODO: Filter batch bins on server!
-        if !@bin_names || @bin_names.any?{|bn| bn == name}
-          vmap = nil
-
-          if version > 0 || duplicates
-            unless duplicates
-              duplicates = []
-              duplicates << bins
-              bins = nil
-
-              for j in 0...version
-                duplicates << nil
-              end
-            else
-              for j in duplicates.length..version
-                duplicates << nil
-              end
-            end
-
-            vmap = duplicates[version]
-            unless vmap
-              vmap = {}
-              duplicates[version] = vmap
-            end
-          else
-            unless bins
-              bins = {}
-            end
-            vmap = bins
-          end
-          vmap[name] = value
-        end
-      end
-
-      # Remove nil duplicates just in case there were holes in the version number space.
-      # TODO: this seems to be a bad idea; O(n) algorithm after another O(n) algorithm
-      duplicates.compact! if duplicates
-
-      Record.new(@node, key, bins, duplicates, generation, expiration)
-    end
-
   end # class
 
 end # module

data/lib/aerospike/command/command.rb

@@ -314,6 +314,75 @@ module Aerospike
       end_cmd
     end
 
+    def set_scan(policy, namespace, set_name, bin_names)
+      # Estimate buffer size
+      begin_cmd
+      field_count = 0
+
+      if namespace
+        @data_offset += namespace.bytesize + FIELD_HEADER_SIZE
+        field_count += 1
+      end
+
+      if set_name
+        @data_offset += set_name.bytesize + FIELD_HEADER_SIZE
+        field_count += 1
+      end
+
+      # Estimate scan options size.
+      @data_offset += 2 + FIELD_HEADER_SIZE
+      field_count += 1
+
+      if bin_names
+        bin_names.each do |bin_name|
+          estimate_operation_size_for_bin_name(bin_name)
+        end
+      end
+
+      size_buffer
+      read_attr = INFO1_READ
+
+      if !policy.include_bin_data
+        read_attr |= INFO1_NOBINDATA
+      end
+
+      operation_count = 0
+      if bin_names
+        operation_count = bin_names.length
+      end
+
+      write_header(read_attr, 0, field_count, operation_count)
+
+      if namespace
+        write_field_string(namespace, Aerospike::FieldType::NAMESPACE)
+      end
+
+      if set_name
+        write_field_string(set_name, Aerospike::FieldType::TABLE)
+      end
+
+      write_field_header(2, Aerospike::FieldType::SCAN_OPTIONS)
+
+      priority = policy.priority & 0xFF
+      priority <<= 4
+      if policy.fail_on_cluster_change
+        priority |= 0x08
+      end
+
+      @data_buffer.write_byte(priority, @data_offset)
+      @data_offset += 1
+      @data_buffer.write_byte(policy.scan_percent.to_i.ord, @data_offset)
+      @data_offset += 1
+
+      if bin_names
+        bin_names.each do |bin_name|
+          write_operation_for_bin_name(bin_name, Aerospike::Operation::READ)
+        end
+      end
+
+      end_cmd
+    end
+
     def execute
       iterations = 0
 
@@ -338,7 +407,7 @@ module Aerospike
           # Socket connection error has occurred. Decrease health and retry.
           @node.decrease_health
 
-          Aerospike.logger.warn("Node #{@node.to_s}: #{e}")
+          Aerospike.logger.error("Node #{@node.to_s}: #{e}")
           next
         end
 
@@ -350,6 +419,8 @@ module Aerospike
           begin
             write_buffer
           rescue => e
+            Aerospike.logger.error(e)
+
             # All runtime exceptions are considered fatal. Do not retry.
             # Close socket to flush out possible garbage. Do not put back in pool.
             @conn.close
@@ -367,7 +438,7 @@ module Aerospike
             # Close socket to flush out possible garbage. Do not put back in pool.
             @conn.close
 
-            Aerospike.logger.warn("Node #{@node.to_s}: #{e}")
+            Aerospike.logger.error("Node #{@node.to_s}: #{e}")
             # IO error means connection to server @node is unhealthy.
             # Reflect cmd status.
             @node.decrease_health
@@ -378,6 +449,8 @@ module Aerospike
           begin
             parse_result
           rescue => e
+            Aerospike.logger.error(e)
+            
             # 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
@@ -411,16 +484,16 @@ module Aerospike
       field_count = 0
 
       if key.namespace
-        @data_offset += key.namespace.length + FIELD_HEADER_SIZE
+        @data_offset += key.namespace.bytesize + FIELD_HEADER_SIZE
         field_count += 1
       end
 
       if key.set_name
-        @data_offset += key.set_name.length + FIELD_HEADER_SIZE
+        @data_offset += key.set_name.bytesize + FIELD_HEADER_SIZE
         field_count += 1
       end
 
-      @data_offset += key.digest.length + FIELD_HEADER_SIZE
+      @data_offset += key.digest.bytesize + FIELD_HEADER_SIZE
       field_count += 1
 
       return field_count
@@ -434,7 +507,7 @@ module Aerospike
     end
 
     def estimate_operation_size_for_bin(bin)
-      @data_offset += bin.name.length + OPERATION_HEADER_SIZE
+      @data_offset += bin.name.bytesize + OPERATION_HEADER_SIZE
       @data_offset += bin.value_object.estimate_size
     end
 
@@ -442,7 +515,7 @@ module Aerospike
       bin_len = 0
 
       if operation.bin_name
-        bin_len = operation.bin_name.length
+        bin_len = operation.bin_name.bytesize
       end
 
       @data_offset += bin_len + OPERATION_HEADER_SIZE
@@ -453,7 +526,7 @@ module Aerospike
     end
 
     def estimate_operation_size_for_bin_name(bin_name)
-      @data_offset += bin_name.length + OPERATION_HEADER_SIZE
+      @data_offset += bin_name.bytesize + OPERATION_HEADER_SIZE
     end
 
     def estimate_operation_size

data/lib/aerospike/command/read_command.rb

@@ -68,7 +68,7 @@ module Aerospike
         begin
           @conn.read(@data_buffer, receive_size)
         rescue => e
-          Aerospike.logger.warn("parse result error: #{e}")
+          Aerospike.logger.error("parse result error: #{e}")
           raise e
         end
 
@@ -82,7 +82,7 @@ module Aerospike
             @record = parse_record(op_count, field_count, generation, expiration)
             handle_udf_error(result_code)
           rescue => e
-            Aerospike.logger.warn("UDF execution error: #{e}")
+            Aerospike.logger.error("UDF execution error: #{e}")
             raise e
           end
 

data/lib/aerospike/command/single_command.rb

@@ -49,7 +49,7 @@ module Aerospike
         begin
           @conn.read(@data_buffer, receive_size)
         rescue => e
-          Aerospike.logger.error("#{e}")
+          Aerospike.logger.error(e)
           raise e
         end
       end

data/lib/aerospike/command/write_command.rb

@@ -42,7 +42,7 @@ module Aerospike
       begin
         @conn.read(@data_buffer, MSG_TOTAL_HEADER_SIZE)
       rescue => e
-        Aerospike.logger.error("#{e}")
+        Aerospike.logger.error(e)
         raise e
       end
 

data/lib/aerospike/info.rb

@@ -49,8 +49,6 @@ module Aerospike
       begin
         buf_length = send_command(conn, offset, buffer)
         parse_multiple_response(buf_length, buffer)
-      rescue => e
-        Aerospike.logger.error("#{e}")
       ensure
         Buffer.put(buffer)
       end
@@ -86,6 +84,7 @@ module Aerospike
         conn.read(buffer, length)
         return length
       rescue => e
+        Aerospike.logger.error(e)
         conn.close
         raise e
       end

data/lib/aerospike/ldt/large_list.rb

@@ -70,6 +70,7 @@ module Aerospike
         @client.execute_udf(@key, @PACKAGE_NAME, 'find', [@bin_name, value], @policy)
       rescue Aerospike::Exceptions::Aerospike => e
         unless e.result_code == Aerospike::ResultCode::UDF_BAD_RESPONSE && e.message.index("Item Not Found")
+          Aerospike.logger.error(e)
           raise e
         end
         nil

data/lib/aerospike/ldt/large_map.rb

@@ -54,6 +54,7 @@ module Aerospike
         @client.execute_udf(@key, @PACKAGE_NAME, 'get', [@bin_name, name, @user_module], @policy)
       rescue Aerospike::Exceptions::Aerospike => e
         unless e.result_code == Aerospike::ResultCode::UDF_BAD_RESPONSE && e.message.index("Item Not Found")
+          Aerospike.logger.error(e)
           raise e
         end
         nil

data/lib/aerospike/policy/batch_policy.rb

@@ -0,0 +1,38 @@
+# encoding: utf-8
+# Copyright 2014 Aerospike, Inc.
+#
+# 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 'aerospike/policy/policy'
+
+module Aerospike
+
+  # Container object for batch policy command.
+  class BatchPolicy < Policy
+
+    attr_accessor :max_concurrent_nodes, :record_queue_size, 
+      :wait_until_migrations_are_over
+
+    def initialize(max_concurrent_nodes=nil, record_queue_size=nil, wait_until_migrations_are_over=nil)
+      super()
+
+      @max_concurrent_nodes = max_concurrent_nodes || 0
+      @record_queue_size = record_queue_size || 5000
+      @wait_until_migrations_are_over = wait_until_migrations_are_over.nil? ? false : wait_until_migrations_are_over
+
+      self
+    end
+
+  end # class
+
+end # module