The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:
TypeScript analyticsbibusiness-intelligencebusinessintelligenceclojuredashboarddatadata-analysisdata-visualizationdatabasemetabasemysqlpostgrespostgresqlreportingslacksql-editorvisualization
[malli.registry] Try look up schema in cache without de-regexping it (#78099)
Oleksandr Yakushev3c1615f815f5
diff --git a/src/metabase/util/malli/registry.cljc b/src/metabase/util/malli/registry.cljcindex 6c41c31a04f..b3b213868d9 100644--- a/src/metabase/util/malli/registry.cljc+++ b/src/metabase/util/malli/registry.cljc@@ -57,13 +57,17 @@You generally shouldn't use this outside of this namespace unless you have a really good reason to do so! Make sureyou used namespaced keys if you are using it elsewhere."[k schema value-thunk]- (let [schema-key (schema-cache-key schema)]- (or (some-> (get (get @cache k) schema-key) (deref-entry value-thunk)) ; get-in is terribly inefficient- (let [v (value-thunk)]- (when *cache-miss-hook*- (*cache-miss-hook* k schema v))- (swap! cache assoc-in [k schema-key] (cache-entry v))- v))))+ (let [cache-map (get @cache k)]+ ;; First, try looking up schema in the cache as is.+ (or (some-> (get cache-map schema) (deref-entry value-thunk))+ ;; If that fails, ensure that schema doesn't contain non-= elements and try again.+ (let [schema-key (schema-cache-key schema)]+ (or (some-> (get cache-map schema-key) (deref-entry value-thunk))+ (let [v (value-thunk)]+ (when *cache-miss-hook*+ (*cache-miss-hook* k schema v))+ (swap! cache assoc-in [k schema-key] (cache-entry v))+ v))))))(defn- cached-schema [schema](if (mc/-reference? schema)