Skip to content

Commit c5674e4

Browse files
committed
use setLocalProperty to propagate one conf
1 parent ca737c6 commit c5674e4

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

sql/core/src/test/scala/org/apache/spark/sql/SQLQueryTestSuite.scala

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -311,6 +311,10 @@ class SQLQueryTestSuite extends QueryTest with SharedSparkSession {
311311
localSparkSession.conf.set(SQLConf.ANSI_SQL_PARSER.key, true)
312312
localSparkSession.conf.set(SQLConf.PREFER_INTEGRAL_DIVISION.key, true)
313313
localSparkSession.conf.set(SQLConf.FAIL_ON_INTEGRAL_TYPE_OVERFLOW.key, true)
314+
// Propagate the SQL conf FAIL_ON_INTEGRAL_TYPE_OVERFLOW to executor.
315+
// TODO: remove this after SPARK-29122 is resolved.
316+
localSparkSession.sparkContext.setLocalProperty(
317+
SQLConf.FAIL_ON_INTEGRAL_TYPE_OVERFLOW.key, "true")
314318
case _ =>
315319
}
316320

@@ -404,10 +408,7 @@ class SQLQueryTestSuite extends QueryTest with SharedSparkSession {
404408
val df = session.sql(sql)
405409
val schema = df.schema
406410
// Get answer, but also get rid of the #1234 expression ids that show up in explain plans
407-
val answer =
408-
SQLExecution.withNewExecutionId(session, df.queryExecution, Some(sql)) {
409-
hiveResultString(df.queryExecution.executedPlan).map(replaceNotIncludedMsg)
410-
}
411+
val answer = hiveResultString(df.queryExecution.executedPlan).map(replaceNotIncludedMsg)
411412

412413
// If the output is not pre-sorted, sort it.
413414
if (isSorted(df.queryExecution.analyzed)) (schema, answer) else (schema, answer.sorted)

0 commit comments

Comments
 (0)