Skip to content

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

spark failure fix (#65502)

dpsutton08a43180d7c3
diff --git a/bin/build/resources/overrides.edn b/bin/build/resources/overrides.edn
index 85d22ceeed2..21b76fd62e7 100644
--- a/bin/build/resources/overrides.edn
+++ b/bin/build/resources/overrides.edn
@@ -13,6 +13,7 @@
"org.apache.hadoop" {:resource "apache2_0.txt"}
"org.clojure" {:resource "EPL.txt"}
"org.eclipse.jetty" {:resource "apache2_0.txt"}
+ "org.eclipse.jetty.ee" {:resource "apache2_0.txt"}
"org.opensaml" {:resource "apache2_0.txt"}
"org.ow2.asm" {:resource "BSD.txt"}
"xalan" {:resource "apache2_0.txt"}}
diff --git a/modules/drivers/sparksql/test/metabase/driver/sparksql_test.clj b/modules/drivers/sparksql/test/metabase/driver/sparksql_test.clj
index 7a011184fe3..a30e8ccf849 100644
--- a/modules/drivers/sparksql/test/metabase/driver/sparksql_test.clj
+++ b/modules/drivers/sparksql/test/metabase/driver/sparksql_test.clj
@@ -64,9 +64,12 @@
{:aggregation [[:count]]
:filter [:= $name "wow"]})]
(testing "The native query returned in query results should use user-friendly splicing"
- (is (= "SELECT COUNT(*) AS `count` FROM `test_data`.`venues` AS `t1` WHERE `t1`.`name` = 'wow'"
- (:query (qp.compile/compile-with-inline-parameters query))
- (-> (qp/process-query query) :data :native_form :query)))))))
+ (let [expected "SELECT COUNT(*) AS `count` FROM `test_data`.`venues` AS `t1` WHERE `t1`.`name` = 'wow'"
+ replaced "SELECT COUNT(*) AS `count` FROM `test_data`.`venues` AS `t1` WHERE `t1`.`name` = decode(unhex('776f77'), 'utf-8')"]
+ (is (= "SELECT COUNT(*) AS `count` FROM `test_data`.`venues` AS `t1` WHERE `t1`.`name` = 'wow'"
+ (:query (qp.compile/compile-with-inline-parameters query))))
+ (is (contains? #{expected replaced}
+ (-> (qp/process-query query) :data :native_form :query))))))))
(deftest paranoid-inline-strings-test
(mt/test-driver :sparksql