Skip to content
Snippets Groups Projects
Unverified Commit 25f10ee1 authored by Cam Saul's avatar Cam Saul Committed by GitHub
Browse files

Remove unused reducedf metadata param (#20311)

parent 06f35d71
No related branches found
No related tags found
No related merge requests found
......@@ -92,8 +92,8 @@
(defn public-reducedf
"Reducer function for public data"
[orig-reducedf]
(fn [metadata final-metadata context]
(orig-reducedf metadata (transform-results final-metadata) context)))
(fn [final-metadata context]
(orig-reducedf (transform-results final-metadata) context)))
(defn- run-query-for-card-with-id-async-run-fn
"Create the `:run` function used for [[run-query-for-card-with-id-async]] and [[public-dashcard-results-async]]."
......
......@@ -27,7 +27,7 @@
;; and `query-hash` ourselves so the remark gets added)
(assoc-in query [:info :query-hash] (qputil/query-hash query))))
(defn- async-result-metadata-reducedf [_ result context]
(defn- async-result-metadata-reducedf [result context]
(let [results-metdata (or (get-in result [:data :results_metadata :columns])
[])]
(context/resultf results-metdata context)))
......
......@@ -71,10 +71,10 @@
(defn reducedf
"Called in [[reducedf]] with fully reduced results. This result is passed to [[resultf]]."
{:arglists '([metadata reduced-rows context])}
[metadata reduced-rows {reducedf* :reducedf, :as context}]
{:arglists '([reduced-rows context])}
[reduced-rows {reducedf* :reducedf, :as context}]
{:pre [(fn? reducedf*)]}
(reducedf* metadata reduced-rows context))
(reducedf* reduced-rows context))
(defn timeoutf
"Call this function when a query times out."
......
......@@ -42,7 +42,7 @@
(vswap! rows conj row)
result))))
(defn- default-reducedf [_metadata reduced-result context]
(defn- default-reducedf [reduced-result context]
(context/resultf reduced-result context))
(defn default-reducef
......@@ -51,7 +51,6 @@
[[metabase.query-processor.reducible-test/write-rows-to-file-test]] for an example of a custom implementation."
[rff context metadata reducible-rows]
{:pre [(fn? rff)]}
;; TODO -- how to pass updated metadata to reducedf?
(let [rf (rff metadata)]
(assert (fn? rf))
(when-let [reduced-rows (try
......@@ -61,7 +60,7 @@
{:type error-type/qp}
e)
context)))]
(context/reducedf metadata reduced-rows context))))
(context/reducedf reduced-rows context))))
(defn- default-runf [query rf context]
(try
......
......@@ -124,7 +124,7 @@
metadata)))))
(defn- streaming-reducedf [results-writer ^OutputStream os]
(fn [_ final-metadata context]
(fn [final-metadata context]
(i/finish! results-writer final-metadata)
(u/ignore-exceptions
(.flush os)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment