luciano/next-jdbc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Switch reduce to r/reduce in folding logic #125

Browse source
This commit is contained in:
Sean Corfield 2020-06-26 19:32:48 -07:00
parent 8085acfcfc
commit 469eb0959a
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/next/jdbc/result_set.clj
View file

@ -614,7 +614,7 @@
[^PreparedStatement stmt n combinef reducef connectable opts] [^PreparedStatement stmt n combinef reducef connectable opts]
(if-let [rs (stmt->result-set stmt opts)] (if-let [rs (stmt->result-set stmt opts)]
(let [rs-map (mapify-result-set rs opts) (let [rs-map (mapify-result-set rs opts)
chunk (fn [batch] (#'r/fjtask #(reduce reducef (combinef) batch))) chunk (fn [batch] (#'r/fjtask #(r/reduce reducef (combinef) batch)))
realize (fn [row] (datafiable-row row connectable opts))] realize (fn [row] (datafiable-row row connectable opts))]
(loop [batch [] tasks []] (loop [batch [] tasks []]
(if (.next rs) (if (.next rs)
@ -622,7 +622,7 @@
(recur [(realize rs-map)] (conj tasks (#'r/fjfork (chunk batch)))) (recur [(realize rs-map)] (conj tasks (#'r/fjfork (chunk batch))))
(recur (conj batch (realize rs-map)) tasks)) (recur (conj batch (realize rs-map)) tasks))
(#'r/fjinvoke (#'r/fjinvoke
#(reduce combinef (combinef) #(r/reduce combinef (combinef)
(mapv #'r/fjjoin (conj tasks (#'r/fjfork (chunk batch))))))))) (mapv #'r/fjjoin (conj tasks (#'r/fjfork (chunk batch)))))))))
(reducef (combinef) {:next.jdbc/update-count (.getUpdateCount stmt)}))) (reducef (combinef) {:next.jdbc/update-count (.getUpdateCount stmt)})))
@ -669,7 +669,7 @@
[^Statement stmt sql n combinef reducef connectable opts] [^Statement stmt sql n combinef reducef connectable opts]
(if-let [rs (stmt-sql->result-set stmt sql opts)] (if-let [rs (stmt-sql->result-set stmt sql opts)]
(let [rs-map (mapify-result-set rs opts) (let [rs-map (mapify-result-set rs opts)
chunk (fn [batch] (#'r/fjtask #(reduce reducef (combinef) batch))) chunk (fn [batch] (#'r/fjtask #(r/reduce reducef (combinef) batch)))
realize (fn [row] (datafiable-row row connectable opts))] realize (fn [row] (datafiable-row row connectable opts))]
(loop [batch [] tasks []] (loop [batch [] tasks []]
(if (.next rs) (if (.next rs)
@ -677,7 +677,7 @@
(recur [(realize rs-map)] (conj tasks (#'r/fjfork (chunk batch)))) (recur [(realize rs-map)] (conj tasks (#'r/fjfork (chunk batch))))
(recur (conj batch (realize rs-map)) tasks)) (recur (conj batch (realize rs-map)) tasks))
(#'r/fjinvoke (#'r/fjinvoke
#(reduce combinef (combinef) #(r/reduce combinef (combinef)
(mapv #'r/fjjoin (conj tasks (#'r/fjfork (chunk batch))))))))) (mapv #'r/fjjoin (conj tasks (#'r/fjfork (chunk batch)))))))))
(reducef (combinef) {:next.jdbc/update-count (.getUpdateCount stmt)}))) (reducef (combinef) {:next.jdbc/update-count (.getUpdateCount stmt)})))