This is an automated email from the ASF dual-hosted git repository.
philo 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 8b8c5b3f55 [Minor] Fix a typo in Gluten config (#7931)
8b8c5b3f55 is described below
commit 8b8c5b3f553b711c7e4c044195f5995d0a83119f
Author: PHILO-HE <[email protected]>
AuthorDate: Wed Nov 13 13:09:47 2024 +0800
[Minor] Fix a typo in Gluten config (#7931)
---
.../src/test/scala/org/apache/gluten/execution/FallbackSuite.scala | 4 ++--
.../test/scala/org/apache/gluten/execution/MiscOperatorSuite.scala | 2 +-
.../test/scala/org/apache/gluten/execution/VeloxMetricsSuite.scala | 2 +-
.../spark/sql/execution/benchmark/StreamingAggregateBenchmark.scala | 4 ++--
.../org/apache/spark/sql/execution/joins/GlutenInnerJoinSuite.scala | 4 ++--
.../org/apache/spark/sql/execution/joins/GlutenOuterJoinSuite.scala | 4 ++--
shims/common/src/main/scala/org/apache/gluten/GlutenConfig.scala | 4 ++--
7 files changed, 12 insertions(+), 12 deletions(-)
diff --git
a/backends-velox/src/test/scala/org/apache/gluten/execution/FallbackSuite.scala
b/backends-velox/src/test/scala/org/apache/gluten/execution/FallbackSuite.scala
index d8b0ee8981..0f7b70bf00 100644
---
a/backends-velox/src/test/scala/org/apache/gluten/execution/FallbackSuite.scala
+++
b/backends-velox/src/test/scala/org/apache/gluten/execution/FallbackSuite.scala
@@ -253,7 +253,7 @@ class FallbackSuite extends VeloxWholeStageTransformerSuite
with AdaptiveSparkPl
test("fallback with smj") {
val sql = "SELECT /*+ SHUFFLE_MERGE(tmp1) */ * FROM tmp1 join tmp2 on
tmp1.c1 = tmp2.c1"
withSQLConf(
- GlutenConfig.COLUMNAR_FPRCE_SHUFFLED_HASH_JOIN_ENABLED.key -> "true",
+ GlutenConfig.COLUMNAR_FORCE_SHUFFLED_HASH_JOIN_ENABLED.key -> "true",
GlutenConfig.COLUMNAR_SHUFFLED_HASH_JOIN_ENABLED.key -> "false") {
runQueryAndCompare(sql) {
df =>
@@ -262,7 +262,7 @@ class FallbackSuite extends VeloxWholeStageTransformerSuite
with AdaptiveSparkPl
}
}
withSQLConf(
- GlutenConfig.COLUMNAR_FPRCE_SHUFFLED_HASH_JOIN_ENABLED.key -> "false",
+ GlutenConfig.COLUMNAR_FORCE_SHUFFLED_HASH_JOIN_ENABLED.key -> "false",
GlutenConfig.COLUMNAR_SORTMERGEJOIN_ENABLED.key -> "false") {
runQueryAndCompare(sql) {
df =>
diff --git
a/backends-velox/src/test/scala/org/apache/gluten/execution/MiscOperatorSuite.scala
b/backends-velox/src/test/scala/org/apache/gluten/execution/MiscOperatorSuite.scala
index da5184f752..2b42d7fb8d 100644
---
a/backends-velox/src/test/scala/org/apache/gluten/execution/MiscOperatorSuite.scala
+++
b/backends-velox/src/test/scala/org/apache/gluten/execution/MiscOperatorSuite.scala
@@ -845,7 +845,7 @@ class MiscOperatorSuite extends
VeloxWholeStageTransformerSuite with AdaptiveSpa
withSQLConf(
GlutenConfig.COLUMNAR_PREFER_STREAMING_AGGREGATE.key -> "true",
- GlutenConfig.COLUMNAR_FPRCE_SHUFFLED_HASH_JOIN_ENABLED.key -> "false",
+ GlutenConfig.COLUMNAR_FORCE_SHUFFLED_HASH_JOIN_ENABLED.key -> "false",
SQLConf.AUTO_BROADCASTJOIN_THRESHOLD.key -> "-1"
) {
val query =
diff --git
a/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxMetricsSuite.scala
b/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxMetricsSuite.scala
index 0b74824832..e41f00821c 100644
---
a/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxMetricsSuite.scala
+++
b/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxMetricsSuite.scala
@@ -63,7 +63,7 @@ class VeloxMetricsSuite extends
VeloxWholeStageTransformerSuite with AdaptiveSpa
test("test sort merge join metrics") {
withSQLConf(
- GlutenConfig.COLUMNAR_FPRCE_SHUFFLED_HASH_JOIN_ENABLED.key -> "false",
+ GlutenConfig.COLUMNAR_FORCE_SHUFFLED_HASH_JOIN_ENABLED.key -> "false",
SQLConf.AUTO_BROADCASTJOIN_THRESHOLD.key -> "-1") {
// without preproject
runQueryAndCompare(
diff --git
a/backends-velox/src/test/scala/org/apache/spark/sql/execution/benchmark/StreamingAggregateBenchmark.scala
b/backends-velox/src/test/scala/org/apache/spark/sql/execution/benchmark/StreamingAggregateBenchmark.scala
index 7f11fd043d..77370d059c 100644
---
a/backends-velox/src/test/scala/org/apache/spark/sql/execution/benchmark/StreamingAggregateBenchmark.scala
+++
b/backends-velox/src/test/scala/org/apache/spark/sql/execution/benchmark/StreamingAggregateBenchmark.scala
@@ -51,7 +51,7 @@ object StreamingAggregateBenchmark extends SqlBasedBenchmark {
withSQLConf(
GlutenConfig.COLUMNAR_PREFER_STREAMING_AGGREGATE.key -> "true",
SQLConf.AUTO_BROADCASTJOIN_THRESHOLD.key -> "-1",
- GlutenConfig.COLUMNAR_FPRCE_SHUFFLED_HASH_JOIN_ENABLED.key -> "false"
+ GlutenConfig.COLUMNAR_FORCE_SHUFFLED_HASH_JOIN_ENABLED.key -> "false"
) {
spark.sql(query).noop()
}
@@ -62,7 +62,7 @@ object StreamingAggregateBenchmark extends SqlBasedBenchmark {
withSQLConf(
GlutenConfig.COLUMNAR_PREFER_STREAMING_AGGREGATE.key -> "false",
SQLConf.AUTO_BROADCASTJOIN_THRESHOLD.key -> "-1",
- GlutenConfig.COLUMNAR_FPRCE_SHUFFLED_HASH_JOIN_ENABLED.key -> "false"
+ GlutenConfig.COLUMNAR_FORCE_SHUFFLED_HASH_JOIN_ENABLED.key -> "false"
) {
spark.sql(query).noop()
}
diff --git
a/gluten-ut/spark35/src/test/scala/org/apache/spark/sql/execution/joins/GlutenInnerJoinSuite.scala
b/gluten-ut/spark35/src/test/scala/org/apache/spark/sql/execution/joins/GlutenInnerJoinSuite.scala
index d31936211b..8d9e82df19 100644
---
a/gluten-ut/spark35/src/test/scala/org/apache/spark/sql/execution/joins/GlutenInnerJoinSuite.scala
+++
b/gluten-ut/spark35/src/test/scala/org/apache/spark/sql/execution/joins/GlutenInnerJoinSuite.scala
@@ -24,13 +24,13 @@ import org.apache.spark.sql.GlutenSQLTestsBaseTrait
class GlutenInnerJoinSuiteForceShjOn extends InnerJoinSuite with
GlutenSQLTestsBaseTrait {
override def sparkConf: SparkConf = {
super.sparkConf
- .set(GlutenConfig.COLUMNAR_FPRCE_SHUFFLED_HASH_JOIN_ENABLED.key, "true")
+ .set(GlutenConfig.COLUMNAR_FORCE_SHUFFLED_HASH_JOIN_ENABLED.key, "true")
}
}
class GlutenInnerJoinSuiteForceShjOff extends InnerJoinSuite with
GlutenSQLTestsBaseTrait {
override def sparkConf: SparkConf = {
super.sparkConf
- .set(GlutenConfig.COLUMNAR_FPRCE_SHUFFLED_HASH_JOIN_ENABLED.key, "false")
+ .set(GlutenConfig.COLUMNAR_FORCE_SHUFFLED_HASH_JOIN_ENABLED.key, "false")
}
}
diff --git
a/gluten-ut/spark35/src/test/scala/org/apache/spark/sql/execution/joins/GlutenOuterJoinSuite.scala
b/gluten-ut/spark35/src/test/scala/org/apache/spark/sql/execution/joins/GlutenOuterJoinSuite.scala
index 9c45eae15b..f48939c3d0 100644
---
a/gluten-ut/spark35/src/test/scala/org/apache/spark/sql/execution/joins/GlutenOuterJoinSuite.scala
+++
b/gluten-ut/spark35/src/test/scala/org/apache/spark/sql/execution/joins/GlutenOuterJoinSuite.scala
@@ -24,13 +24,13 @@ import org.apache.spark.sql.GlutenSQLTestsBaseTrait
class GlutenOuterJoinSuiteForceShjOn extends OuterJoinSuite with
GlutenSQLTestsBaseTrait {
override def sparkConf: SparkConf = {
super.sparkConf
- .set(GlutenConfig.COLUMNAR_FPRCE_SHUFFLED_HASH_JOIN_ENABLED.key, "true")
+ .set(GlutenConfig.COLUMNAR_FORCE_SHUFFLED_HASH_JOIN_ENABLED.key, "true")
}
}
class GlutenOuterJoinSuiteForceShjOff extends OuterJoinSuite with
GlutenSQLTestsBaseTrait {
override def sparkConf: SparkConf = {
super.sparkConf
- .set(GlutenConfig.COLUMNAR_FPRCE_SHUFFLED_HASH_JOIN_ENABLED.key, "false")
+ .set(GlutenConfig.COLUMNAR_FORCE_SHUFFLED_HASH_JOIN_ENABLED.key, "false")
}
}
diff --git a/shims/common/src/main/scala/org/apache/gluten/GlutenConfig.scala
b/shims/common/src/main/scala/org/apache/gluten/GlutenConfig.scala
index 6579e30dab..0bfe16270e 100644
--- a/shims/common/src/main/scala/org/apache/gluten/GlutenConfig.scala
+++ b/shims/common/src/main/scala/org/apache/gluten/GlutenConfig.scala
@@ -75,7 +75,7 @@ class GlutenConfig(conf: SQLConf) extends Logging {
def enableNativeColumnarToRow: Boolean =
conf.getConf(COLUMNAR_COLUMNAR_TO_ROW_ENABLED)
- def forceShuffledHashJoin: Boolean =
conf.getConf(COLUMNAR_FPRCE_SHUFFLED_HASH_JOIN_ENABLED)
+ def forceShuffledHashJoin: Boolean =
conf.getConf(COLUMNAR_FORCE_SHUFFLED_HASH_JOIN_ENABLED)
def enableColumnarSortMergeJoin: Boolean =
conf.getConf(COLUMNAR_SORTMERGEJOIN_ENABLED)
@@ -942,7 +942,7 @@ object GlutenConfig {
.booleanConf
.createWithDefault(true)
- val COLUMNAR_FPRCE_SHUFFLED_HASH_JOIN_ENABLED =
+ val COLUMNAR_FORCE_SHUFFLED_HASH_JOIN_ENABLED =
buildConf("spark.gluten.sql.columnar.forceShuffledHashJoin")
.internal()
.booleanConf
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
