mongo_mapper_parallel 1.0.6 → 1.0.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDQ3Yjk5OTg1YTYyYzQ0MWU4MjliNDlhNDUxMDAxYmVkZjY4ZDQwOQ==
+    YzRjYTA1ZjY1MDJlYjhlYmRmN2JjYjQ1NjYwOTM5ZDg2NDUxYmQ1YQ==
   data.tar.gz: !binary |-
-    NDI0ZWM1MTQ2Yzk4NmZiMTM4ZTIzNzNmOGY2ZWMwYjA3OTZmNTNjZA==
+    NzI4MDNmNTExZmQ5NTUyZWUyOTRkZGM0ZDExMDlmNTNlNGZlNTViNg==
 SHA512:
   metadata.gz: !binary |-
-    NmVjYWE5MTI5YjkwY2ZiMzRiMzdmN2I5Mjk3ZWNlNzJhNzY2ZWVjZmNmODQx
-    OGI0ZDA5N2ZiZTM4ZWM4MWFmY2Q3N2RmNGM1ZjYwNjc0MGU1ZTc4NTJkOWM4
-    N2JmNGMxODEwOGRiZjU2YWIyYzA2ZjY5MTM2NzQ3ZThmM2Q5ZjQ=
+    OTk4MDUzNzA3M2Y3MzU2NjdkNTRlODBmN2NjY2I0NDAxNjE2ZTliMGYxYjIy
+    MGY1Y2VlNjUwZmVjNWFhYjNhMDM4YmIzZjFiYTVjNWI2ZDJhNGM1Y2MzNDRk
+    YTFkNDU3MjE5Y2VlODhiNzZjNGFlM2YxOWE4MWJjYmQ3MGMxZmY=
   data.tar.gz: !binary |-
-    NjJmMTBjNTQ1OTAyMjkzMjcxYTgwYjlhYjU2ZDljYzhkZDFjNWJjZjI5ZjQx
-    M2MwZTFhNDllOWM4MGZlMTIzZjcxYzAyM2YyMDc2Y2QzMjI4NTE4YTkwOTAy
-    Y2FiNzYzOGVkOWI5M2I5Mzc2ZWNiNGEyYTZhMDg0ZWExMjNjYzM=
+    NjFjN2U4Yzg4OWI3Y2Y5YWVhYzA0NDk0ZWUyYTU1ODllMGM0ZjA3MGFjYzZh
+    MmMzOTE5NjQ1N2Y0ODkxODMyM2ZhNTcxODc0YzUzZDgxYTI0ZjBhZmI1MGY1
+    YzQwM2YzMjQ4N2JiY2Y4OGI0ZTQxMjJhOTdlZTZiZTg1YmYwNmY=

data/lib/mongo_mapper_parallel.rb

@@ -11,6 +11,7 @@ class MongoMapperParallel
 	attr_accessor :command_class
 	attr_accessor :javascript
 	attr_accessor :args
+	attr_accessor :debug
 
 	class Key
 		# A chunk that will be parallelized
@@ -18,6 +19,7 @@ class MongoMapperParallel
 		attr_accessor :key
 		attr_accessor :completed
 		attr_reader   :compiler
+		attr_accessor :debug
 
 		# A chunk that will be parallelized
 		# 
@@ -25,12 +27,13 @@ class MongoMapperParallel
 		# @option opts [String] :key the lower bound of the range of resources to retrieve
 		# @option opts [String] :future_key the upper bound for the range of resources to retrieve
 		# @option opts [MongoMapperParallel] :compiler the Parallel execution object that holds the keys, javascript, and arguments.
-		#
+		# @option opts [Boolean] :debug whether to show messages during the process.
 		def initialize(opts={})
 			@key        = opts[:key]
 			@compiler   = opts[:compiler]
 			@future_key = opts[:future_key]
 			@completed  = false
+			@debug      = opts[:debug].nil? true : opts[:debug]
 		end
 
 		# The javascript function to run on the resources
@@ -54,13 +57,17 @@ class MongoMapperParallel
 		def compile
 			search_opts = {:name => {:$gte => @key}}
 			if @future_key then search_opts[:name][:$lte] = @future_key	end
-			command_class.database.command({
-				:"$eval" => javascript,
-				:args    => [@key, @future_key, args],
-				:nolock => true
-				})
+			begin
+				command_class.database.command({
+					:"$eval" => javascript,
+					:args    => [@key, @future_key, args],
+					:nolock => true
+					})
+			rescue Mongo::ConnectionFailure
+				raise Mongo::ConnectionFailure.new "Connection disconnected at position #{@position}"
+			end
 			@completed = true
-			puts "Completed chunk".green
+			puts "Completed chunk (#{@position})".green if @debug
 		end
 	end
 
@@ -71,7 +78,7 @@ class MongoMapperParallel
 	def get_split_keys
 		@split_keys, splits = [], @command_class.database.command({splitVector: "#{@command_class.database.name}.#{@command_class.collection.name}", keyPattern: {@split.to_sym => 1}, maxChunkSizeBytes: @splitSize })["splitKeys"]
 		splits.each_with_index do |split_key,k|
-			@split_keys << MongoMapperParallel::Key.new(:compiler => self, :key => split_key[@split.to_s], :future_key => (splits[k+1] ? splits[k+1][@split.to_s] : nil))
+			@split_keys << MongoMapperParallel::Key.new(:position => k, :compiler => self, :key => split_key[@split.to_s], :future_key => (splits[k+1] ? splits[k+1][@split.to_s] : nil),:debug => @debug)
 		end
 		if @split_keys.length == 0 and @command_class.count > 0 then get_extreme_split_keys end
 	end
@@ -81,7 +88,7 @@ class MongoMapperParallel
 	# @return [Array<MongoMapperParallel::Key>] the list of the keys that will be used for parallel operation
 	def get_extreme_split_keys
 		split_key = @command_class.where().order(@split.to_sym).fields(@split.to_sym).first.send(@split.to_sym)
-		@split_keys << MongoMapperParallel::Key.new(:compiler => self, :key => split_key, :future_key => nil)
+		@split_keys << MongoMapperParallel::Key.new(:position => 0, :compiler => self, :key => split_key, :future_key => nil, :debug => @debug)
 	end
 
 	# Instantiates the parallel operation object with the right class, javascript function, and field
@@ -92,6 +99,7 @@ class MongoMapperParallel
 	# @option opts [Array, Hash] :args the arguments to pass to the Javascript function
 	# @option opts [String, Symbol] :split the field to split the computation on -- typically an indexed unique property of the resources in the collection.
 	# @option opts [Fixnum] :maxChunkSizeBytes the size of the chunks to parallelize. Defaults to `32*1024*1024 = 33554432`.
+	# @option opts [Boolean] :debug whether to show messages during the process.
 	# @return [MongoMapperParallel]
 	#
 	def initialize(opts={})
@@ -100,6 +108,7 @@ class MongoMapperParallel
 		@args          = opts[:args]
 		@split         = opts[:split] # name, title, etc...
 		@splitSize     = opts[:maxChunkSizeBytes] || 32*1024*1024
+		@debug         = opts[:debug].nil? true : opts[:debug]
 		get_split_keys()
 		self
 	end
@@ -110,9 +119,9 @@ class MongoMapperParallel
 		total = @split_keys.length
 		Parallel.each_with_index(@split_keys) do |section,k|
 			if !section.completed then section.compile end
-			JRProgressBar.show(k,total)
+			JRProgressBar.show(k,total) if @debug
 		end
-		puts "Success".green
+		puts "Success".green if @debug
 	end
 
 	# In case of stalled progress you can skip ahead by a percentage and mark the keys as `completed`.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongo_mapper_parallel
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Jonathan Raiman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-06 00:00:00.000000000 Z
+date: 2013-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongo_mapper