Skip to content

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

Allow using thrift client in databricks driver if specified. (#84826)

technomancy44b5798b441e
diff --git a/modules/drivers/databricks/src/metabase/driver/databricks.clj b/modules/drivers/databricks/src/metabase/driver/databricks.clj
index 09bc293fdbf..3b6c7310381 100644
--- a/modules/drivers/databricks/src/metabase/driver/databricks.clj
+++ b/modules/drivers/databricks/src/metabase/driver/databricks.clj
@@ -293,7 +293,11 @@
:HttpPath http-path
:UserAgentEntry (format "Metabase/%s" (:tag driver-api/mb-version-info))
:UseNativeQuery 1
- :UseThriftClient 0}]
+ :UseThriftClient (if-let [[_ use-thrift] (and additional-options
+ (re-matches #"UseThriftClient=(.*)"
+ additional-options))]
+ (parse-long use-thrift)
+ 0)}]
(merge base-spec
(when log-level
{:LogLevel log-level})
diff --git a/modules/drivers/databricks/test/metabase/driver/databricks_test.clj b/modules/drivers/databricks/test/metabase/driver/databricks_test.clj
index 4fa3c029121..3b8d4561a0b 100644
--- a/modules/drivers/databricks/test/metabase/driver/databricks_test.clj
+++ b/modules/drivers/databricks/test/metabase/driver/databricks_test.clj
@@ -360,7 +360,17 @@
:catalog "ccc"
:additional-options "IgnoreTransactions=0;bla=1"}
(sql-jdbc.conn/connection-details->spec :databricks)
- :subname))))))
+ :subname))))
+ (testing "Thrift client can be selected"
+ (let [details {:host "localhost",
+ :engine "databricks",
+ :catalog "ccc"
+ :additional-options "UseThriftClient=1"}
+ details2 (dissoc details :additional-options)]
+ (is (= 1 (:UseThriftClient (sql-jdbc.conn/connection-details->spec :databricks
+ details))))
+ (is (= 0 (:UseThriftClient (sql-jdbc.conn/connection-details->spec :databricks
+ details2))))))))
(deftest multi-level-schema-test
(mt/test-driver :databricks