Skip to content

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

[metadata] Analysis optimizations (#83635)

Oleksandr Yakushev01bd5d9ea541
diff --git a/src/metabase/analyze/classifiers/name.clj b/src/metabase/analyze/classifiers/name.clj
index adc1438e3f4..ae74e898692 100644
--- a/src/metabase/analyze/classifiers/name.clj
+++ b/src/metabase/analyze/classifiers/name.clj
@@ -1,5 +1,6 @@
(ns metabase.analyze.classifiers.name
"Classifier that infers the semantic type of a Field based on its name and base type."
+ (:refer-clojure :exclude [some])
(:require
[clojure.string :as str]
[metabase.analyze.schema :as analyze.schema]
@@ -9,7 +10,8 @@
[metabase.util :as u]
[metabase.util.log :as log]
[metabase.util.malli :as mu]
- [metabase.util.malli.schema :as ms]))
+ [metabase.util.malli.schema :as ms]
+ [metabase.util.performance :refer [some]]))
(def ^:private float-type #{:type/Float})
(def ^:private int-type #{:type/Integer})
diff --git a/src/metabase/analyze/query_results.clj b/src/metabase/analyze/query_results.clj
index fd1b6ebef69..861e65f1785 100644
--- a/src/metabase/analyze/query_results.clj
+++ b/src/metabase/analyze/query_results.clj
@@ -8,6 +8,7 @@
[metabase.analyze.fingerprint.fingerprinters :as fingerprinters]
[metabase.analyze.fingerprint.insights :as insights]
[metabase.query-processor.schema :as query-processor.schema]
+ [metabase.util :as u]
[metabase.util.i18n :as i18n]
[metabase.util.log :as log]
[metabase.util.malli :as mu]
@@ -45,11 +46,10 @@
"Make sure a `column` as it comes back from a driver's initial results metadata matches the schema for valid results
column metadata, adding placeholder values and removing nil keys."
[column :- ResultColumnMetadata]
- ;; HACK - not sure why we don't have display_name yet in some cases
- (merge
- {:base_type :type/*
- :display_name (:name column)}
- column))
+ (-> column
+ (u/assoc-default :base_type :type/*)
+ ;; HACK - not sure why we don't have display_name yet in some cases
+ (u/assoc-default :display_name (:name column))))
(mu/defn insights-rf :- fn?
"A reducing function that calculates what is ultimately returned as `[:data :results_metadata]` in userland QP
diff --git a/src/metabase/lib/metadata/result_metadata.cljc b/src/metabase/lib/metadata/result_metadata.cljc
index c688c6ea817..4ec21258910 100644
--- a/src/metabase/lib/metadata/result_metadata.cljc
+++ b/src/metabase/lib/metadata/result_metadata.cljc
@@ -477,22 +477,15 @@
(add-source-and-desired-aliases query)))))
(defn- add-unit [col]
- (merge
- ;; TODO -- we also need to 'flow' the unit from previous stage(s) "so the frontend can use the correct
- ;; formatting to display values of the column" according
- ;; to [[metabase.query-processor.nested-queries-test/breakout-year-test]]
- (when-let [temporal-unit ((some-fn :lib/temporal-unit :inherited-temporal-unit) col)]
- {:unit temporal-unit})
- col))
+ ;; TODO -- we also need to 'flow' the unit from previous stage(s) "so the frontend can use the correct formatting to
+ ;; display values of the column" according to [[metabase.query-processor.nested-queries-test/breakout-year-test]]
+ (u/assoc-default col :unit (or (:lib/temporal-unit col)
+ (:inherited-temporal-unit col))))
(defn- add-binning-info [col]
- (merge
- (when-let [binning-info ((some-fn :lib/binning :lib/original-binning) col)]
- {:binning-info (merge
- (when-let [strategy (:strategy binning-info)]
- {:binning-strategy strategy})
- binning-info)})
- col))
+ (if-let [binning-info (or (:lib/binning col) (:lib/original-binning col))]
+ (u/assoc-default col :binning-info (u/assoc-default binning-info :binning-strategy (:strategy binning-info)))
+ col))
;;; TODO (Cam 6/12/25) -- remove `:lib/uuid` because it causes way to many test failures. Probably would be better to
;;; keep it around but I don't have time to update a million tests. Why do columns have `:lib/uuid` anyway? They