aerospike 0.1.6 → 1.0.0

data/lib/aerospike/command/batch_command_exists.rb

@@ -20,7 +20,7 @@ module Aerospike
 
   private
 
-  class BatchCommandExists < BatchCommand
+  class BatchCommandExists < BatchCommand #:nodoc:
 
     def initialize(node, batch_namespace, policy, key_map, exists_array)
       super(node)

data/lib/aerospike/command/batch_command_get.rb

@@ -20,7 +20,7 @@ module Aerospike
 
   private
 
-  class BatchCommandGet < BatchCommand
+  class BatchCommandGet < BatchCommand #:nodoc:
 
     def initialize(node, batch_namespace, policy, key_map, bin_names, records, read_attr)
       super(node)

data/lib/aerospike/command/batch_item.rb

@@ -24,7 +24,7 @@ module Aerospike
 
   private
 
-  class BatchItem
+  class BatchItem #:nodoc:
 
     def self.generate_map(keys)
       key_map = {}

data/lib/aerospike/command/batch_node.rb

@@ -26,7 +26,7 @@ module Aerospike
 
   BatchNamespace = Struct.new :namespace, :keys
 
-  class BatchNode
+  class BatchNode #:nodoc:
 
     attr_accessor :node, :batch_namespaces, :key_capacity
 

data/lib/aerospike/command/command.rb

@@ -73,7 +73,7 @@ module Aerospike
   CL_MSG_VERSION             = 2
   AS_MSG_TYPE                = 3
 
-  class Command
+  class Command #:nodoc:
 
     def initialize(node)
       @node = node
@@ -431,7 +431,7 @@ module Aerospike
 
             # All runtime exceptions are considered fatal. Do not retry.
             # Close socket to flush out possible garbage. Do not put back in pool.
-            @conn.close
+            @conn.close if @conn
             raise e
           end
 
@@ -444,7 +444,7 @@ module Aerospike
           rescue => e
             # IO errors are considered temporary anomalies. Retry.
             # Close socket to flush out possible garbage. Do not put back in pool.
-            @conn.close
+            @conn.close if @conn
 
             Aerospike.logger.error("Node #{@node.to_s}: #{e}")
             # IO error means connection to server @node is unhealthy.
@@ -463,7 +463,7 @@ module Aerospike
             # 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
             # situation. We will not put back the connection in the buffer.
-            @conn.close
+            @conn.close if @conn
             raise e
           end
 
@@ -550,8 +550,10 @@ module Aerospike
       @data_buffer.write_byte(read_attr, 9)
       @data_buffer.write_byte(write_attr, 10)
 
-      for i in 11..25
+      i = 11
+      while i <= 25
         @data_buffer.write_byte(0, i)
+        i = i.succ
       end
 
       @data_buffer.write_int16(field_count, 26)
@@ -586,9 +588,6 @@ module Aerospike
       when Aerospike::GenerationPolicy::EXPECT_GEN_GT
         generation = policy.generation
         write_attr |= INFO2_GENERATION_GT
-      when Aerospike::GenerationPolicy::DUPLICATE
-        generation = policy.generation
-        write_attr |= INFO2_GENERATION_DUP
       end
 
       info_attr |= INFO3_COMMIT_MASTER if policy.commit_level == Aerospike::CommitLevel::COMMIT_MASTER
@@ -601,10 +600,8 @@ module Aerospike
       @data_buffer.write_byte(info_attr, 11)
       @data_buffer.write_byte(0, 12) # unused
       @data_buffer.write_byte(0, 13) # clear the result code
-      # Buffer.Int32ToBytes(generation, @data_buffer, 14)
-      @data_buffer.write_int32(generation, 14)
-      # Buffer.Int32ToBytes(policy.expiration, @data_buffer, 18)
-      @data_buffer.write_int32(policy.expiration, 18)
+      @data_buffer.write_uint32(generation, 14)
+      @data_buffer.write_uint32(policy.expiration, 18)
 
       # Initialize timeout. It will be written later.
       @data_buffer.write_byte(0, 22)
@@ -613,9 +610,7 @@ module Aerospike
       @data_buffer.write_byte(0, 25)
 
 
-      # Buffer.Int16ToBytes(field_count, @data_buffer, 26)
       @data_buffer.write_int16(field_count, 26)
-      # Buffer.Int16ToBytes(operation_count, @data_buffer, 28)
       @data_buffer.write_int16(operation_count, 28)
 
       @data_offset = MSG_TOTAL_HEADER_SIZE

data/lib/aerospike/command/delete_command.rb

@@ -21,7 +21,7 @@ module Aerospike
 
   private
 
-  class DeleteCommand < SingleCommand
+  class DeleteCommand < SingleCommand #:nodoc:
 
     attr_reader :existed
 

data/lib/aerospike/command/execute_command.rb

@@ -21,7 +21,7 @@ module Aerospike
 
   private
 
-  class ExecuteCommand < ReadCommand
+  class ExecuteCommand < ReadCommand #:nodoc:
 
     def initialize(cluster, policy, key, package_name, function_name, args)
       super(cluster, policy, key, nil)

data/lib/aerospike/command/exists_command.rb

@@ -21,7 +21,7 @@ module Aerospike
 
   private
 
-  class ExistsCommand < SingleCommand
+  class ExistsCommand < SingleCommand #:nodoc:
 
     attr_reader :exists
 

data/lib/aerospike/command/operate_command.rb

@@ -20,7 +20,7 @@ module Aerospike
 
   private
 
-  class OperateCommand < ReadCommand
+  class OperateCommand < ReadCommand #:nodoc:
 
     def initialize(cluster, policy, key, operations)
       super(cluster, policy, key, nil)

data/lib/aerospike/command/read_command.rb

@@ -24,7 +24,7 @@ module Aerospike
 
   private
 
-  class ReadCommand < SingleCommand
+  class ReadCommand < SingleCommand #:nodoc:
 
     attr_reader :record
 
@@ -93,7 +93,7 @@ module Aerospike
 
       if op_count == 0
         # data Bin was not returned.
-        @record = Record.new(@node, @key, nil, nil, generation, expiration)
+        @record = Record.new(@node, @key, generation, expiration)
         return
       end
 
@@ -107,24 +107,25 @@ module Aerospike
     end
 
     def parse_record(op_count, field_count, generation, expiration)
-      bins = nil
-      duplicates = nil
+      bins = op_count > 0 ? {} : nil
       receive_offset = 0
 
       # There can be fields in the response (setname etc).
       # But for now, ignore them. Expose them to the API if needed in the future.
-      if field_count != 0
+      if field_count > 0
         # Just skip over all the fields
-        for i in 0...field_count
+        i = 0
+        while i < field_count
           field_size = @data_buffer.read_int32(receive_offset)
           receive_offset += (4 + field_size)
+          i = i.succ
         end
       end
 
-      for i in 0...op_count
+      i = 0
+      while i < op_count
         op_size = @data_buffer.read_int32(receive_offset)
         particle_type = @data_buffer.read(receive_offset+5).ord
-        version = @data_buffer.read(receive_offset+6).ord
         name_size = @data_buffer.read(receive_offset+7).ord
         name = @data_buffer.read(receive_offset+8, name_size).force_encoding('utf-8')
         receive_offset += 4 + 4 + name_size
@@ -134,39 +135,12 @@ module Aerospike
         value = Aerospike.bytes_to_particle(particle_type, @data_buffer, receive_offset, particle_bytes_size)
         receive_offset += particle_bytes_size
 
-        vmap = {}
-
-        if version > 0 || duplicates != nil
-          unless duplicates
-            duplicates = []
-            duplicates << bins
-            bins = nil
-
-            for j in 0..version-1
-              duplicates << nil
-            end
-          else
-            for j in duplicates.length..version
-              duplicates << nil
-            end
-          end
+        bins[name] = value
 
-          vmap = duplicates[version]
-          unless vmap
-            vmap = {}
-            duplicates[version] = vmap
-          end
-        else
-          bins = {} unless bins
-          vmap = bins
-        end
-        vmap[name] = value
+        i = i.succ
       end
 
-      # Remove nil duplicates just in case there were holes in the version number space.
-      duplicates.compact! if duplicates
-
-      Record.new(@node, @key, bins, duplicates, generation, expiration)
+      Record.new(@node, @key, bins, generation, expiration)
     end
 
   end # class

data/lib/aerospike/command/read_header_command.rb

@@ -21,7 +21,7 @@ module Aerospike
 
   private
 
-  class ReadHeaderCommand < SingleCommand
+  class ReadHeaderCommand < SingleCommand #:nodoc:
 
     attr_reader :record
 
@@ -46,7 +46,7 @@ module Aerospike
       if result_code == 0
         generation = @data_buffer.read_int32(14)
         expiration = Aerospike.TTL(@data_buffer.read_int32(18))
-        @record = Record.new(@node, @key, nil, nil, generation, expiration)
+        @record = Record.new(@node, @key, nil,  generation, expiration)
       else
         if result_code == Aerospike::ResultCode::KEY_NOT_FOUND_ERROR
           @record = nil

data/lib/aerospike/command/roles.rb

@@ -0,0 +1,36 @@
+# encoding: utf-8
+# Copyright 2014 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.
+
+module Aerospike
+
+	# Pre-defined user roles.
+	module Role
+
+		 # Manage users their roles.
+		 USER_ADMIN = 'user-admin'
+
+		 # Manage indicies, user defined functions and server configuration.
+		 SYS_ADMIN = 'sys-admin'
+
+		 # Allow read and write transactions with the database.
+		 READ_WRITE = 'read-write'
+
+		 # Allow read transactions with the database.
+		 READ = 'Read'
+
+	end # module
+
+end # module

data/lib/aerospike/command/single_command.rb

@@ -21,7 +21,7 @@ module Aerospike
 
   private
 
-  class SingleCommand < Command
+  class SingleCommand < Command #:nodoc:
 
     def initialize(cluster, key)
       @cluster = cluster

data/lib/aerospike/command/touch_command.rb

@@ -20,7 +20,7 @@ module Aerospike
 
   private
 
-  class TouchCommand < SingleCommand
+  class TouchCommand < SingleCommand #:nodoc:
 
     def initialize(cluster, policy, key)
       super(cluster, key)

data/lib/aerospike/command/write_command.rb

@@ -20,7 +20,7 @@ module Aerospike
 
   private
 
-  class WriteCommand < SingleCommand
+  class WriteCommand < SingleCommand #:nodoc:
 
     def initialize(cluster, policy, key, bins, operation)
 

data/lib/aerospike/info.rb

@@ -85,7 +85,7 @@ module Aerospike
         return length
       rescue => e
         Aerospike.logger.error(e)
-        conn.close
+        conn.close if conn
         raise e
       end
     end

data/lib/aerospike/loggable.rb

@@ -42,7 +42,7 @@ module Aerospike
 
     def default_logger
       logger = Logger.new(STDOUT)
-      logger.level = Logger::ERROR
+      logger.level = Logger::FATAL
       logger
     end
 

data/lib/aerospike/policy/admin_policy.rb

@@ -0,0 +1,33 @@
+# encoding: utf-8
+# Copyright 2014 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.
+
+module Aerospike
+
+	# Policy attributes used for user administration commands.
+	class AdminPolicy
+
+		# 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
+
+	end # class
+
+end # module

data/lib/aerospike/policy/batch_policy.rb

@@ -23,12 +23,12 @@ module Aerospike
     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()
+    def initialize(opt={})
+      super(opt)
 
-      @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
+      @max_concurrent_nodes = opt[:max_concurrent_nodes] || 0
+      @record_queue_size = opt[:record_queue_size] || 5000
+      @wait_until_migrations_are_over = opt[:wait_until_migrations_are_over].nil? ? false : wait_until_migrations_are_over
 
       self
     end

data/lib/aerospike/policy/client_policy.rb

@@ -18,18 +18,29 @@ module Aerospike
   # Container object for client policy command.
   class ClientPolicy
 
+    attr_accessor :user, :password
     attr_accessor :timeout, :connection_queue_size, :fail_if_not_connected
 
-    def initialize(timeout=nil, connection_queue_size=nil, fail_if_not_connected=nil)
+    def initialize(opt={})
       # Initial host connection timeout in seconds. The timeout when opening a connection
       # to the server host for the first time.
-      @timeout = timeout || 1.0 # 1 second
+      @timeout = opt[:timeout] || 1.0 # 1 second
 
       # Size of the Connection Queue cache.
-      @connection_queue_size = connection_queue_size || 64
+      @connection_queue_size = opt[:connection_queue_size] || 64
 
       # Throw exception if host connection fails during add_host.
-      @fail_if_not_connected = fail_if_not_connected || true
+      @fail_if_not_connected = opt[:fail_if_not_connected] || true
+
+      # user name
+      @user = opt[:user]
+
+      # password
+      @password = opt[:password]
+    end
+
+    def requires_authentication
+      (@user && @user != '') || (@password && @password != '')
     end
 
   end # class