aerospike 0.1.6 → 1.0.0

data/lib/aerospike/policy/generation_policy.rb

@@ -27,11 +27,6 @@ module Aerospike
     # This is useful for restore after backup.
     EXPECT_GEN_GT = 2
 
-    # Create duplicate record if expected generation is not equal to server generation.
-    # Duplicates are only created when the server configuration option "allow-versions"
-    # is true (default is false).
-    DUPLICATE = 3
-
   end # module
 
 end # module

data/lib/aerospike/policy/policy.rb

@@ -24,34 +24,34 @@ module Aerospike
 
     attr_accessor :priority, :timeout, :max_retries, :sleep_between_retries, :consistency_level
 
-    def initialize(priority=nil, timeout=nil, max_retiries=nil, sleep_between_retries=nil, consistency_level=nil)
+    def initialize(opt={})
       # Container object for transaction policy attributes used in all database
       # operation calls.
 
       # Priority of request relative to other transactions.
       # Currently, only used for scans.
-      @priority = priority || Priority::DEFAULT
+      @priority = opt[:priority] || Priority::DEFAULT
 
       # How replicas should be consulted in a read operation to provide the desired
       # consistency guarantee. Default to allowing one replica to be used in the
       # read operation.
-      @consistency_level = consistency_level || Aerospike::ConsistencyLevel::CONSISTENCY_ONE
+      @consistency_level = opt[:consistency_level] || Aerospike::ConsistencyLevel::CONSISTENCY_ONE
 
       # Transaction timeout.
       # This timeout is used to set the socket timeout and is also sent to the
       # server along with the transaction in the wire protocol.
       # Default to no timeout (0).
-      @timeout = timeout || 0
+      @timeout = opt[:timeout] || 0
 
       # Maximum number of retries before aborting the current transaction.
       # A retry is attempted when there is a network error other than timeout.
       # If max_retries is exceeded, the abort will occur even if the timeout
       # has not yet been exceeded.
-      @max_retries = max_retiries || 2
+      @max_retries = opt[:max_retiries] || 2
 
       # Duration to sleep between retries if a transaction fails and the
       # timeout was not exceeded. Enter zero to skip sleep.
-      @sleep_between_retries = sleep_between_retries || 0.5
+      @sleep_between_retries = opt[:sleep_between_retries] || 0.5
     end
 
 

data/lib/aerospike/policy/query_policy.rb

@@ -20,8 +20,8 @@ module Aerospike
   # Container object for scan policy command.
   class QueryPolicy < BatchPolicy
 
-    def initialize()
-      super()
+    def initialize(opt={})
+      super(opt)
 
       @max_retries = 0
 

data/lib/aerospike/policy/scan_policy.rb

@@ -23,13 +23,13 @@ module Aerospike
     attr_accessor :scan_percent, :concurrent_nodes,
       :include_bin_data, :fail_on_cluster_change
 
-    def initialize(scan_percent=nil, concurrent_nodes=nil, include_bin_data=nil, fail_on_cluster_change=nil)
-      super()
+    def initialize(opt={})
+      super(opt)
 
-      @scan_percent = scan_percent || 100
-      @concurrent_nodes = concurrent_nodes.nil? ? true : concurrent_nodes
-      @include_bin_data = include_bin_data.nil? ? true : include_bin_data
-      @fail_on_cluster_change = fail_on_cluster_change.nil? ? true : fail_on_cluster_change
+      @scan_percent = opt[:scan_percent] || 100
+      @concurrent_nodes = opt[:concurrent_nodes].nil? ? true : concurrent_nodes
+      @include_bin_data = opt[:include_bin_data].nil? ? true : include_bin_data
+      @fail_on_cluster_change = opt[:fail_on_cluster_change].nil? ? true : fail_on_cluster_change
 
       @max_retries = 0
 

data/lib/aerospike/policy/write_policy.rb

@@ -26,25 +26,25 @@ module Aerospike
     attr_accessor :record_exists_action, :generation_policy,
       :generation, :expiration, :send_key, :commit_level
 
-    def initialize(record_exists_action=nil, gen_policy=nil, generation=nil, expiration=nil, send_key=nil, commit_level=nil)
-      super()
+    def initialize(opt={})
+      super(opt)
 
       # Qualify how to handle writes where the record already exists.
-      @record_exists_action = record_exists_action || RecordExistsAction::UPDATE
+      @record_exists_action = opt[:record_exists_action] || RecordExistsAction::UPDATE
 
       # Qualify how to handle record writes based on record generation. The default (NONE)
       # indicates that the generation is not used to restrict writes.
-      @generation_policy = gen_policy || GenerationPolicy::NONE
+      @generation_policy = opt[:gen_policy] || GenerationPolicy::NONE
 
       # Desired consistency guarantee when committing a transaction on the server. The default
       # (COMMIT_ALL) indicates that the server should wait for master and all replica commits to
       # be successful before returning success to the client.
-      @commit_level = commit_level || Aerospike::CommitLevel::COMMIT_ALL
+      @commit_level = opt[:commit_level] || Aerospike::CommitLevel::COMMIT_ALL
 
       # Expected generation. Generation is the number of times a record has been modified
       # (including creation) on the server. If a write operation is creating a record,
       # the expected generation would be 0
-      @generation = generation || 0
+      @generation = opt[:generation] || 0
 
       # Record expiration. Also known as ttl (time to live).
       # Seconds record will live before being removed by the server.
@@ -53,11 +53,11 @@ module Aerospike
       # versions >= 3.1.4.  Do not use -1 for older servers.
       # 0: Default to namespace configuration variable "default-ttl" on the server.
       # > 0: Actual expiration in seconds.
-      @expiration = expiration || 0
+      @expiration = opt[:expiration] || 0
 
       # Send user defined key in addition to hash digest on a record put.
       # The default is to send the user defined key.
-      @send_key = send_key.nil? ? true : send_key
+      @send_key = opt[:send_key].nil? ? true : send_key
 
       self
     end

data/lib/aerospike/query/query_command.rb

@@ -21,7 +21,7 @@ module Aerospike
 
   private
 
-  class QueryCommand < StreamCommand
+  class QueryCommand < StreamCommand #:nodoc:
 
     def initialize(node, policy, statement, recordset)
       super(node)

data/lib/aerospike/query/scan_command.rb

@@ -21,7 +21,7 @@ module Aerospike
 
   private
 
-  class ScanCommand < StreamCommand
+  class ScanCommand < StreamCommand #:nodoc:
 
     def initialize(node, policy, namespace, set_name, bin_names, recordset)
       super(node)

data/lib/aerospike/query/stream_command.rb

@@ -24,7 +24,7 @@ module Aerospike
 
   private
 
-  class StreamCommand < BatchCommand
+  class StreamCommand < BatchCommand #:nodoc:
 
     def parse_record_results(receive_size)
       @data_offset = 0

data/lib/aerospike/record.rb

@@ -20,15 +20,14 @@ module Aerospike
 
   class Record
 
-    attr_reader :key, :bins, :generation, :expiration, :node, :dups
+    attr_reader :key, :bins, :generation, :expiration, :node
 
-    def initialize(node, rec_key, rec_bins, dups, rec_gen, rec_exp)
+    def initialize(node, rec_key, rec_bins, rec_gen, rec_exp)
       @key = rec_key
       @bins = rec_bins
       @generation = rec_gen
       @expiration = rec_exp
       @node = node
-      @dups = dups
     end
 
     def to_s

data/lib/aerospike/result_code.rb

@@ -128,10 +128,14 @@ module Aerospike
     # User was previously created.
     USER_ALREADY_EXISTS = 61
 
-
     # Password is invalid.
     INVALID_PASSWORD = 62
 
+    # Password is invalid.
+    EXPIRED_PASSWORD = 63
+
+    # Password is invalid.
+    FORBIDDEN_PASSWORD = 64
 
     # Security credential is invalid.
     INVALID_CREDENTIAL = 63
@@ -297,6 +301,12 @@ module Aerospike
       when INVALID_PASSWORD
         "Invalid password"
 
+      when EXPIRED_PASSWORD
+        "Expired password"
+
+      when FORBIDDEN_PASSWORD
+        "Forbidden password"
+
       when INVALID_CREDENTIAL
         "Invalid credential"
 

data/lib/aerospike/user_role.rb

@@ -0,0 +1,30 @@
+# 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
+
+	# User and assigned roles.
+	class UserRoles
+
+		# User name.
+		attr_accessor :user
+
+		# List of assigned roles.
+		attr_accessor :roles
+
+	end
+
+end

data/lib/aerospike/utils/buffer.rb

@@ -21,7 +21,7 @@ module Aerospike
   private
 
   # Buffer class to ease the work around
-  class Buffer
+  class Buffer #:nodoc:
 
     @@buf_pool = Pool.new
     @@buf_pool.create_block = Proc.new { Buffer.new }
@@ -29,8 +29,11 @@ module Aerospike
     attr_accessor :buf
 
     INT16 = 's>'
+    UINT16 = 'n'
     INT32 = 'l>'
+    UINT32 = 'N'
     INT64 = 'q>'
+    UINT64 = 'Q>'
 
     DEFAULT_BUFFER_SIZE = 16 * 1024
     MAX_BUFFER_SIZE = 10 * 1024 * 1024
@@ -76,16 +79,31 @@ module Aerospike
       2
     end
 
+    def write_uint16(i, offset)
+      @buf[offset, 2] = [i].pack(UINT16)
+      2
+    end
+
     def write_int32(i, offset)
       @buf[offset, 4] = [i].pack(INT32)
       4
     end
 
+    def write_uint32(i, offset)
+      @buf[offset, 4] = [i].pack(UINT32)
+      4
+    end
+
     def write_int64(i, offset)
       @buf[offset, 8] = [i].pack(INT64)
       8
     end
 
+    def write_uint64(i, offset)
+      @buf[offset, 8] = [i].pack(UINT64)
+      8
+    end
+
     def read(offset, len=nil)
       start = offset
 
@@ -113,9 +131,11 @@ module Aerospike
 
     def read_var_int64(offset, len)
       val = 0
-      for i in 0...len
+      i = 0
+      while i < len
         val <<= 8
         val |= @buf[offset+i].ord & 0xFF
+        i = i.succ
       end
       val
     end

data/lib/aerospike/utils/epoc.rb

@@ -18,10 +18,12 @@ require 'time'
 
 module Aerospike
 
+  private
+
   CITRUSLEAF_EPOCH = 1262304000
 
   # Converts an Expiration time to TTL in seconds
-  def self.TTL(secs_from_citrus_leaf_epoc)
+  def self.TTL(secs_from_citrus_leaf_epoc) #:nodoc:
     if secs_from_citrus_leaf_epoc == 0
       0xFFFFFFFF
     else

data/lib/aerospike/utils/pool.rb

@@ -21,7 +21,7 @@ module Aerospike
 
   private
 
-  class Pool
+  class Pool #:nodoc:
 
     attr_accessor :create_block, :cleanup_block
 

data/lib/aerospike/value/value.rb

@@ -25,7 +25,7 @@ module Aerospike
   private
 
   # Polymorphic value classes used to efficiently serialize objects into the wire protocol.
-  class Value
+  class Value #:nodoc:
 
     @@packer_pool = Pool.new
     @@packer_pool.create_block = Proc.new { MessagePack::Packer.new }
@@ -71,7 +71,7 @@ module Aerospike
 
 
   # Empty value.
-  class NullValue < Value
+  class NullValue < Value #:nodoc:
 
     def initialize
       self
@@ -108,7 +108,7 @@ module Aerospike
   end
 
   # Byte array value.
-  class BytesValue < Value
+  class BytesValue < Value #:nodoc:
 
     def initialize(value)
       @bytes = value
@@ -139,7 +139,6 @@ module Aerospike
 
     def write(buffer, offset)
       buffer.write_binary(@bytes, offset)
-      buffer.length
     end
 
     def pack(packer)
@@ -151,7 +150,7 @@ module Aerospike
   #######################################
 
   # value string.
-  class StringValue < Value
+  class StringValue < Value #:nodoc:
 
     def initialize(val)
       @value = val || ''
@@ -191,7 +190,7 @@ module Aerospike
   #######################################
 
   # Integer value.
-  class IntegerValue < Value
+  class IntegerValue < Value #:nodoc:
 
     def initialize(val)
       @value = val || 0
@@ -231,7 +230,7 @@ module Aerospike
 
   # List value.
   # Supported by Aerospike 3 servers only.
-  class ListValue < Value
+  class ListValue < Value #:nodoc:
 
     def initialize(list)
       @list = list || nil
@@ -281,7 +280,7 @@ module Aerospike
 
   # Map value.
   # Supported by Aerospike 3 servers only.
-  class MapValue < Value
+  class MapValue < Value #:nodoc:
 
     def initialize(vmap)
       @vmap = vmap || {}
@@ -334,7 +333,7 @@ module Aerospike
 
   protected
 
-  def self.normalize_elem(elem)
+  def self.normalize_elem(elem) # :nodoc:
     case elem
     when String
      elem[1..-1]
@@ -347,17 +346,17 @@ module Aerospike
     end
   end
 
-  def self.normalize_strings_in_array(arr)
+  def self.normalize_strings_in_array(arr) # :nodoc:
     arr.map! { |elem| normalize_elem(elem) }
   end
 
-  def self.normalize_strings_in_map(hash)
+  def self.normalize_strings_in_map(hash) # :nodoc:
     hash.inject({}) do |h, (k,v)|
       h.update({ normalize_elem(k) => normalize_elem(v) })
     end
   end
 
-  def self.bytes_to_particle(type, buf, offset, length)
+  def self.bytes_to_particle(type, buf, offset, length) # :nodoc:
 
     case type
     when Aerospike::ParticleType::STRING
@@ -380,7 +379,7 @@ module Aerospike
     end
   end
 
-  def self.bytes_to_key_value(type, buf, offset, len)
+  def self.bytes_to_key_value(type, buf, offset, len) # :nodoc:
 
     case type
     when Aerospike::ParticleType::STRING

data/lib/aerospike/version.rb

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