mandy 0.4.3 → 0.4.4

data/bin/mandy-local

@@ -47,7 +47,8 @@ out = nil
 Mandy::Job.jobs.each_with_index do |job, i|
   out = File.join(output_folder, "#{i+1}-#{job.name.downcase.gsub(/\W/, '-')}")
   puts "Running #{job.name}..."
-  `cat #{input} | mandy-map #{file} "#{job.name}" | sort | mandy-reduce #{file} "#{job.name}" > #{out}`
+  reduce_phase = job.reducer_defined? ? %(| sort | mandy-reduce #{file} "#{job.name}") : ''
+  `cat #{input} | mandy-map #{file} "#{job.name}" #{reduce_phase} > #{out}`
   input = out
 end
 

data/lib/job.rb

@@ -18,8 +18,10 @@ module Mandy
       @name = name
       @settings = {}
       @modules = []
+      @map, @reduce = nil, nil
       set('mapred.job.name', name)
       instance_eval(&blk) if blk
+      auto_set_reduce_count
     end
     
     def mixin(*modules)
@@ -88,7 +90,16 @@ module Mandy
       reducer.execute
     end
     
+    def reducer_defined?
+      !@reduce.nil?
+    end
+    
     private
+    
+    def auto_set_reduce_count
+      return if settings.has_key?('mapred.reduce.tasks')
+      reduce_tasks(reducer_defined? ? 1 : 0)
+    end
 
     def mapper_class
       return Mandy::Mappers::PassThroughMapper unless @map
@@ -117,10 +128,6 @@ module Mandy
       @modules.each {|m| @reducer_class.send(:include, m) }
       @reducer_class
     end
-            
-    def reducer_defined?
-      reducer_class != Mandy::Reducers::PassThroughReducer
-    end
     
   end
 end

data/lib/mandy.rb

@@ -65,7 +65,8 @@ at_exit do
   Mandy::Job.jobs.each_with_index do |job, i|
     out = File.join(output_folder, "#{i+1}-#{job.name.downcase.gsub(/\W/, '-')}")
     puts "Running #{job.name}..."
-    `cat #{input} | mandy-map #{file} "#{job.name}" | sort | mandy-reduce #{file} "#{job.name}" > #{out}`
+    reduce_phase = job.reducer_defined? ? %(| sort | mandy-reduce #{file} "#{job.name}") : ''
+    `cat #{input} | mandy-map #{file} "#{job.name}" #{reduce_phase} > #{out}`
     input = out
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mandy
 version: !ruby/object:Gem::Version 
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors: 
 - Andy Kent
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-05 00:00:00 +01:00
+date: 2009-10-15 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency