Skip to content

Commit 800a184

Browse files
committed
[SPARK-37054][PYSPARK] Pyspark create SparkSession with existed session should not pass static conf
1 parent e3256b8 commit 800a184

2 files changed

Lines changed: 5 additions & 4 deletions

File tree

python/pyspark/sql/session.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,8 @@ def getOrCreate(self) -> "SparkSession":
278278
# by all sessions.
279279
session = SparkSession(sc, options=self._options)
280280
for key, value in self._options.items():
281-
session._jsparkSession.sessionState().conf().setConfString(key, value)
281+
if not session._jvm.org.apache.spark.sql.internal.SQLConf.isStaticConfigKey(key):
282+
session._jsparkSession.sessionState().conf().setConfString(key, value)
282283
return session
283284

284285
builder = Builder()

python/pyspark/sql/tests/test_session.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -273,12 +273,12 @@ def test_another_spark_session(self):
273273
session2 = None
274274
try:
275275
session1 = SparkSession.builder.config("key1", "value1").getOrCreate()
276-
session2 = SparkSession.builder.config("key2", "value2").getOrCreate()
276+
session2 = SparkSession.builder.config("spark.sql.codegen.comments", "true").getOrCreate()
277277

278278
self.assertEqual(session1.conf.get("key1"), "value1")
279279
self.assertEqual(session2.conf.get("key1"), "value1")
280-
self.assertEqual(session1.conf.get("key2"), "value2")
281-
self.assertEqual(session2.conf.get("key2"), "value2")
280+
self.assertEqual(session1.conf.get("spark.sql.codegen.comments"), "false")
281+
self.assertEqual(session2.conf.get("spark.sql.codegen.comments"), "false")
282282
self.assertEqual(session1.sparkContext, session2.sparkContext)
283283

284284
self.assertEqual(session1.sparkContext.getConf().get("key1"), "value1")

0 commit comments

Comments
 (0)