FIXED #9. Added support for custom merge function.

sunng87 · Apr 7, 2014 · 4089ba6 · 4089ba6
1 parent 9ee7016
commit 4089ba6
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/src/slacker/client/cluster.clj b/src/slacker/client/cluster.clj
@@ -97,12 +97,16 @@
               :nested (map :cause (filter :cause call-results))}}
 
      :else
-     (let [valid-results (remove :cause call-results)]
-       {:result (case (grouping-results)
+     (let [valid-results (remove :cause call-results)
+           grouping-results-config (grouping-results)]
+       {:result (case grouping-results-config
                   :single (:result (first valid-results))
                   :vector (mapv :result valid-results)
                   :map (into {} (map #(vector (:server %) (:result %))
-                                     valid-results)))}))))
+                                     valid-results))
+                  (if (fn? grouping-results-config)
+                    (grouping-results-config valid-results)
+                    (throw (ex-info "Unsupported grouping-results value"))))}))))
 
 (deftype GroupedPromise [grouping-fn promises]
   IDeref

diff --git a/test/slacker/test/client/cluster.clj b/test/slacker/test/client/cluster.clj
@@ -50,4 +50,13 @@
                               ["1" "2"]
                               [{:result 1}
                                {:result 2}])]
-    (is (= 1 (-> r :result (get "1"))))))
+    (is (= 1 (-> r :result (get "1")))))
+  (let [grf (fn []
+              (fn [results]
+                (reduce + (map :result results))))
+        r (group-call-results grf
+                              :all
+                              ["1" "2"]
+                              [{:result 1}
+                               {:result 2}])]
+    (is (= 3 (:result r)))))