aerospike 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9637e861d9aa3e0f0a4f7291877deabb198f7390
-  data.tar.gz: cd148fc3d987d2976a1a977b7212c113dd626dc8
+  metadata.gz: 29590c28263bbb25b84e0856deaa101c53e6e1b1
+  data.tar.gz: c737c8347a770a959c53d9677346761d0c6f0fcc
 SHA512:
-  metadata.gz: 6598cb2fc4b8f5d4cfa1c8f052b1694314d32330bea1a98735310a28be4e71eef1e8f93973e85bdf795ccd734e1d94d44642376dab7fbf0b2bb02a57649af3da
-  data.tar.gz: 479790b6ffdbeccc639ebf7b33b84ff120bfb0a9dc8e5ff11b96a2acf26f4dcee4586c542cf3f30de280fc7c8920b31f531eb4fb39afdee2d08ff18a7d32e594
+  metadata.gz: d06e1e14657badf69828cffa141a967ae02423572b29f107e635b754308c701d3bc9c153ad93c01ea7bd36294fcc84e87cc1b6e50e44bab5b6460add94035992
+  data.tar.gz: 5c8e4f46c757aec7d7b4c1f9fcb8ac815016d80aadb218d095cabb127e5af5c061635d08b17b8d42c6b784f40520223d94ae7a27b9f0f9c2fa101f285a1233d9

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## March 25 2015 (1.0.5)
+
+  Minor improvements.
+
+  * **New Features**:
+
+    * Added `:execute_udf_on_query` method to `Aerospike::Client`
+
 ## March 24 2015 (1.0.4)
 
   Hot fix.

data/lib/aerospike.rb

@@ -71,6 +71,7 @@ require 'aerospike/aerospike_exception'
 require 'aerospike/user_role'
 
 require 'aerospike/task/index_task'
+require 'aerospike/task/execute_task'
 require 'aerospike/task/udf_remove_task'
 require 'aerospike/task/udf_register_task'
 require 'aerospike/task/task'

data/lib/aerospike/client.rb

@@ -525,6 +525,43 @@ module Aerospike
       raise Aerospike::Exceptions::Aerospike.new(UDF_BAD_RESPONSE, "Invalid UDF return value")
     end
 
+    # execute_udf_on_query applies user defined function on records that match the statement filter.
+    # Records are not returned to the client.
+    # This asynchronous server call will return before command is complete.
+    # The user can optionally wait for command completion by using the returned
+    # ExecuteTask instance.
+    #
+    # This method is only supported by Aerospike 3 servers.
+    # If the policy is nil, the default relevant policy will be used.
+    def execute_udf_on_query(statement, package_name, function_name, function_args=[], options={})
+      policy = opt_to_query_policy(options)
+
+      nodes = @cluster.nodes
+      if nodes.length == 0
+        raise Aerospike::Exceptions::Aerospike.new(Aerospike::ResultCode::SERVER_NOT_AVAILABLE, "Executing UDF failed because cluster is empty.")
+      end
+
+      # TODO: wait until all migrations are finished
+      statement.set_aggregate_function(package_name, function_name, function_args, false)
+
+      # Use a thread per node
+      nodes.each do |node|
+        Thread.new do
+          abort_on_exception = true
+          begin
+            command = QueryCommand.new(node, policy, statement, nil)
+            command.execute
+          rescue => e
+            Aerospike.logger.error(e)
+            raise e
+          end
+        end
+      end
+
+      ExecuteTask.new(@cluster, statement)
+    end
+
+
     #  Create secondary index.
     #  This asynchronous server call will return before command is complete.
     #  The user can optionally wait for command completion by using the returned

data/lib/aerospike/command/roles.rb

@@ -29,7 +29,7 @@ module Aerospike
 		 READ_WRITE = 'read-write'
 
 		 # Allow read transactions with the database.
-		 READ = 'Read'
+		 READ = 'read'
 
 	end # module
 

data/lib/aerospike/query/query_command.rb

@@ -92,7 +92,7 @@ module Aerospike
         @data_offset += @statement.function_name.bytesize + FIELD_HEADER_SIZE
 
         if @statement.function_args && @statement.function_args.length > 0
-          functionArgBuffer = Value.of(@statement.function_args).bytes
+          functionArgBuffer = Value.of(@statement.function_args).to_bytes
         else
           functionArgBuffer = 0.ord
         end

data/lib/aerospike/query/stream_command.rb

@@ -36,6 +36,11 @@ module Aerospike
         # 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
+          # if there is no recordset defined, it means this is an Execute UDF On Query command
+          # return successfully
+          if (@recordset == nil) && (result_code == Aerospike::ResultCode::KEY_NOT_FOUND_ERROR)
+            return nil
+          end
           raise Aerospike::Exceptions::Aerospike.new(result_code)
         end
 

data/lib/aerospike/task/execute_task.rb

@@ -0,0 +1,85 @@
+# Copyright 2013-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
+
+	private
+
+	# ExecuteTask is used to poll for long running server execute job completion.
+	class ExecuteTask < Task
+
+		# NewExecuteTask initializes task with fields needed to query server nodes.
+		def initialize(cluster, statement)
+			super(cluster, false)
+
+			@task_id = statement.task_id
+			@scan = statement.is_scan?
+
+			self
+		end
+
+		# IsDone queries all nodes for task completion status.
+		def all_nodes_done?
+
+			if @scan 
+				command = 'scan-list'
+			else 
+				command = 'query-list'
+			end
+
+			nodes = @cluster.nodes
+			done = false
+
+			nodes.each do |node|
+				conn = node.get_connection(0)
+				responseMap, err = Info.request(conn, command)
+				node.put_connection(conn)
+
+				response = responseMap[command]
+				find = "job_id=#{@task_id}:"
+				index = response.index(find)
+
+				unless index
+					# don't return on first check
+					done = true
+					next
+				end
+
+				b = index + find.length
+				response = response[b, response.length]
+				find = 'job_status='
+				index = response.index(find)
+
+				next unless index
+
+				b = index + find.length
+				response = response[b, response.length]
+				e = response.index(':')
+				status = response[0, e]
+
+				case status 
+				when 'ABORTED'
+					raise raise Aerospike::Exceptions::QueryTerminated
+				when 'IN PROGRESS'
+					return false
+				when 'DONE'
+					done = true
+				end
+			end
+
+			done
+		end
+
+	end
+end

data/lib/aerospike/task/task.rb

@@ -42,8 +42,8 @@ module Aerospike
           failures = 0
           while true
             begin
-              break if completed?
               sleep(poll_interval.to_f)
+              break if completed?
             rescue => e
               Aerospike.logger.error(e)
               break if failures > allowed_failures

data/lib/aerospike/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aerospike
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Khosrow Afroozeh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-24 00:00:00.000000000 Z
+date: 2015-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -110,6 +110,7 @@ files:
 - lib/aerospike/query/stream_command.rb
 - lib/aerospike/record.rb
 - lib/aerospike/result_code.rb
+- lib/aerospike/task/execute_task.rb
 - lib/aerospike/task/index_task.rb
 - lib/aerospike/task/task.rb
 - lib/aerospike/task/udf_register_task.rb