From d8327b0b053db2050de1c3315108549e89111728 Mon Sep 17 00:00:00 2001
From: Vitaly Dmitriev <werzerbb@gmail.com>
Date: Thu, 6 Aug 2026 17:47:56 +0300
Subject: [PATCH 1/2] ADH-7037: fix KyuubiSessionBuilder in
 python/pyspark/shell.py

---
 python/pyspark/shell.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/python/pyspark/shell.py b/python/pyspark/shell.py
index 50a8cdcf720f1..49722c095456e 100644
--- a/python/pyspark/shell.py
+++ b/python/pyspark/shell.py
@@ -50,18 +50,15 @@
     try:
         if os.environ.get("KYUUBI_AUTH"):
             from kyuubi.spark_connect import KyuubiSessionBuilder
-            from pyspark.sql.connect.session import SparkSession as ConnectSparkSession
             _kyuubi_builder = KyuubiSessionBuilder(
                 os.environ["SPARK_REMOTE"],
                 auth=os.environ.get("KYUUBI_AUTH", "kerberos"),
                 username=os.environ.get("KYUUBI_USERNAME"),
                 password=os.environ.get("KYUUBI_PASSWORD"))
-            spark = ConnectSparkSession(connection=_kyuubi_builder)
+            spark = _kyuubi_builder.getOrCreate()
         else:
             # Creates pyspark.sql.connect.SparkSession.
             spark = SparkSession.builder.getOrCreate()
-        # Creates pyspark.sql.connect.SparkSession.
-        spark = SparkSession.builder.getOrCreate()
 
         from pyspark.sql.connect.shell import PROGRESS_BAR_ENABLED
 

From fa3cb34a828ce505dc4ae54c2e41269191eabd7f Mon Sep 17 00:00:00 2001
From: Vitaly Dmitriev <werzerbb@gmail.com>
Date: Thu, 13 Aug 2026 16:14:22 +0300
Subject: [PATCH 2/2] ADH-7037: copy spark-sql jar to jars/connect-repl dir

---
 assembly/pom.xml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/assembly/pom.xml b/assembly/pom.xml
index 277d7e0a6dc86..b247e49cd7c17 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -251,6 +251,21 @@
               </arguments>
             </configuration>
           </execution>
+          <execution>
+            <!-- SPARK-49282: connect SparkSession needs classic sql/core types (ExperimentalMethods, SharedState, ...) -->
+            <id>copy-connect-client-classic-sql-jar</id>
+            <phase>package</phase>
+            <goals>
+              <goal>exec</goal>
+            </goals>
+            <configuration>
+              <executable>cp</executable>
+              <arguments>
+                <argument>${basedir}/../sql/core/target/spark-sql_${scala.binary.version}-${project.version}.jar</argument>
+                <argument>${basedir}/target/scala-${scala.binary.version}/jars/connect-repl</argument>
+              </arguments>
+            </configuration>
+          </execution>
         </executions>
       </plugin>
     </plugins>