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 59bf748a2c [GLUTEN-9880][CORE] Move `GlutenConfig.scala` from shim
layer to `gluten-core` (#9883)
59bf748a2c is described below
commit 59bf748a2cecee77928b0188c461a2742f3e82f6
Author: Hongze Zhang <[email protected]>
AuthorDate: Fri Jun 6 11:36:00 2025 +0100
[GLUTEN-9880][CORE] Move `GlutenConfig.scala` from shim layer to
`gluten-core` (#9883)
Closes #9880
---
.../scala/org/apache/gluten/backendsapi/velox/VeloxListenerApi.scala | 3 +--
.../src/main/scala/org/apache/gluten/config/ConfigBuilder.scala | 3 +--
.../src/main/scala/org/apache/gluten/config/ConfigEntry.scala | 0
.../src/main/scala/org/apache/gluten/config/GlutenConfig.scala | 0
.../src/main/scala/org/apache/gluten/config/ReservedKeys.scala | 0
.../main/scala/org/apache/spark/sql/execution/ui/GlutenUIUtils.scala | 5 +++--
.../main/scala/org/apache/spark/sql/internal/ConfigProvider.scala | 0
.../main/scala/org/apache/spark/sql/internal/GlutenConfigUtil.scala | 0
.../main/scala/org/apache/spark/sql/internal/SparkConfigUtil.scala | 0
.../main/scala/org/apache/gluten/expression/ExpressionMappings.scala | 2 +-
10 files changed, 6 insertions(+), 7 deletions(-)
diff --git
a/backends-velox/src/main/scala/org/apache/gluten/backendsapi/velox/VeloxListenerApi.scala
b/backends-velox/src/main/scala/org/apache/gluten/backendsapi/velox/VeloxListenerApi.scala
index a5c16bf880..44bfd0aab3 100644
---
a/backends-velox/src/main/scala/org/apache/gluten/backendsapi/velox/VeloxListenerApi.scala
+++
b/backends-velox/src/main/scala/org/apache/gluten/backendsapi/velox/VeloxListenerApi.scala
@@ -18,8 +18,7 @@ package org.apache.gluten.backendsapi.velox
import org.apache.gluten.backendsapi.ListenerApi
import
org.apache.gluten.backendsapi.arrow.ArrowBatchTypes.{ArrowJavaBatchType,
ArrowNativeBatchType}
-import org.apache.gluten.config.GlutenConfig
-import org.apache.gluten.config.VeloxConfig
+import org.apache.gluten.config.{GlutenConfig, VeloxConfig}
import org.apache.gluten.config.VeloxConfig._
import org.apache.gluten.execution.datasource.GlutenFormatFactory
import org.apache.gluten.expression.UDFMappings
diff --git
a/shims/common/src/main/scala/org/apache/gluten/config/ConfigBuilder.scala
b/gluten-core/src/main/scala/org/apache/gluten/config/ConfigBuilder.scala
similarity index 98%
rename from
shims/common/src/main/scala/org/apache/gluten/config/ConfigBuilder.scala
rename to
gluten-core/src/main/scala/org/apache/gluten/config/ConfigBuilder.scala
index 475fe69410..05821cbaf0 100644
--- a/shims/common/src/main/scala/org/apache/gluten/config/ConfigBuilder.scala
+++ b/gluten-core/src/main/scala/org/apache/gluten/config/ConfigBuilder.scala
@@ -16,8 +16,7 @@
*/
package org.apache.gluten.config
-import org.apache.spark.network.util.ByteUnit
-import org.apache.spark.network.util.JavaUtils
+import org.apache.spark.network.util.{ByteUnit, JavaUtils}
import java.util.concurrent.TimeUnit
import java.util.regex.Pattern;
diff --git
a/shims/common/src/main/scala/org/apache/gluten/config/ConfigEntry.scala
b/gluten-core/src/main/scala/org/apache/gluten/config/ConfigEntry.scala
similarity index 100%
rename from
shims/common/src/main/scala/org/apache/gluten/config/ConfigEntry.scala
rename to gluten-core/src/main/scala/org/apache/gluten/config/ConfigEntry.scala
diff --git
a/shims/common/src/main/scala/org/apache/gluten/config/GlutenConfig.scala
b/gluten-core/src/main/scala/org/apache/gluten/config/GlutenConfig.scala
similarity index 100%
rename from
shims/common/src/main/scala/org/apache/gluten/config/GlutenConfig.scala
rename to gluten-core/src/main/scala/org/apache/gluten/config/GlutenConfig.scala
diff --git
a/shims/common/src/main/scala/org/apache/gluten/config/ReservedKeys.scala
b/gluten-core/src/main/scala/org/apache/gluten/config/ReservedKeys.scala
similarity index 100%
rename from
shims/common/src/main/scala/org/apache/gluten/config/ReservedKeys.scala
rename to gluten-core/src/main/scala/org/apache/gluten/config/ReservedKeys.scala
diff --git
a/gluten-ui/src/main/scala/org/apache/spark/sql/execution/ui/GlutenUIUtils.scala
b/gluten-core/src/main/scala/org/apache/spark/sql/execution/ui/GlutenUIUtils.scala
similarity index 92%
rename from
gluten-ui/src/main/scala/org/apache/spark/sql/execution/ui/GlutenUIUtils.scala
rename to
gluten-core/src/main/scala/org/apache/spark/sql/execution/ui/GlutenUIUtils.scala
index eb9d56b33e..344b92c0c8 100644
---
a/gluten-ui/src/main/scala/org/apache/spark/sql/execution/ui/GlutenUIUtils.scala
+++
b/gluten-core/src/main/scala/org/apache/spark/sql/execution/ui/GlutenUIUtils.scala
@@ -17,7 +17,6 @@
package org.apache.spark.sql.execution.ui
import org.apache.gluten.config.GlutenConfig
-import org.apache.gluten.config.GlutenConfig.GLUTEN_UI_ENABLED
import org.apache.gluten.events.GlutenEvent
import org.apache.spark.SparkContext
@@ -33,7 +32,9 @@ object GlutenUIUtils {
val glutenTabEnabled = if (glutenConfig.isDefined) {
glutenConfig.get.glutenUiEnabled
} else {
- sc.getConf.getBoolean(GLUTEN_UI_ENABLED.key,
GLUTEN_UI_ENABLED.defaultValue.get)
+ sc.getConf.getBoolean(
+ GlutenConfig.GLUTEN_UI_ENABLED.key,
+ GlutenConfig.GLUTEN_UI_ENABLED.defaultValue.get)
}
sc.ui.isDefined && glutenTabEnabled
}
diff --git
a/shims/common/src/main/scala/org/apache/spark/sql/internal/ConfigProvider.scala
b/gluten-core/src/main/scala/org/apache/spark/sql/internal/ConfigProvider.scala
similarity index 100%
rename from
shims/common/src/main/scala/org/apache/spark/sql/internal/ConfigProvider.scala
rename to
gluten-core/src/main/scala/org/apache/spark/sql/internal/ConfigProvider.scala
diff --git
a/shims/common/src/main/scala/org/apache/spark/sql/internal/GlutenConfigUtil.scala
b/gluten-core/src/main/scala/org/apache/spark/sql/internal/GlutenConfigUtil.scala
similarity index 100%
rename from
shims/common/src/main/scala/org/apache/spark/sql/internal/GlutenConfigUtil.scala
rename to
gluten-core/src/main/scala/org/apache/spark/sql/internal/GlutenConfigUtil.scala
diff --git
a/shims/common/src/main/scala/org/apache/spark/sql/internal/SparkConfigUtil.scala
b/gluten-core/src/main/scala/org/apache/spark/sql/internal/SparkConfigUtil.scala
similarity index 100%
rename from
shims/common/src/main/scala/org/apache/spark/sql/internal/SparkConfigUtil.scala
rename to
gluten-core/src/main/scala/org/apache/spark/sql/internal/SparkConfigUtil.scala
diff --git
a/gluten-substrait/src/main/scala/org/apache/gluten/expression/ExpressionMappings.scala
b/gluten-substrait/src/main/scala/org/apache/gluten/expression/ExpressionMappings.scala
index 8c91827413..cc75002875 100644
---
a/gluten-substrait/src/main/scala/org/apache/gluten/expression/ExpressionMappings.scala
+++
b/gluten-substrait/src/main/scala/org/apache/gluten/expression/ExpressionMappings.scala
@@ -21,7 +21,7 @@ import org.apache.gluten.config.GlutenConfig
import org.apache.gluten.expression.ExpressionNames._
import org.apache.gluten.sql.shims.SparkShimLoader
-import org.apache.spark.sql.catalyst.expressions.{StringTrimBoth, _}
+import org.apache.spark.sql.catalyst.expressions._
import org.apache.spark.sql.catalyst.expressions.aggregate._
import org.apache.spark.sql.catalyst.optimizer.NormalizeNaNAndZero
import org.apache.spark.sql.execution.ScalarSubquery
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
