version bumps.

holyjak · Jul 18, 2012 · 74ac45d · 74ac45d
1 parent 61bbdf6
commit 74ac45d
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git a/project.clj b/project.clj
@@ -4,11 +4,11 @@
      :exclusions [org.codehaus.janino/janino
                   org.apache.hadoop/hadoop-core]]
     [org.clojure/tools.macro "0.1.1"]
-    [cascading.kryo "0.4.2"]
+    [cascading.kryo "0.4.3"]
     [cascalog/carbonite "1.3.0"]
     [log4j/log4j "1.2.16"]
     [hadoop-util "0.2.8"]
-    [com.twitter/maple "0.2.0"]
+    [com.twitter/maple "0.2.2"]
     [jackknife "0.1.2"]])
 
 (defproject cascalog/cascalog "1.10.1-SNAPSHOT"

diff --git a/src/clj/cascalog/rules.clj b/src/clj/cascalog/rules.clj
@@ -253,8 +253,8 @@
     (throw-illegal "Cannot specify a sort when there are no aggregators"))
   (if (and (not (:distinct options))
            (empty? aggs))
-    prev-tail  
-    (let [aggs (or (not-empty aggs) [p/distinct-aggregator])      
+    prev-tail
+    (let [aggs (or (not-empty aggs) [p/distinct-aggregator])
           [grouping-fields inserter] (normalize-grouping grouping-fields)
           [prep-aggs postgroup-aggs] (build-agg-assemblies grouping-fields aggs)
           assem        (apply w/compose-straight-assemblies
@@ -616,19 +616,19 @@
   (let [{invars :<< outvars :>>} (p/parse-variables vars :<)]
     (cond (var? p)
           [[(var-get p) vars]]
-      
+
           (instance? Subquery p)
           [[(.getCompiledSubquery p) vars]]
-        
+
           (instance? ClojureOp p)
           [(.toRawCascalogPredicate p vars)]
-        
+
           (instance? PredicateMacro p)
           (.getPredicates p (to-jcascalog-fields invars) (to-jcascalog-fields outvars))
 
           (instance? PredicateMacroTemplate p)
           [[(.getCompiledPredMacro p) vars]]
-          
+
           :else
           ((:pred-fn p) invars outvars))))
 

diff --git a/test/cascalog/api_test.clj b/test/cascalog/api_test.clj
@@ -259,7 +259,7 @@
              (pairs ?f1 ?v)
              (:sort ?v)
              (select-first ?v :> ?f2))
-    
+
     (test?<- [["a" 3] ["b" 20]]
              [?f1 ?f2]
              (pairs ?f1 ?v)
@@ -348,7 +348,7 @@
                [!!a]
                (age !!a ?b)
                (rec1 !!a _ _ :> true))
-    
+
     (thrown?<- IllegalArgumentException
                [?a !!c]
                (age ?a ?b)
@@ -446,7 +446,7 @@
     (test?<- [["nathan davidlalala"] ["chickenlalala"]]
              [?out]
              ((lala-appended sentence) ?out))
-    
+
     (test?<- [["nathan davida"] ["chickena"]]
              [?out]
              (sentence :>> [?line])
@@ -548,7 +548,7 @@
              [?l !m]
              (wide :#> 5 {4 ?l 2 !m})
              (:distinct false))
-    
+
     (test?<- [[4] [2] [3]]
              [?n3]
              (wide _ ?n1 _ _ ?n2)
@@ -625,7 +625,7 @@
                (num ?n)
                (odd-fail ?n)
                (:trap trap1)))
-    
+
     (is (thrown? Exception (test?<- [[2]]
                                     [?n]
                                     (num ?n)
@@ -708,7 +708,7 @@
              (vals ?a ?b ?c)
              (multipagg ?a ?b ?c :> ?d ?e)
              (c/count ?count))
-    
+
     (test?<- [[12 935 3]]
              [?d ?e ?count]
              (vals ?a ?b ?c)
@@ -722,7 +722,7 @@
              (vals ?v)
              ((KeepEven.) ?v)
              (:distinct false))
-    
+
     (test?<- [[0 true] [1 false]
               [2 true] [3 false]]
              [?v ?b]
@@ -893,7 +893,7 @@
 
             "Regexes are serializable w/ Kryo."
             [["a" "b"]]
-            (<- [?a ?b]   
+            (<- [?a ?b]
                 ([["a\tb"]] ?s)
                 (c/re-parse [#"[^\s]+"] :< ?s :> ?a ?b)))))