use catalog first

apache · Mar 31, 2023 · eda34d4 · eda34d4
1 parent 4c2f1e6
commit eda34d4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...k-sql-engine/src/main/scala/org/apache/kyuubi/engine/flink/session/FlinkSessionImpl.scala b/...k-sql-engine/src/main/scala/org/apache/kyuubi/engine/flink/session/FlinkSessionImpl.scala
@@ -57,7 +57,7 @@ class FlinkSessionImpl(
 
   override def open(): Unit = {
     executor.openSession(handle.identifier.toString)
-    normalizedConf.foreach {
+    normalizedConf.toSeq.sortBy(!_._1.equals("use:catalog")).foreach {
       case ("use:catalog", catalog) =>
         val tableEnv = sessionContext.getExecutionContext.getTableEnvironment
         try {

diff --git a/...k-sql-engine/src/main/scala/org/apache/kyuubi/engine/spark/session/SparkSessionImpl.scala b/...k-sql-engine/src/main/scala/org/apache/kyuubi/engine/spark/session/SparkSessionImpl.scala
@@ -54,7 +54,7 @@ class SparkSessionImpl(
   private val sessionEvent = SessionEvent(this)
 
   override def open(): Unit = {
-    normalizedConf.foreach {
+    normalizedConf.toSeq.sortBy(!_._1.equals("use:catalog")).foreach {
       case ("use:catalog", catalog) =>
         try {
           SparkCatalogShim().setCurrentCatalog(spark, catalog)