Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

fix: druid breakout and agg names must be unique (#59483)

Case Nelson074744427732
diff --git a/modules/drivers/druid-jdbc/test/metabase/driver/druid_jdbc_test.clj b/modules/drivers/druid-jdbc/test/metabase/driver/druid_jdbc_test.clj
index 5c0115b852a..adc831624dd 100644
--- a/modules/drivers/druid-jdbc/test/metabase/driver/druid_jdbc_test.clj
+++ b/modules/drivers/druid-jdbc/test/metabase/driver/druid_jdbc_test.clj
@@ -3,11 +3,15 @@
[clojure.test :refer :all]
[java-time.api :as t]
[malli.error :as me]
+ [medley.core :as m]
[metabase.driver :as driver]
[metabase.driver.common.table-rows-sample :as table-rows-sample]
[metabase.driver.settings :as driver.settings]
[metabase.driver.sql-jdbc.sync.interface :as sql-jdbc.sync.interface]
[metabase.driver.util :as driver.u]
+ [metabase.lib-be.metadata.jvm :as lib.metadata.jvm]
+ [metabase.lib.core :as lib]
+ [metabase.lib.metadata :as lib.metadata]
[metabase.query-processor :as qp]
[metabase.query-processor.compile :as qp.compile]
[metabase.query-processor.timeseries-test.util :as tqpt]
@@ -550,6 +554,15 @@
(sort-by first)
(take 5)))
+(deftest breakout-aggregation-unique-names-test
+ (testing "Breakouts must be unique from aggregation names (#10670)"
+ (tqpt/test-timeseries-drivers
+ (let [mp (lib.metadata.jvm/application-database-metadata-provider (mt/id))
+ query (as-> (lib/query mp (lib.metadata/table mp (mt/id :checkins))) $q
+ (lib/breakout $q (m/find-first (comp #{"count"} :name) (lib/breakoutable-columns $q)))
+ (lib/aggregate $q (lib/count)))]
+ (is (seq (mt/rows (qp/process-query query))))))))
+
(deftest ^:synchronized table-rows-sample-test
(mt/test-driver
:druid-jdbc
diff --git a/modules/drivers/druid/src/metabase/driver/druid/query_processor.clj b/modules/drivers/druid/src/metabase/driver/druid/query_processor.clj
index 52738eec92e..f306f7f5999 100644
--- a/modules/drivers/druid/src/metabase/driver/druid/query_processor.clj
+++ b/modules/drivers/druid/src/metabase/driver/druid/query_processor.clj
@@ -674,11 +674,15 @@
[:max _] [[(or output-name-kwd :max)]
{:aggregations [(ag:doubleMax ag-field (or output-name :max))]}])))
+(defn ^:private ^:dynamic *query-unique-name-fn*
+ [& _]
+ (throw (ex-info "Must bind metabase.driver.druid.query-processor/*query-unique-name-fn*. See handle-aggregation for an example." {})))
+
(mu/defn- handle-aggregation
[query-type
ag-clause :- driver-api/mbql.schema.Aggregation
druid-query]
- (let [output-name (driver-api/aggregation-name *query* ag-clause)
+ (let [output-name (*query-unique-name-fn* (driver-api/aggregation-name *query* ag-clause))
[ag-type ag-field & args] (driver-api/match-one ag-clause
[:aggregation-options ag & _] #_:clj-kondo/ignore (recur ag)
_ &match)]
@@ -703,13 +707,8 @@
[:aggregation-options [:aggregation-options ag options-1] options-2]
[:aggregation-options ag (merge options-1 options-2)]))
-(def ^:private ^:dynamic *query-unique-identifier-counter*
- "Counter used for generating unique identifiers for use in the query. Bound to `(atom 0)` and incremented on each use
- as the MBQL query is compiled."
- nil)
-
(defn- aggregation-unique-identifier [clause]
- (format "__%s_%d" (name clause) (first (swap-vals! *query-unique-identifier-counter* inc))))
+ (format "__%s" (*query-unique-name-fn* (name clause))))
(defn- add-expression-aggregation-output-names
[expression]
@@ -792,19 +791,23 @@
(defn- handle-aggregations
[query-type {aggregations :aggregation} druid-query]
- (reduce
- (fn [druid-query aggregation]
- (driver-api/match-one aggregation
- [:aggregation-options [(_ :guard #{:+ :- :/ :*}) & _] _]
- (handle-expression-aggregation query-type &match druid-query)
+ (binding [*query-unique-name-fn* (driver-api/unique-name-generator)]
+ ;; Load unique name generator with projections from breakouts
+ (doseq [projection (:projections druid-query)]
+ (*query-unique-name-fn* (name projection)))
+ (reduce
+ (fn [druid-query aggregation]
+ (driver-api/match-one aggregation
+ [:aggregation-options [(_ :guard #{:+ :- :/ :*}) & _] _]
+ (handle-expression-aggregation query-type &match druid-query)
- #{:+ :- :/ :*}
- (handle-expression-aggregation query-type &match druid-query)
+ #{:+ :- :/ :*}
+ (handle-expression-aggregation query-type &match druid-query)
- _
- (handle-aggregation query-type &match druid-query)))
- druid-query
- aggregations))
+ _
+ (handle-aggregation query-type &match druid-query)))
+ druid-query
+ aggregations)))
;;; ------------------------------------------------ handle-breakout -------------------------------------------------
@@ -1205,8 +1208,7 @@
;; Merge `:settings` into the inner query dict so the QP has access to it
(let [query (driver-api/->legacy-MBQL query)
query (assoc (:query query) :settings (:settings query))]
- (binding [*query* query
- *query-unique-identifier-counter* (atom 0)]
+ (binding [*query* query]
(try
(build-druid-query query)
(catch Throwable e
diff --git a/modules/drivers/druid/test/metabase/driver/druid/query_processor_test.clj b/modules/drivers/druid/test/metabase/driver/druid/query_processor_test.clj
index cb5fd8991ca..199a1653148 100644
--- a/modules/drivers/druid/test/metabase/driver/druid/query_processor_test.clj
+++ b/modules/drivers/druid/test/metabase/driver/druid/query_processor_test.clj
@@ -101,7 +101,7 @@
(deftest ^:parallel compile-topN-test
(mt/test-driver :druid
(tqpt/with-flattened-dbdef
- (is (= {:projections [:venue_price :__count_0 :expression]
+ (is (= {:projections [:venue_price :__count :expression]
:query {:queryType :topN
:threshold 1000
:granularity :all
@@ -111,7 +111,7 @@
:postAggregations [{:type :arithmetic
:name "expression"
:fn :*
- :fields [{:type :fieldAccess, :fieldName "__count_0"}
+ :fields [{:type :fieldAccess, :fieldName "__count"}
{:type :constant, :name "10", :value 10}]}]
:intervals ["1900-01-01/2100-01-01"]
:metric {:type :alphaNumeric}
@@ -119,7 +119,7 @@
[{:type :filtered
:filter {:type :not
:field {:type :selector, :dimension "id", :value nil}}
- :aggregator {:type :count, :name "__count_0"}}]}
+ :aggregator {:type :count, :name "__count"}}]}
:query-type ::druid.qp/topN
:mbql? true}
(query->native