This is an automated email from the ASF dual-hosted git repository.
felixybw 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 33ce2edfab Rename ConfigProvider to GlutenConfigProvider
33ce2edfab is described below
commit 33ce2edfaba5f562117c9fbec5d94405f6cea334
Author: Yuming Wang <[email protected]>
AuthorDate: Wed Jun 4 07:00:35 2025 +0800
Rename ConfigProvider to GlutenConfigProvider
To avoid class conflict issue if add gluten jar as a dependency of the
Spark project.
---
.../scala/org/apache/gluten/config/ConfigEntry.scala | 17 +++++++++--------
.../org/apache/spark/sql/internal/ConfigProvider.scala | 6 +++---
.../apache/spark/sql/internal/GlutenConfigUtil.scala | 5 ++++-
3 files changed, 16 insertions(+), 12 deletions(-)
diff --git
a/shims/common/src/main/scala/org/apache/gluten/config/ConfigEntry.scala
b/shims/common/src/main/scala/org/apache/gluten/config/ConfigEntry.scala
index 5d087d3385..867c48c84d 100644
--- a/shims/common/src/main/scala/org/apache/gluten/config/ConfigEntry.scala
+++ b/shims/common/src/main/scala/org/apache/gluten/config/ConfigEntry.scala
@@ -18,7 +18,7 @@ package org.apache.gluten.config
import org.apache.gluten.config.BackendType.BackendType
-import org.apache.spark.sql.internal.ConfigProvider
+import org.apache.spark.sql.internal.GlutenConfigProvider
/**
* An entry contains all meta information for a configuration.
@@ -61,8 +61,8 @@ trait ConfigEntry[T] {
/** How to convert a value to a string that the user can use it as a valid
string value. */
def stringConverter: T => String
- /** Read the configuration from the given ConfigProvider. */
- def readFrom(conf: ConfigProvider): T
+ /** Read the configuration from the given GlutenConfigProvider. */
+ def readFrom(conf: GlutenConfigProvider): T
/** The default value of the configuration. */
def defaultValue: Option[T]
@@ -70,7 +70,7 @@ trait ConfigEntry[T] {
/** The string representation of the default value. */
def defaultValueString: String
- final protected def readString(provider: ConfigProvider): Option[String] = {
+ final protected def readString(provider: GlutenConfigProvider):
Option[String] = {
alternatives.foldLeft(provider.get(key))((res, nextKey) =>
res.orElse(provider.get(nextKey)))
}
@@ -108,7 +108,8 @@ private[gluten] class OptionalConfigEntry[T](
override def stringConverter: Option[T] => String = v =>
v.map(_stringConverter).orNull
- override def readFrom(conf: ConfigProvider): Option[T] =
readString(conf).map(_valueConverter)
+ override def readFrom(conf: GlutenConfigProvider): Option[T] =
+ readString(conf).map(_valueConverter)
override def defaultValue: Option[Option[T]] = None
@@ -142,7 +143,7 @@ private[gluten] class ConfigEntryWithDefault[T](
override def stringConverter: T => String = _stringConverter
- override def readFrom(conf: ConfigProvider): T = {
+ override def readFrom(conf: GlutenConfigProvider): T = {
readString(conf).map(valueConverter).getOrElse(_defaultVal)
}
@@ -178,7 +179,7 @@ private[gluten] class ConfigEntryWithDefaultString[T](
override def stringConverter: T => String = _stringConverter
- override def readFrom(conf: ConfigProvider): T = {
+ override def readFrom(conf: GlutenConfigProvider): T = {
val value = readString(conf).getOrElse(_defaultVal)
valueConverter(value)
}
@@ -213,7 +214,7 @@ private[gluten] class ConfigEntryFallback[T](
override def stringConverter: T => String = fallback.stringConverter
- override def readFrom(conf: ConfigProvider): T = {
+ override def readFrom(conf: GlutenConfigProvider): T = {
readString(conf).map(valueConverter).getOrElse(fallback.readFrom(conf))
}
diff --git
a/shims/common/src/main/scala/org/apache/spark/sql/internal/ConfigProvider.scala
b/shims/common/src/main/scala/org/apache/spark/sql/internal/ConfigProvider.scala
index 8293a4a09b..38fd68167f 100644
---
a/shims/common/src/main/scala/org/apache/spark/sql/internal/ConfigProvider.scala
+++
b/shims/common/src/main/scala/org/apache/spark/sql/internal/ConfigProvider.scala
@@ -17,14 +17,14 @@
package org.apache.spark.sql.internal
/** A source of configuration values. */
-trait ConfigProvider {
+trait GlutenConfigProvider {
def get(key: String): Option[String]
}
-class SQLConfProvider(conf: SQLConf) extends ConfigProvider {
+class SQLConfProvider(conf: SQLConf) extends GlutenConfigProvider {
override def get(key: String): Option[String] =
Option(conf.settings.get(key))
}
-class MapProvider(conf: Map[String, String]) extends ConfigProvider {
+class MapProvider(conf: Map[String, String]) extends GlutenConfigProvider {
override def get(key: String): Option[String] = conf.get(key)
}
diff --git
a/shims/common/src/main/scala/org/apache/spark/sql/internal/GlutenConfigUtil.scala
b/shims/common/src/main/scala/org/apache/spark/sql/internal/GlutenConfigUtil.scala
index d415378c70..aba15f7224 100644
---
a/shims/common/src/main/scala/org/apache/spark/sql/internal/GlutenConfigUtil.scala
+++
b/shims/common/src/main/scala/org/apache/spark/sql/internal/GlutenConfigUtil.scala
@@ -21,7 +21,10 @@ import org.apache.gluten.config._
import org.apache.spark.network.util.{ByteUnit, JavaUtils}
object GlutenConfigUtil {
- private def getConfString(configProvider: ConfigProvider, key: String,
value: String): String = {
+ private def getConfString(
+ configProvider: GlutenConfigProvider,
+ key: String,
+ value: String): String = {
Option(ConfigEntry.findEntry(key))
.map {
_.readFrom(configProvider) match {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
