This is an automated email from the ASF dual-hosted git repository.
hongze pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-gluten.git
The following commit(s) were added to refs/heads/main by this push:
new 230e605c9a [GLUTEN-7351][CORE] Code cleanup for Gluten session
extensions
230e605c9a is described below
commit 230e605c9a8dcc6ad4d5f04d17cbd794efd9b411
Author: Jiaan Geng <[email protected]>
AuthorDate: Thu Sep 26 09:11:10 2024 +0800
[GLUTEN-7351][CORE] Code cleanup for Gluten session extensions
Closes #7351
---
gluten-core/src/main/scala/org/apache/gluten/GlutenPlugin.scala | 9 +++++----
.../org/apache/gluten/extension/GlutenSessionExtensions.scala | 7 +------
2 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/gluten-core/src/main/scala/org/apache/gluten/GlutenPlugin.scala
b/gluten-core/src/main/scala/org/apache/gluten/GlutenPlugin.scala
index b7cb3294a0..6902d9f95b 100644
--- a/gluten-core/src/main/scala/org/apache/gluten/GlutenPlugin.scala
+++ b/gluten-core/src/main/scala/org/apache/gluten/GlutenPlugin.scala
@@ -31,6 +31,7 @@ import org.apache.spark.network.util.JavaUtils
import org.apache.spark.softaffinity.SoftAffinityListener
import org.apache.spark.sql.execution.ui.{GlutenEventUtils,
GlutenSQLAppStatusListener}
import org.apache.spark.sql.internal.SQLConf
+import org.apache.spark.sql.internal.StaticSQLConf.SPARK_SESSION_EXTENSIONS
import org.apache.spark.task.TaskResources
import org.apache.spark.util.SparkResourceUtil
@@ -127,14 +128,14 @@ private[gluten] class GlutenDriverPlugin extends
DriverPlugin with Logging {
}
private def setPredefinedConfigs(sc: SparkContext, conf: SparkConf): Unit = {
- // sql extensions
- val extensions = if
(conf.contains(GlutenSessionExtensions.SPARK_SESSION_EXTS_KEY)) {
- s"${conf.get(GlutenSessionExtensions.SPARK_SESSION_EXTS_KEY)}," +
+ // Spark SQL extensions
+ val extensions = if (conf.contains(SPARK_SESSION_EXTENSIONS.key)) {
+ s"${conf.get(SPARK_SESSION_EXTENSIONS.key)}," +
s"${GlutenSessionExtensions.GLUTEN_SESSION_EXTENSION_NAME}"
} else {
s"${GlutenSessionExtensions.GLUTEN_SESSION_EXTENSION_NAME}"
}
- conf.set(GlutenSessionExtensions.SPARK_SESSION_EXTS_KEY, extensions)
+ conf.set(SPARK_SESSION_EXTENSIONS.key, extensions)
// adaptive custom cost evaluator class
if (GlutenConfig.getConf.enableGluten &&
GlutenConfig.getConf.enableGlutenCostEvaluator) {
diff --git
a/gluten-core/src/main/scala/org/apache/gluten/extension/GlutenSessionExtensions.scala
b/gluten-core/src/main/scala/org/apache/gluten/extension/GlutenSessionExtensions.scala
index 42c9cc94b0..710d96c54e 100644
---
a/gluten-core/src/main/scala/org/apache/gluten/extension/GlutenSessionExtensions.scala
+++
b/gluten-core/src/main/scala/org/apache/gluten/extension/GlutenSessionExtensions.scala
@@ -20,9 +20,6 @@ import org.apache.gluten.backend.Backend
import org.apache.gluten.extension.injector.RuleInjector
import org.apache.spark.sql.SparkSessionExtensions
-import org.apache.spark.sql.internal.StaticSQLConf
-
-import java.util.Objects
private[gluten] class GlutenSessionExtensions extends (SparkSessionExtensions
=> Unit) {
override def apply(exts: SparkSessionExtensions): Unit = {
@@ -33,7 +30,5 @@ private[gluten] class GlutenSessionExtensions extends
(SparkSessionExtensions =>
}
private[gluten] object GlutenSessionExtensions {
- val SPARK_SESSION_EXTS_KEY: String =
StaticSQLConf.SPARK_SESSION_EXTENSIONS.key
- val GLUTEN_SESSION_EXTENSION_NAME: String =
- Objects.requireNonNull(classOf[GlutenSessionExtensions].getCanonicalName)
+ val GLUTEN_SESSION_EXTENSION_NAME: String =
classOf[GlutenSessionExtensions].getCanonicalName
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
