Skip to content

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

Empty nodes yields empty traversal instead of error (#76262)

Ben Grabow63a2dbfdf412
diff --git a/src/metabase/util.cljc b/src/metabase/util.cljc
index 2b968a5a07c..e0f196666bc 100644
--- a/src/metabase/util.cljc
+++ b/src/metabase/util.cljc
@@ -1035,16 +1035,16 @@
[nodes traverse-fn]
(loop [to-traverse (zipmap nodes (repeat nil))
traversed {}]
- (let [item (first to-traverse)
- found (traverse-fn (key item))
- traversed (conj traversed item)
- ;; `merge-with into` allows us to not lose dependency info if an entity was required from a few different
- ;; locations
- to-traverse (merge-with into
- (dissoc to-traverse (key item))
- (apply dissoc found (keys traversed)))]
- (if (empty? to-traverse)
- traversed
+ (if (empty? to-traverse)
+ traversed
+ (let [item (first to-traverse)
+ found (traverse-fn (key item))
+ traversed (conj traversed item)
+ ;; `merge-with into` allows us to not lose dependency info if an entity was required from a few different
+ ;; locations
+ to-traverse (merge-with into
+ (dissoc to-traverse (key item))
+ (apply dissoc found (keys traversed)))]
(recur to-traverse traversed)))))
(defn reverse-compare
diff --git a/test/metabase/util_test.cljc b/test/metabase/util_test.cljc
index dd58240ee57..f0519bdfb3d 100644
--- a/test/metabase/util_test.cljc
+++ b/test/metabase/util_test.cljc
@@ -538,13 +538,15 @@
:b [:c :d]
:c nil
:d [:e]
- :e nil}]
+ :e nil}
+ neighbors-fn #(zipmap (get graph %) (repeat #{%}))]
(is (= {:a nil
:b #{:a}
:c #{:b}
:d #{:a :b}
:e #{:d}}
- (u/traverse [:a] #(zipmap (get graph %) (repeat #{%}))))))))
+ (u/traverse [:a] neighbors-fn)))
+ (is (= {} (u/traverse [] neighbors-fn))))))
(deftest ^:parallel round-to-decimals-test
(are [decimal-place expected] (= expected