Moved wrong indented print-usage back to global namespace.

clizzin · Oct 22, 2010 · 66bc6a7 · 66bc6a7
1 parent 603c8f5
commit 66bc6a7
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 30 deletions.
diff --git a/src/clojure_hadoop/config.clj b/src/clojure_hadoop/config.clj
@@ -88,14 +88,14 @@
 (defmethod conf :map [^Job job key value]
   (let [value (as-str value)]
     (cond
-      (= "identity" value)
+     (= "identity" value)
-      (.setMapperClass job Mapper)
+     (.setMapperClass job Mapper)
 
-      (.contains value "/")
+     (.contains value "/")
-      (.set (configuration job) "clojure-hadoop.job.map" value)
+     (.set (configuration job) "clojure-hadoop.job.map" value)
 
-      :else
+     :else
-      (.setMapperClass job (Class/forName value)))))
+     (.setMapperClass job (Class/forName value)))))
 
 ;; The name of the mapper cleanup function as namespace/symbol.
 (defmethod conf :map-cleanup [^Job job key value]
@@ -115,17 +115,17 @@
 (defmethod conf :reduce [^Job job key value]
   (let [value (as-str value)]
     (cond
-      (= "identity" value)
+     (= "identity" value)
-      (.setReducerClass job Reducer)
+     (.setReducerClass job Reducer)
 
-      (= "none" value)
+     (= "none" value)
-      (.setNumReduceTasks job 0)
+     (.setNumReduceTasks job 0)
 
-      (.contains value "/")
+     (.contains value "/")
-      (.set (configuration job) "clojure-hadoop.job.reduce" value)
+     (.set (configuration job) "clojure-hadoop.job.reduce" value)
 
-      :else
+     :else
-      (.setReducerClass job (Class/forName value)))))
+     (.setReducerClass job (Class/forName value)))))
 
 ;; The name of the reducer cleanup function as namespace/symbol.
 (defmethod conf :reduce-cleanup [^Job job key value]
@@ -218,28 +218,28 @@
 (defmethod conf :input-format [^Job job key value]
   (let [val (as-str value)]
     (cond
-      (= "text" val)
+     (= "text" val)
-      (.setInputFormatClass job TextInputFormat)
+     (.setInputFormatClass job TextInputFormat)
 
-      (= "seq" val)
+     (= "seq" val)
-      (.setInputFormatClass job SequenceFileInputFormat)
+     (.setInputFormatClass job SequenceFileInputFormat)
 
-      :else
+     :else
-      (.setInputFormatClass job (Class/forName value)))))
+     (.setInputFormatClass job (Class/forName value)))))
 
 ;; The output file format.  May be a class name or "text" for
 ;; TextOutputFormat, "seq" for SequenceFileOutputFormat.
 (defmethod conf :output-format [^Job job key value]
   (let [val (as-str value)]
     (cond
-      (= "text" val)
+     (= "text" val)
-      (.setOutputFormatClass job TextOutputFormat)
+     (.setOutputFormatClass job TextOutputFormat)
 
-      (= "seq" val)
+     (= "seq" val)
-      (.setOutputFormatClass job SequenceFileOutputFormat)
+     (.setOutputFormatClass job SequenceFileOutputFormat)
 
-      :else
+     :else
-      (.setOutputFormatClass job (Class/forName value)))))
+     (.setOutputFormatClass job (Class/forName value)))))
 
 ;; If true, compress job output files.
 (defmethod conf :compress-output [^Job job key value]
@@ -292,10 +292,10 @@
   (when-not (even? (count args))
     (throw (IllegalArgumentException. "Number of options must be even.")))
   (doseq [[k v] (partition 2 args)]
-    (conf job (keyword (replace-re #"^:|-" "" k)) v))
+    (conf job (keyword (replace-re #"^:|-" "" k)) v)))
 
-  (defn print-usage []
+(defn print-usage []
-    (println "Usage: java -cp [jars...] clojure_hadoop.job [options...]
+  (println "Usage: java -cp [jars...] clojure_hadoop.job [options...]
 Required options are:
  -input     comma-separated input paths
  -output    output path
@@ -326,5 +326,5 @@ Other available options are:
  -compress-output   If \"true\", compress job output files
  -output-compressor Compression class or \"gzip\",\"bzip2\",\"default\"
  -compression-type  For seqfiles, compress \"block\",\"record\",\"none\"
-")))
+"))
 
diff --git a/test/clojure_hadoop/test/config.clj b/test/clojure_hadoop/test/config.clj
@@ -223,3 +223,7 @@
   (let [job (Job.)]
     (parse-command-line-args job ["replace" "true"])
     (is (= (.get (configuration job) "clojure-hadoop.job.replace") "true"))))
+
+(deftest test-print-usage
+  (let [out (with-out-str (print-usage))]
+    (is (re-find #"Usage.*" out))))