trafficbroker-mandy 0.1.5 → 0.1.6

data/bin/mandy-hadoop

@@ -19,18 +19,16 @@ require absolute_path(file)
 
 Mandy::Job.jobs.each_with_index do |job, i|
   
-  jobconf = job.settings.map { |key, value| %(-jobconf #{key}="#{value}") }.join(' ')
-  
+  jobconf = job.settings.map { |key, value| %(-D #{key}='#{value}') }.join(' ')
   output = File.join(output_folder, "#{i+1}-#{job.name.downcase.gsub(/\W/, '-')}")
   
-  command = %($HADOOP_HOME/bin/hadoop jar $HADOOP_HOME/contrib/streaming/hadoop-*-streaming.jar \
-                  -additionalconfspec "#{config}" \
+  command = %($HADOOP_HOME/bin/hadoop jar $HADOOP_HOME/contrib/streaming/hadoop-*-streaming.jar #{jobconf}\
+                  -conf '#{config}' \
                   -input "#{input}"  \
                   -mapper "mandy-map #{filename} '#{job.name}'"  \
                   -reducer "mandy-reduce #{filename} '#{job.name}'"  \
                   -file "#{file}" \
-                  -output "#{output}" \
-                  #{jobconf})
+                  -output "#{output}")
 
   `#{command}`
 

data/bin/mandy-rm

@@ -5,7 +5,7 @@ if ARGV.size==0
   exit
 end
 
-file = ARGV[1]
-config = ARGV[0]
+file = ARGV[0]
+config = ARGV[1]
 
 `$HADOOP_HOME/bin/hadoop fs -conf #{config} -rmr #{file}`

data/lib/mandy.rb

@@ -6,6 +6,8 @@
   reducers/base_reducer 
   reducers/pass_through_reducer 
   reducers/sum_reducer 
+  reducers/max_reducer 
+  reducers/min_reducer 
   dsl 
   job 
   test_runner

data/lib/reducers/max_reducer.rb

@@ -0,0 +1,10 @@
+module Mandy
+  module Reducers
+    class MaxReducer < Base
+      def reducer(key,values)
+        values.map! {|value| value.to_f}
+        emit(key, values.max)
+      end
+    end
+  end
+end

data/lib/reducers/min_reducer.rb

@@ -0,0 +1,10 @@
+module Mandy
+  module Reducers
+    class MinReducer < Base
+      def reducer(key,values)
+        values.map! {|value| value.to_f}
+        emit(key, values.min)
+      end
+    end
+  end
+end

data/lib/support/tuple.rb

@@ -17,7 +17,12 @@ module Mandy
       new(*str.split(SEPERATOR))
     end
     
+    def inspect
+      %(<Tuple #{self.to_s}>)
+    end
+    
     def ==(other)
+      return false unless self.class == other.class
       self.name == other.name && self.value == other.value
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: trafficbroker-mandy
 version: !ruby/object:Gem::Version 
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors: 
 - Andy Kent
@@ -46,6 +46,8 @@ files:
 - lib/reducers/base_reducer.rb
 - lib/reducers/pass_through_reducer.rb
 - lib/reducers/sum_reducer.rb
+- lib/reducers/max_reducer.rb
+- lib/reducers/min_reducer.rb
 - lib/test_runner.rb
 has_rdoc: false
 homepage: