aerospike 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee7d4805db6b56945a1f5112c62272f3371c79f8
-  data.tar.gz: ab922b1acac8a4aa5b09d5605886127c12af60cf
+  metadata.gz: c3befa3762779a41284c82d7d1c91071b2d808ba
+  data.tar.gz: e68d7474c1cc4f87b2b4e1ae2dc1f9cf6ce5363b
 SHA512:
-  metadata.gz: 6879a1edd54bcdb9ad82e5cc3f484cbe5f56034eed1058c9aeb556b2d7b1ca93f663f2260a7d1818b311d5ab65f11a5ab2b8fbae1b85bbaaf277fc5c01234df0
-  data.tar.gz: 911f4c56dfe6e1d6eb801e560f87732db0309dd5e80bec9969bd5f1af17f0ec3ecfdb249ea865178b619afa6eccbaaa956bc199eba2b9b2bce7d3bdafffe22a9
+  metadata.gz: 0670ec0132babe9a91821511c0303c866dd058d35c9e7e6dada688c20ce3d85ae44af4d29734200f8879d95530d94e8d2feff203ddce8f45f034ece463457d0f
+  data.tar.gz: 6a7ec991acdee8ae19227a33ec72f73bf11a845533032e9555cd3538c362f2398c4e09c2ff0ad5fe55cb60bfcdcbc33a3ace4ab72c93e7c43464f42174772d48

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+## Dec 28 2014 (0.1.6)
+
+  Minor features added, minor fixes and improvements.
+
+  * **New Features**:
+
+    * Added `Policy.consistency_level`
+    * Added `WritePolicy.commit_level`
+
+  * **Fixes**
+
+    * Fixed setting timeout on connection
+    * Fixed exception handling typo for Connection#write 
+
 ## Dec 8 2014 (0.1.5)
 
   Major features added, minor fixes and improvements.

data/lib/aerospike.rb

@@ -46,6 +46,8 @@ require 'aerospike/policy/policy'
 require 'aerospike/policy/write_policy'
 require 'aerospike/policy/scan_policy'
 require 'aerospike/policy/query_policy'
+require 'aerospike/policy/consistency_level'
+require 'aerospike/policy/commit_level'
 
 require 'aerospike/cluster/connection'
 require 'aerospike/cluster/cluster'

data/lib/aerospike/client.rb

@@ -669,9 +669,6 @@ module Aerospike
       policy = opt_to_query_policy(options)
       new_policy = policy.clone
 
-      # Always set a taskId
-      statement.task_id = Time.now.to_i if statement.task_id == 0
-
       nodes = @cluster.nodes
       if nodes.length == 0
         raise Aerospike::Exceptions::Aerospike.new(Aerospike::ResultCode::SERVER_NOT_AVAILABLE, "Scan failed because cluster is empty.")
@@ -726,7 +723,7 @@ module Aerospike
         ClientPolicy.new(
           options[:timeout],
           options[:connection_queue_size],
-          options[:fail_if_not_connected],
+          options[:fail_if_not_connected]
         )
       end
     end
@@ -742,6 +739,7 @@ module Aerospike
           options[:timeout],
           options[:max_retiries],
           options[:sleep_between_retries],
+          options[:consistency_level]
         )
       end
     end
@@ -757,7 +755,8 @@ module Aerospike
           options[:gen_policy],
           options[:generation],
           options[:expiration],
-          options[:send_key]
+          options[:send_key],
+          options[:commit_level]
         )
       end
     end

data/lib/aerospike/cluster/connection.rb

@@ -51,7 +51,7 @@ module Aerospike
         begin
           written = @socket.write_nonblock(buffer.read(total, length - total))
           total += written
-        rescue IO::WaitWriteable, Errno::EAGAIN
+        rescue IO::WaitWritable, Errno::EAGAIN
           IO.select(nil, [@socket])
           retry
         rescue => e
@@ -92,8 +92,7 @@ module Aerospike
     def timeout=(timeout)
       if timeout > 0 && timeout != @timeout
         @timeout = timeout
-        # if IO.select([@socket], [@socket], [@socket], timeout.to_f)
-        if IO.select(nil, nil, nil, timeout.to_f)
+        if IO.select([@socket], [@socket], [@socket], timeout.to_f)
           begin
             # Verify there is now a good connection
             @socket.connect_nonblock(@sockaddr)

data/lib/aerospike/command/batch_command_exists.rb

@@ -34,7 +34,7 @@ module Aerospike
     end
 
     def write_buffer
-      set_batch_exists(@batch_namespace)
+      set_batch_exists(@policy, @batch_namespace)
     end
 
     # Parse all results in the batch.  Add records to shared list.

data/lib/aerospike/command/batch_command_get.rb

@@ -34,7 +34,7 @@ module Aerospike
     end
 
     def write_buffer
-      set_batch_get(@batch_namespace, @bin_names, @read_attr)
+      set_batch_get(@policy, @batch_namespace, @bin_names, @read_attr)
     end
 
     # Parse all results in the batch.  Add records to shared list.

data/lib/aerospike/command/command.rb

@@ -21,6 +21,9 @@ require 'msgpack'
 require 'aerospike/result_code'
 require 'aerospike/command/field_type'
 
+require 'aerospike/policy/consistency_level'
+require 'aerospike/policy/commit_level'
+
 module Aerospike
 
   private
@@ -34,6 +37,9 @@ module Aerospike
   # Do not read the bins
   INFO1_NOBINDATA = Integer(1 << 5)
 
+  # Involve all replicas in read operation.
+  INFO1_CONSISTENCY_ALL = Integer(1 << 6)
+
   # Create or update record
   INFO2_WRITE = Integer(1 << 0)
   # Fling a record into the belly of Moloch.
@@ -49,6 +55,8 @@ 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)  
   # Update only. Merge bins.
   INFO3_UPDATE_ONLY = Integer(1 << 3)
 
@@ -127,27 +135,27 @@ module Aerospike
     end
 
     # Writes the command for exist operations
-    def set_exists(key)
+    def set_exists(policy, key)
       begin_cmd
       field_count = estimate_key_size(key)
       size_buffer
-      write_header(INFO1_READ|INFO1_NOBINDATA, 0, field_count, 0)
+      write_header(policy, INFO1_READ|INFO1_NOBINDATA, 0, field_count, 0)
       write_key(key)
       end_cmd
     end
 
     # Writes the command for get operations (all bins)
-    def set_read_for_key_only(key)
+    def set_read_for_key_only(policy, key)
       begin_cmd
       field_count = estimate_key_size(key)
       size_buffer
-      write_header(INFO1_READ|INFO1_GET_ALL, 0, field_count, 0)
+      write_header(policy, INFO1_READ|INFO1_GET_ALL, 0, field_count, 0)
       write_key(key)
       end_cmd
     end
 
     # Writes the command for get operations (specified bins)
-    def set_read(key, bin_names)
+    def set_read(policy, key, bin_names)
       if bin_names && bin_names.length > 0
         begin_cmd
         field_count = estimate_key_size(key)
@@ -157,7 +165,7 @@ module Aerospike
         end
 
         size_buffer
-        write_header(INFO1_READ, 0, field_count, bin_names.length)
+        write_header(policy, INFO1_READ, 0, field_count, bin_names.length)
         write_key(key)
 
         bin_names.each do |bin_name|
@@ -166,12 +174,12 @@ module Aerospike
 
         end_cmd
       else
-        set_read_for_key_only(key)
+        set_read_for_key_only(policy, key)
       end
     end
 
     # Writes the command for getting metadata operations
-    def set_read_header(key)
+    def set_read_header(policy, key)
       begin_cmd
       field_count = estimate_key_size(key)
       estimate_operation_size_for_bin_name('')
@@ -181,7 +189,7 @@ module Aerospike
       # The workaround is to request a non-existent bin.
       # TODO: Fix this on server.
       #command.set_read(INFO1_READ | _INFO1_NOBINDATA);
-      write_header(INFO1_READ, 0, field_count, 1)
+      write_header(policy, INFO1_READ, 0, field_count, 1)
 
       write_key(key)
       write_operation_for_bin_name('', Aerospike::Operation::READ)
@@ -223,7 +231,7 @@ module Aerospike
       if write_attr != 0
         write_header_with_policy(policy, read_attr, write_attr, field_count, operations.length)
       else
-        write_header(read_attr, write_attr, field_count, operations.length)
+        write_header(policy, read_attr, write_attr, field_count, operations.length)
       end
       write_key(key)
 
@@ -236,7 +244,7 @@ module Aerospike
       end_cmd
     end
 
-    def set_udf(key, package_name, function_name, args)
+    def set_udf(policy, key, package_name, function_name, args)
       begin_cmd
       field_count = estimate_key_size(key)
       arg_bytes = args.to_bytes
@@ -244,7 +252,7 @@ module Aerospike
       field_count += estimate_udf_size(package_name, function_name, arg_bytes)
       size_buffer
 
-      write_header(0, INFO2_WRITE, field_count, 0)
+      write_header(policy, 0, INFO2_WRITE, field_count, 0)
       write_key(key)
       write_field_string(package_name, Aerospike::FieldType::UDF_PACKAGE_NAME)
       write_field_string(function_name, Aerospike::FieldType::UDF_FUNCTION)
@@ -253,7 +261,7 @@ module Aerospike
       end_cmd
     end
 
-    def set_batch_exists(batch_namespace)
+    def set_batch_exists(policy, batch_namespace)
       # Estimate buffer size
       begin_cmd
       keys = batch_namespace.keys
@@ -264,7 +272,7 @@ module Aerospike
 
       size_buffer
 
-      write_header(INFO1_READ|INFO1_NOBINDATA, 0, 2, 0)
+      write_header(policy, INFO1_READ|INFO1_NOBINDATA, 0, 2, 0)
       write_field_string(batch_namespace.namespace, Aerospike::FieldType::NAMESPACE)
       write_field_header(byte_size, Aerospike::FieldType::DIGEST_RIPE_ARRAY)
 
@@ -275,7 +283,7 @@ module Aerospike
       end_cmd
     end
 
-    def set_batch_get(batch_namespace, bin_names, read_attr)
+    def set_batch_get(policy, batch_namespace, bin_names, read_attr)
       # Estimate buffer size
       begin_cmd
       byte_size = batch_namespace.keys.length * DIGEST_SIZE
@@ -296,7 +304,7 @@ module Aerospike
         operation_count = bin_names.length
       end
 
-      write_header(read_attr, 0, 2, operation_count)
+      write_header(policy, read_attr, 0, 2, operation_count)
       write_field_string(batch_namespace.namespace, Aerospike::FieldType::NAMESPACE)
       write_field_header(byte_size, Aerospike::FieldType::DIGEST_RIPE_ARRAY)
 
@@ -351,7 +359,7 @@ module Aerospike
         operation_count = bin_names.length
       end
 
-      write_header(read_attr, 0, field_count, operation_count)
+      write_header(policy, read_attr, 0, field_count, operation_count)
 
       if namespace
         write_field_string(namespace, Aerospike::FieldType::NAMESPACE)
@@ -534,7 +542,9 @@ module Aerospike
     end
 
     # Generic header write.
-    def write_header(read_attr, write_attr, field_count, operation_count)
+    def write_header(policy, read_attr, write_attr, field_count, operation_count)
+      read_attr |= INFO1_CONSISTENCY_ALL if policy.consistency_level == Aerospike::ConsistencyLevel::CONSISTENCY_ALL
+
       # Write all header data except total size which must be written last.
       @data_buffer.write_byte(MSG_REMAINING_HEADER_SIZE, 8) # Message heade.length.
       @data_buffer.write_byte(read_attr, 9)
@@ -581,6 +591,9 @@ module Aerospike
         write_attr |= INFO2_GENERATION_DUP
       end
 
+      info_attr |= INFO3_COMMIT_MASTER if policy.commit_level == Aerospike::CommitLevel::COMMIT_MASTER
+      read_attr |= INFO1_CONSISTENCY_ALL if policy.consistency_level == Aerospike::ConsistencyLevel::CONSISTENCY_ALL
+
       # Write all header data except total size which must be written last.
       @data_buffer.write_byte(MSG_REMAINING_HEADER_SIZE, 8) # Message heade.length.
       @data_buffer.write_byte(read_attr, 9)

data/lib/aerospike/command/execute_command.rb

@@ -34,7 +34,7 @@ module Aerospike
     end
 
     def write_buffer
-      set_udf(@key, @package_name, @function_name, @args)
+      set_udf(@policy, @key, @package_name, @function_name, @args)
     end
 
   end # class

data/lib/aerospike/command/exists_command.rb

@@ -34,7 +34,7 @@ module Aerospike
     end
 
     def write_buffer
-      set_exists(@key)
+      set_exists(@policy, @key)
     end
 
     def parse_result

data/lib/aerospike/command/read_command.rb

@@ -38,7 +38,7 @@ module Aerospike
     end
 
     def write_buffer
-      set_read(@key, @bin_names)
+      set_read(@policy, @key, @bin_names)
     end
 
     def parse_result

data/lib/aerospike/command/read_header_command.rb

@@ -34,7 +34,7 @@ module Aerospike
     end
 
     def write_buffer
-      set_read_header(@key)
+      set_read_header(@policy, @key)
     end
 
     def parse_result

data/lib/aerospike/policy/commit_level.rb

@@ -0,0 +1,28 @@
+# 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.
+
+module Aerospike
+
+  module CommitLevel
+
+    # Server should wait until successfully committing master and all replicas.
+    COMMIT_ALL = 0
+
+    # Server should wait until successfully committing master only.
+    COMMIT_MASTER = 1
+
+  end # module
+
+end # module

data/lib/aerospike/policy/consistency_level.rb

@@ -0,0 +1,28 @@
+# 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.
+
+module Aerospike
+
+  module ConsistencyLevel
+
+	# Involve a single replica in the operation.
+	CONSISTENCY_ONE = 0
+
+	# Involve all replicas in the operation.
+	CONSISTENCY_ALL = 1
+
+  end # module
+
+end # module

data/lib/aerospike/policy/policy.rb

@@ -14,6 +14,7 @@
 # limitations under the License.
 
 require 'aerospike/policy/priority'
+require 'aerospike/policy/consistency_level'
 
 
 module Aerospike
@@ -21,9 +22,9 @@ module Aerospike
   # Container object for client policy command.
   class Policy
 
-    attr_accessor :priority, :timeout, :max_retries, :sleep_between_retries
+    attr_accessor :priority, :timeout, :max_retries, :sleep_between_retries, :consistency_level
 
-    def initialize(priority=nil, timeout=nil, max_retiries=nil, sleep_between_retries=nil)
+    def initialize(priority=nil, timeout=nil, max_retiries=nil, sleep_between_retries=nil, consistency_level=nil)
       # Container object for transaction policy attributes used in all database
       # operation calls.
 
@@ -31,6 +32,11 @@ module Aerospike
       # Currently, only used for scans.
       @priority = 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
+
       # 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.

data/lib/aerospike/policy/write_policy.rb

@@ -14,6 +14,7 @@
 # limitations under the License.
 
 require 'aerospike/policy/policy'
+require 'aerospike/policy/commit_level'
 require 'aerospike/policy/generation_policy'
 require 'aerospike/policy/record_exists_action'
 
@@ -23,9 +24,9 @@ module Aerospike
   class WritePolicy < Policy
 
     attr_accessor :record_exists_action, :generation_policy,
-      :generation, :expiration, :send_key
+      :generation, :expiration, :send_key, :commit_level
 
-    def initialize(record_exists_action=nil, gen_policy=nil, generation=nil, expiration=nil, send_key=nil)
+    def initialize(record_exists_action=nil, gen_policy=nil, generation=nil, expiration=nil, send_key=nil, commit_level=nil)
       super()
 
       # Qualify how to handle writes where the record already exists.
@@ -35,6 +36,11 @@ module Aerospike
       # indicates that the generation is not used to restrict writes.
       @generation_policy = 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
+
       # 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

data/lib/aerospike/query/query_command.rb

@@ -81,7 +81,7 @@ module Aerospike
         fieldCount+=1
       end
 
-      @statement.task_id = Time.now.to_i + Time.usec if @statement.task_id == 0
+      @statement.set_task_id
 
       @data_offset += 8 + FIELD_HEADER_SIZE
       fieldCount+=1
@@ -113,7 +113,7 @@ module Aerospike
       readAttr = INFO1_READ
       operation_count = (@statement.filters.to_a.length == 0 && @statement.bin_names.to_a.length == 0) ? @statement.bin_names.length : 0
 
-      write_header(readAttr, 0, fieldCount, operation_count)
+      write_header(@policy, readAttr, 0, fieldCount, operation_count)
 
       if @statement.namespace
         write_field_string(@statement.namespace, Aerospike::FieldType::NAMESPACE)

data/lib/aerospike/query/statement.rb

@@ -48,7 +48,7 @@ module Aerospike
       @function_args = nil
 
       # TaskId determines query task id. (Optional)
-      @task_id = 0
+      @task_id = rand(RAND_MAX)
 
       # determines if the query should return data
       @return_data = true
@@ -65,6 +65,16 @@ module Aerospike
     return (filters.nil? || (filters.empty?))
   end
 
+  def set_task_id
+    while @task_id == 0
+      @task_id = rand(RAND_MAX)
+    end
+  end
+
+  private
+
+  RAND_MAX = 2**63
+
   end # class
 
 end

data/lib/aerospike/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aerospike
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Khosrow Afroozeh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-08 00:00:00.000000000 Z
+date: 2014-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: atomic
@@ -90,6 +90,8 @@ files:
 - lib/aerospike/operation.rb
 - lib/aerospike/policy/batch_policy.rb
 - lib/aerospike/policy/client_policy.rb
+- lib/aerospike/policy/commit_level.rb
+- lib/aerospike/policy/consistency_level.rb
 - lib/aerospike/policy/generation_policy.rb
 - lib/aerospike/policy/policy.rb
 - lib/aerospike/policy/priority.rb