aerospike 0.1.3 → 0.1.5

data/lib/aerospike/query/scan_command.rb

@@ -0,0 +1,42 @@
+# 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.
+
+require 'aerospike/query/stream_command'
+require 'aerospike/query/recordset'
+
+module Aerospike
+
+  private
+
+  class ScanCommand < StreamCommand
+
+    def initialize(node, policy, namespace, set_name, bin_names, recordset)
+      super(node)
+
+      @policy = policy
+      @namespace = namespace
+      @set_name = set_name
+      @bin_names = bin_names
+      @recordset = recordset
+    end
+
+    def write_buffer
+      set_scan(@policy, @namespace, @set_name, @bin_names)
+    end
+
+  end # class
+
+end # module

data/lib/aerospike/query/statement.rb

@@ -0,0 +1,70 @@
+# 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
+
+  class Statement
+
+    attr_accessor :namespace, :set_name, :index_name, :bin_names, :task_id
+    attr_accessor :filters, :package_name, :function_name, :function_args
+    attr_accessor :return_data
+
+    def initialize(namespace, set_name, bin_names=[])
+      # Namespace determines query Namespace
+      @namespace = namespace
+
+      # SetName determines query Set name (Optional)
+      @set_name = set_name
+
+      # IndexName determines query index name (Optional)
+      # If not set, the server will determine the index from the filter's bin name.
+      @index_name = nil
+
+      # BinNames detemines bin names (optional)
+      @bin_names = bin_names
+
+      # Filters determine query filters (Optional)
+      # Currently, only one filter is allowed by the server on a secondary index lookup.
+      # If multiple filters are necessary, see QueryFilter example for a workaround.
+      # QueryFilter demonstrates how to add additional filters in an user-defined
+      # aggregation function.
+      @filters = []
+
+      @package_name  = nil
+      @function_name = nil
+      @function_args = nil
+
+      # TaskId determines query task id. (Optional)
+      @task_id = 0
+
+      # determines if the query should return data
+      @return_data = true
+    end
+
+  def set_aggregate_function(package_name, function_name, function_args=[], return_data=true)
+      @package_name  = package_name
+      @function_name = function_name
+      @function_args = function_args
+      @return_data = return_data
+  end
+
+  def is_scan?
+    return (filters.nil? || (filters.empty?))
+  end
+
+  end # class
+
+end

data/lib/aerospike/query/stream_command.rb

@@ -0,0 +1,68 @@
+# 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.
+
+require 'thread'
+
+require 'aerospike/record'
+
+require 'aerospike/command/command'
+
+module Aerospike
+
+  private
+
+  class StreamCommand < BatchCommand
+
+    def parse_record_results(receive_size)
+      @data_offset = 0
+
+      while @data_offset < receive_size
+        read_bytes(MSG_REMAINING_HEADER_SIZE)
+        result_code = @data_buffer.read(5).ord & 0xFF
+
+        # The only valid server return codes are "ok" and "not found".
+        # If other return codes are received, then abort the batch.
+        if result_code != 0
+          raise Aerospike::Exceptions::Aerospike.new(result_code)
+        end
+
+        info3 = @data_buffer.read(3).ord
+
+        # If cmd is the end marker of the response, do not proceed further
+        return false if (info3 & INFO3_LAST) == INFO3_LAST
+
+        generation = @data_buffer.read_int32(6)
+        expiration = @data_buffer.read_int32(10)
+        field_count = @data_buffer.read_int16(18)
+        op_count = @data_buffer.read_int16(20)
+        key = parse_key(field_count)
+
+        if result_code == 0
+          if @recordset.active?
+            @recordset.records.enq(parse_record(key, op_count, generation, expiration))
+          else
+            expn = @recordset.is_scan? ? SCAN_TERMINATED_EXCEPTION : QUERY_TERMINATED_EXCEPTION
+            raise expn
+          end
+        end
+      end # while
+
+      true
+    end
+
+  end # class
+
+end # module

data/lib/aerospike/task/task.rb

@@ -16,7 +16,7 @@
 
 require 'thread'
 require 'time'
-require 'atomic'
+require 'aerospike/atomic/atomic'
 
 module Aerospike
 
@@ -45,6 +45,7 @@ module Aerospike
               break if completed?
               sleep(poll_interval.to_f)
             rescue => e
+              Aerospike.logger.error(e)
               break if failures > allowed_failures
               failures += 1
             end

data/lib/aerospike/utils/epoc.rb

@@ -22,7 +22,14 @@ module Aerospike
 
   # Converts an Expiration time to TTL in seconds
   def self.TTL(secs_from_citrus_leaf_epoc)
-    CITRUSLEAF_EPOCH+secs_from_citrus_leaf_epoc - Time.now.to_i
+    if secs_from_citrus_leaf_epoc == 0
+      0xFFFFFFFF
+    else
+      now = Time.now.to_i - CITRUSLEAF_EPOCH
+      # Record was not expired at server but if it looks expired at client
+      # because of delay or clock differences, present it as not-expired.
+      secs_from_citrus_leaf_epoc > now ? secs_from_citrus_leaf_epoc - now : 1
+    end
   end
 
 end # module

data/lib/aerospike/value/value.rb

@@ -138,7 +138,7 @@ module Aerospike
     end
 
     def write(buffer, offset)
-      buffer.write_binary(bytes, offset)
+      buffer.write_binary(@bytes, offset)
       buffer.length
     end
 

data/lib/aerospike/version.rb

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

metadata

@@ -1,46 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: aerospike
 version: !ruby/object:Gem::Version
-  version: 0.1.3
-  prerelease: 
+  version: 0.1.5
 platform: ruby
 authors:
 - Khosrow Afroozeh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-26 00:00:00.000000000 Z
+date: 2014-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: atomic
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
   name: msgpack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
 description: Official Aerospike Client for ruby. Access your Aerospike cluster with
@@ -51,7 +46,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
+- LICENSE
+- README.md
+- lib/aerospike.rb
 - lib/aerospike/aerospike_exception.rb
+- lib/aerospike/atomic/atomic.rb
 - lib/aerospike/bin.rb
 - lib/aerospike/client.rb
 - lib/aerospike/cluster/cluster.rb
@@ -88,12 +88,21 @@ files:
 - lib/aerospike/ldt/large_stack.rb
 - lib/aerospike/loggable.rb
 - lib/aerospike/operation.rb
+- lib/aerospike/policy/batch_policy.rb
 - lib/aerospike/policy/client_policy.rb
 - lib/aerospike/policy/generation_policy.rb
 - lib/aerospike/policy/policy.rb
 - lib/aerospike/policy/priority.rb
+- lib/aerospike/policy/query_policy.rb
 - lib/aerospike/policy/record_exists_action.rb
+- lib/aerospike/policy/scan_policy.rb
 - lib/aerospike/policy/write_policy.rb
+- lib/aerospike/query/filter.rb
+- lib/aerospike/query/query_command.rb
+- lib/aerospike/query/recordset.rb
+- lib/aerospike/query/scan_command.rb
+- lib/aerospike/query/statement.rb
+- lib/aerospike/query/stream_command.rb
 - lib/aerospike/record.rb
 - lib/aerospike/result_code.rb
 - lib/aerospike/task/index_task.rb
@@ -107,35 +116,30 @@ files:
 - lib/aerospike/value/particle_type.rb
 - lib/aerospike/value/value.rb
 - lib/aerospike/version.rb
-- lib/aerospike.rb
-- CHANGELOG.md
-- LICENSE
-- README.md
 homepage: http://www.github.com/aerospike/aerospike-client-ruby
 licenses:
 - Apache2.0
-post_install_message: ! 'Thank you for using Aerospike!
-
-  You can report issues on github.com/aerospike/aerospike-client-ruby'
+metadata: {}
+post_install_message: |-
+  Thank you for using Aerospike!
+  You can report issues on github.com/aerospike/aerospike-client-ruby
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23.2
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: An Aerospike driver for Ruby.
 test_files: []