You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@gluten.apache.org by "weixiuli (via GitHub)" <gi...@apache.org> on 2024/11/08 02:34:35 UTC
[PR] [CORE] Fix the setPredefinedConfigs initialization of GlutenPlugin [incubator-gluten]
weixiuli opened a new pull request, #7857:
URL: https://github.com/apache/incubator-gluten/pull/7857
## What changes were proposed in this pull request?
The GlutenConfig is not initialized by sparkConf when calling setPredefinedConfigs. As a result, GlutenConfig.getConf.enableGluten and GlutenConfig.getConf.enableGlutenCostEvaluator in setPredefinedConfigs only retrieve their default values. To ensure correct configuration, we should retrieve these settings directly from sparkConf.
(Fixes: https://github.com/apache/incubator-gluten/issues/7856)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@gluten.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@gluten.apache.org
For additional commands, e-mail: commits-help@gluten.apache.org
Re: [PR] [GLUTEN-7856][CORE] Fix the setPredefinedConfigs initialization of GlutenPlugin [incubator-gluten]
Posted by "zml1206 (via GitHub)" <gi...@apache.org>.
zml1206 commented on code in PR #7857:
URL: https://github.com/apache/incubator-gluten/pull/7857#discussion_r1833716284
##########
gluten-core/src/main/scala/org/apache/gluten/GlutenPlugin.scala:
##########
@@ -134,7 +134,11 @@ private[gluten] class GlutenDriverPlugin extends DriverPlugin with Logging {
conf.set(SPARK_SESSION_EXTENSIONS.key, extensions)
// adaptive custom cost evaluator class
- if (GlutenConfig.getConf.enableGluten && GlutenConfig.getConf.enableGlutenCostEvaluator) {
+ val glutenEnabled = conf.getBoolean(GlutenConfig.GLUTEN_ENABLED_KEY, GLUTEN_ENABLED_BY_DEFAULT)
+ lazy val enableGlutenCostEvaluator = conf.getBoolean(
+ GlutenConfig.GLUTEN_COST_EVALUATOR_ENABLED,
+ GLUTEN_COST_EVALUATOR_DEFAULT_VALUE)
+ if (glutenEnabled && enableGlutenCostEvaluator) {
val costEvaluator = "org.apache.spark.sql.execution.adaptive.GlutenCostEvaluator"
conf.set(SQLConf.ADAPTIVE_CUSTOM_COST_EVALUATOR_CLASS.key, costEvaluator)
}
Review Comment:
There seems to be no problem with always loading GlutenCostEvaluator, because GlutenCostEvaluator will determine whether gluten is enabled.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@gluten.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@gluten.apache.org
For additional commands, e-mail: commits-help@gluten.apache.org
Re: [PR] [GLUTEN-7856][CORE] Fix the setPredefinedConfigs initialization of GlutenPlugin [incubator-gluten]
Posted by "zml1206 (via GitHub)" <gi...@apache.org>.
zml1206 commented on code in PR #7857:
URL: https://github.com/apache/incubator-gluten/pull/7857#discussion_r1835866788
##########
shims/spark33/src/main/scala/org/apache/spark/sql/execution/adaptive/GlutenCostEvaluator.scala:
##########
@@ -26,7 +26,7 @@ import org.apache.spark.sql.internal.SQLConf
case class GlutenCostEvaluator() extends CostEvaluator with SQLConfHelper {
override def evaluateCost(plan: SparkPlan): Cost = {
val forceOptimizeSkewedJoin = conf.getConf(SQLConf.ADAPTIVE_FORCE_OPTIMIZE_SKEWED_JOIN)
- if (GlutenConfig.getConf.enableGluten) {
+ if (GlutenConfig.getConf.enableGlutenCostEvaluator) {
Review Comment:
We need to use `GlutenConfig.getConf.enableGluten` to determine whether to use vanilla spark cost or gluten cost.
##########
shims/spark34/src/main/scala/org/apache/spark/sql/execution/adaptive/GlutenCostEvaluator.scala:
##########
@@ -26,7 +26,7 @@ import org.apache.spark.sql.internal.SQLConf
case class GlutenCostEvaluator() extends CostEvaluator with SQLConfHelper {
override def evaluateCost(plan: SparkPlan): Cost = {
val forceOptimizeSkewedJoin = conf.getConf(SQLConf.ADAPTIVE_FORCE_OPTIMIZE_SKEWED_JOIN)
- if (GlutenConfig.getConf.enableGluten) {
+ if (GlutenConfig.getConf.enableGlutenCostEvaluator) {
Review Comment:
ditto.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@gluten.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@gluten.apache.org
For additional commands, e-mail: commits-help@gluten.apache.org
Re: [PR] [GLUTEN-7856][CORE] Fix the setPredefinedConfigs initialization of GlutenPlugin [incubator-gluten]
Posted by "zhztheplayer (via GitHub)" <gi...@apache.org>.
zhztheplayer commented on code in PR #7857:
URL: https://github.com/apache/incubator-gluten/pull/7857#discussion_r1833700481
##########
gluten-core/src/main/scala/org/apache/gluten/GlutenPlugin.scala:
##########
@@ -134,7 +134,11 @@ private[gluten] class GlutenDriverPlugin extends DriverPlugin with Logging {
conf.set(SPARK_SESSION_EXTENSIONS.key, extensions)
// adaptive custom cost evaluator class
- if (GlutenConfig.getConf.enableGluten && GlutenConfig.getConf.enableGlutenCostEvaluator) {
+ val glutenEnabled = conf.getBoolean(GlutenConfig.GLUTEN_ENABLED_KEY, GLUTEN_ENABLED_BY_DEFAULT)
+ lazy val enableGlutenCostEvaluator = conf.getBoolean(
+ GlutenConfig.GLUTEN_COST_EVALUATOR_ENABLED,
+ GLUTEN_COST_EVALUATOR_DEFAULT_VALUE)
+ if (glutenEnabled && enableGlutenCostEvaluator) {
val costEvaluator = "org.apache.spark.sql.execution.adaptive.GlutenCostEvaluator"
conf.set(SQLConf.ADAPTIVE_CUSTOM_COST_EVALUATOR_CLASS.key, costEvaluator)
}
Review Comment:
It turns out that this part of code is problematical.
The entrypoint `GlutenPlugin` is called only once in the same Spark session. So say user could set `spark.gluten.enabled=false` then set it to true using `SET` prompt after a while.
Will there be any issue if we just make `GlutenCostEvaluator` always load? Which means removing the conditions, namely `if (glutenEnabled && enableGlutenCostEvaluator)` here.
cc @zml1206
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@gluten.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@gluten.apache.org
For additional commands, e-mail: commits-help@gluten.apache.org
Re: [PR] [GLUTEN-7856][CORE] Fix the setPredefinedConfigs initialization of GlutenPlugin [incubator-gluten]
Posted by "weixiuli (via GitHub)" <gi...@apache.org>.
weixiuli commented on code in PR #7857:
URL: https://github.com/apache/incubator-gluten/pull/7857#discussion_r1835267461
##########
gluten-core/src/main/scala/org/apache/gluten/GlutenPlugin.scala:
##########
@@ -134,7 +134,11 @@ private[gluten] class GlutenDriverPlugin extends DriverPlugin with Logging {
conf.set(SPARK_SESSION_EXTENSIONS.key, extensions)
// adaptive custom cost evaluator class
- if (GlutenConfig.getConf.enableGluten && GlutenConfig.getConf.enableGlutenCostEvaluator) {
+ val glutenEnabled = conf.getBoolean(GlutenConfig.GLUTEN_ENABLED_KEY, GLUTEN_ENABLED_BY_DEFAULT)
+ lazy val enableGlutenCostEvaluator = conf.getBoolean(
+ GlutenConfig.GLUTEN_COST_EVALUATOR_ENABLED,
+ GLUTEN_COST_EVALUATOR_DEFAULT_VALUE)
+ if (glutenEnabled && enableGlutenCostEvaluator) {
val costEvaluator = "org.apache.spark.sql.execution.adaptive.GlutenCostEvaluator"
conf.set(SQLConf.ADAPTIVE_CUSTOM_COST_EVALUATOR_CLASS.key, costEvaluator)
}
Review Comment:
should we only retain the `enableGlutenCostEvaluator` condition whether to enable gluten? @zml1206 @zhztheplayer
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@gluten.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@gluten.apache.org
For additional commands, e-mail: commits-help@gluten.apache.org
Re: [PR] [GLUTEN-7856][CORE] Fix the setPredefinedConfigs initialization of GlutenPlugin [incubator-gluten]
Posted by "github-actions[bot] (via GitHub)" <gi...@apache.org>.
github-actions[bot] commented on PR #7857:
URL: https://github.com/apache/incubator-gluten/pull/7857#issuecomment-2467067859
Run Gluten Clickhouse CI on x86
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@gluten.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@gluten.apache.org
For additional commands, e-mail: commits-help@gluten.apache.org
Re: [PR] [GLUTEN-7856][CORE] Ensure correct enabling of GlutenCostEvaluator [incubator-gluten]
Posted by "zhztheplayer (via GitHub)" <gi...@apache.org>.
zhztheplayer merged PR #7857:
URL: https://github.com/apache/incubator-gluten/pull/7857
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@gluten.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@gluten.apache.org
For additional commands, e-mail: commits-help@gluten.apache.org
Re: [PR] [GLUTEN-7856][CORE] Fix the setPredefinedConfigs initialization of GlutenPlugin [incubator-gluten]
Posted by "zml1206 (via GitHub)" <gi...@apache.org>.
zml1206 commented on code in PR #7857:
URL: https://github.com/apache/incubator-gluten/pull/7857#discussion_r1835890559
##########
shims/spark33/src/main/scala/org/apache/spark/sql/execution/adaptive/GlutenCostEvaluator.scala:
##########
@@ -26,7 +26,7 @@ import org.apache.spark.sql.internal.SQLConf
case class GlutenCostEvaluator() extends CostEvaluator with SQLConfHelper {
override def evaluateCost(plan: SparkPlan): Cost = {
val forceOptimizeSkewedJoin = conf.getConf(SQLConf.ADAPTIVE_FORCE_OPTIMIZE_SKEWED_JOIN)
- if (GlutenConfig.getConf.enableGluten) {
+ if (GlutenConfig.getConf.enableGlutenCostEvaluator) {
Review Comment:
I understand there is no need to change here, We should update `enableGlutenCostEvaluator` to be a static config.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@gluten.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@gluten.apache.org
For additional commands, e-mail: commits-help@gluten.apache.org
Re: [PR] [GLUTEN-7856][CORE] Fix the setPredefinedConfigs initialization of GlutenPlugin [incubator-gluten]
Posted by "github-actions[bot] (via GitHub)" <gi...@apache.org>.
github-actions[bot] commented on PR #7857:
URL: https://github.com/apache/incubator-gluten/pull/7857#issuecomment-2467171984
Run Gluten Clickhouse CI on x86
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@gluten.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@gluten.apache.org
For additional commands, e-mail: commits-help@gluten.apache.org
Re: [PR] [GLUTEN-7856][CORE] Fix the setPredefinedConfigs initialization of GlutenPlugin [incubator-gluten]
Posted by "zml1206 (via GitHub)" <gi...@apache.org>.
zml1206 commented on code in PR #7857:
URL: https://github.com/apache/incubator-gluten/pull/7857#discussion_r1833716284
##########
gluten-core/src/main/scala/org/apache/gluten/GlutenPlugin.scala:
##########
@@ -134,7 +134,11 @@ private[gluten] class GlutenDriverPlugin extends DriverPlugin with Logging {
conf.set(SPARK_SESSION_EXTENSIONS.key, extensions)
// adaptive custom cost evaluator class
- if (GlutenConfig.getConf.enableGluten && GlutenConfig.getConf.enableGlutenCostEvaluator) {
+ val glutenEnabled = conf.getBoolean(GlutenConfig.GLUTEN_ENABLED_KEY, GLUTEN_ENABLED_BY_DEFAULT)
+ lazy val enableGlutenCostEvaluator = conf.getBoolean(
+ GlutenConfig.GLUTEN_COST_EVALUATOR_ENABLED,
+ GLUTEN_COST_EVALUATOR_DEFAULT_VALUE)
+ if (glutenEnabled && enableGlutenCostEvaluator) {
val costEvaluator = "org.apache.spark.sql.execution.adaptive.GlutenCostEvaluator"
conf.set(SQLConf.ADAPTIVE_CUSTOM_COST_EVALUATOR_CLASS.key, costEvaluator)
}
Review Comment:
`GlutenCostEvaluator` will determine whether gluten is enabled at runtime(https://github.com/apache/incubator-gluten/blob/3e6263e204aee9b5f1d1afe06102cb97251c08ed/shims/spark34/src/main/scala/org/apache/spark/sql/execution/adaptive/GlutenCostEvaluator.scala#L29), when gluten is disabled, the cost is the same as vanilla spark. `GlutenCostEvaluator` is added for use the smaller table to build hashmap in shuffled hash join and `CostEvaluator` does not support dynamic changes. So Retained `enableGlutenCostEvaluator` condition and remove `glutenEnabled` condition would be more appropriate?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@gluten.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@gluten.apache.org
For additional commands, e-mail: commits-help@gluten.apache.org
Re: [PR] [GLUTEN-7856][CORE] Fix the setPredefinedConfigs initialization of GlutenPlugin [incubator-gluten]
Posted by "github-actions[bot] (via GitHub)" <gi...@apache.org>.
github-actions[bot] commented on PR #7857:
URL: https://github.com/apache/incubator-gluten/pull/7857#issuecomment-2463640276
https://github.com/apache/incubator-gluten/issues/7856
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@gluten.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@gluten.apache.org
For additional commands, e-mail: commits-help@gluten.apache.org
Re: [PR] [GLUTEN-7856][CORE] Fix the setPredefinedConfigs initialization of GlutenPlugin [incubator-gluten]
Posted by "zml1206 (via GitHub)" <gi...@apache.org>.
zml1206 commented on code in PR #7857:
URL: https://github.com/apache/incubator-gluten/pull/7857#discussion_r1835994186
##########
shims/common/src/main/scala/org/apache/gluten/GlutenConfig.scala:
##########
@@ -645,6 +643,7 @@ object GlutenConfig {
"spark.gluten.memory.dynamic.offHeap.sizing.memory.fraction"
val GLUTEN_COST_EVALUATOR_ENABLED = "spark.gluten.sql.adaptive.costEvaluator.enabled"
+ val GLUTEN_COST_EVALUATOR_DEFAULT_VALUE = true
Review Comment:
Please update to `GLUTEN_COST_EVALUATOR_ENABLED_DEFAULT_VALUE`.
##########
shims/common/src/main/scala/org/apache/gluten/GlutenConfig.scala:
##########
@@ -2108,15 +2107,15 @@ object GlutenConfig {
.createWithDefault(true)
val COST_EVALUATOR_ENABLED =
- buildConf(GlutenConfig.GLUTEN_COST_EVALUATOR_ENABLED)
+ buildStaticConf(GlutenConfig.GLUTEN_COST_EVALUATOR_ENABLED)
.internal()
.doc(
"If true and gluten enabled, use " +
Review Comment:
Please remove `and gluten enabled`.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@gluten.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@gluten.apache.org
For additional commands, e-mail: commits-help@gluten.apache.org
Re: [PR] [GLUTEN-7856][CORE] Fix the setPredefinedConfigs initialization of GlutenPlugin [incubator-gluten]
Posted by "github-actions[bot] (via GitHub)" <gi...@apache.org>.
github-actions[bot] commented on PR #7857:
URL: https://github.com/apache/incubator-gluten/pull/7857#issuecomment-2467188216
Run Gluten Clickhouse CI on x86
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@gluten.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@gluten.apache.org
For additional commands, e-mail: commits-help@gluten.apache.org
Re: [PR] [CORE] Fix the setPredefinedConfigs initialization of GlutenPlugin [incubator-gluten]
Posted by "github-actions[bot] (via GitHub)" <gi...@apache.org>.
github-actions[bot] commented on PR #7857:
URL: https://github.com/apache/incubator-gluten/pull/7857#issuecomment-2463638537
Run Gluten Clickhouse CI on x86
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@gluten.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@gluten.apache.org
For additional commands, e-mail: commits-help@gluten.apache.org
Re: [PR] [GLUTEN-7856][CORE] To ensure the correct use of the GlutenCostEvaluator [incubator-gluten]
Posted by "weixiuli (via GitHub)" <gi...@apache.org>.
weixiuli commented on PR #7857:
URL: https://github.com/apache/incubator-gluten/pull/7857#issuecomment-2475346337
> @weixiuli Can we have a better PR title for this? Thanks!
Done.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@gluten.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@gluten.apache.org
For additional commands, e-mail: commits-help@gluten.apache.org
Re: [PR] [GLUTEN-7856][CORE] Fix the setPredefinedConfigs initialization of GlutenPlugin [incubator-gluten]
Posted by "zhztheplayer (via GitHub)" <gi...@apache.org>.
zhztheplayer commented on code in PR #7857:
URL: https://github.com/apache/incubator-gluten/pull/7857#discussion_r1835830296
##########
gluten-core/src/main/scala/org/apache/gluten/GlutenPlugin.scala:
##########
@@ -134,7 +134,11 @@ private[gluten] class GlutenDriverPlugin extends DriverPlugin with Logging {
conf.set(SPARK_SESSION_EXTENSIONS.key, extensions)
// adaptive custom cost evaluator class
- if (GlutenConfig.getConf.enableGluten && GlutenConfig.getConf.enableGlutenCostEvaluator) {
+ val glutenEnabled = conf.getBoolean(GlutenConfig.GLUTEN_ENABLED_KEY, GLUTEN_ENABLED_BY_DEFAULT)
+ lazy val enableGlutenCostEvaluator = conf.getBoolean(
+ GlutenConfig.GLUTEN_COST_EVALUATOR_ENABLED,
+ GLUTEN_COST_EVALUATOR_DEFAULT_VALUE)
+ if (glutenEnabled && enableGlutenCostEvaluator) {
val costEvaluator = "org.apache.spark.sql.execution.adaptive.GlutenCostEvaluator"
conf.set(SQLConf.ADAPTIVE_CUSTOM_COST_EVALUATOR_CLASS.key, costEvaluator)
}
Review Comment:
> Should we only retain the `enableGlutenCostEvaluator` condition, no matter whether to enable gluten? @zml1206 @zhztheplayer
Yes, let's try remove the if conditions.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@gluten.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@gluten.apache.org
For additional commands, e-mail: commits-help@gluten.apache.org
Re: [PR] [GLUTEN-7856][CORE] Fix the setPredefinedConfigs initialization of GlutenPlugin [incubator-gluten]
Posted by "zml1206 (via GitHub)" <gi...@apache.org>.
zml1206 commented on code in PR #7857:
URL: https://github.com/apache/incubator-gluten/pull/7857#discussion_r1835890559
##########
shims/spark33/src/main/scala/org/apache/spark/sql/execution/adaptive/GlutenCostEvaluator.scala:
##########
@@ -26,7 +26,7 @@ import org.apache.spark.sql.internal.SQLConf
case class GlutenCostEvaluator() extends CostEvaluator with SQLConfHelper {
override def evaluateCost(plan: SparkPlan): Cost = {
val forceOptimizeSkewedJoin = conf.getConf(SQLConf.ADAPTIVE_FORCE_OPTIMIZE_SKEWED_JOIN)
- if (GlutenConfig.getConf.enableGluten) {
+ if (GlutenConfig.getConf.enableGlutenCostEvaluator) {
Review Comment:
I understand there is no need to change here, `enableGlutenCostEvaluator` should be a static config.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@gluten.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@gluten.apache.org
For additional commands, e-mail: commits-help@gluten.apache.org
Re: [PR] [GLUTEN-7856][CORE] Fix the setPredefinedConfigs initialization of GlutenPlugin [incubator-gluten]
Posted by "zml1206 (via GitHub)" <gi...@apache.org>.
zml1206 commented on code in PR #7857:
URL: https://github.com/apache/incubator-gluten/pull/7857#discussion_r1835919303
##########
shims/common/src/main/scala/org/apache/gluten/GlutenConfig.scala:
##########
@@ -2107,17 +2103,6 @@ object GlutenConfig {
.booleanConf
.createWithDefault(true)
- val COST_EVALUATOR_ENABLED =
- buildConf(GlutenConfig.GLUTEN_COST_EVALUATOR_ENABLED)
Review Comment:
I mean update `buildConf` to `buildStaticConf`.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@gluten.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@gluten.apache.org
For additional commands, e-mail: commits-help@gluten.apache.org
Re: [PR] [CORE] Fix the setPredefinedConfigs initialization of GlutenPlugin [incubator-gluten]
Posted by "github-actions[bot] (via GitHub)" <gi...@apache.org>.
github-actions[bot] commented on PR #7857:
URL: https://github.com/apache/incubator-gluten/pull/7857#issuecomment-2463638253
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
regarding copyright ownership. The ASF licenses this file
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICEGJ-2.0
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
Thanks for opening a pull request!
Could you open an issue for this pull request on Github Issues?
https://github.com/apache/incubator-gluten/issues
Then could you also rename ***commit message*** and ***pull request title*** in the following format?
[GLUTEN-${ISSUES_ID}][COMPONENT]feat/fix: ${detailed message}
See also:
* [Other pull requests](https://github.com/apache/incubator-gluten/pulls/)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@gluten.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@gluten.apache.org
For additional commands, e-mail: commits-help@gluten.apache.org
Re: [PR] [GLUTEN-7856][CORE] Fix the setPredefinedConfigs initialization of GlutenPlugin [incubator-gluten]
Posted by "github-actions[bot] (via GitHub)" <gi...@apache.org>.
github-actions[bot] commented on PR #7857:
URL: https://github.com/apache/incubator-gluten/pull/7857#issuecomment-2467335900
Run Gluten Clickhouse CI on x86
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@gluten.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@gluten.apache.org
For additional commands, e-mail: commits-help@gluten.apache.org
Re: [PR] [GLUTEN-7856][CORE] Fix the setPredefinedConfigs initialization of GlutenPlugin [incubator-gluten]
Posted by "zml1206 (via GitHub)" <gi...@apache.org>.
zml1206 commented on code in PR #7857:
URL: https://github.com/apache/incubator-gluten/pull/7857#discussion_r1833716284
##########
gluten-core/src/main/scala/org/apache/gluten/GlutenPlugin.scala:
##########
@@ -134,7 +134,11 @@ private[gluten] class GlutenDriverPlugin extends DriverPlugin with Logging {
conf.set(SPARK_SESSION_EXTENSIONS.key, extensions)
// adaptive custom cost evaluator class
- if (GlutenConfig.getConf.enableGluten && GlutenConfig.getConf.enableGlutenCostEvaluator) {
+ val glutenEnabled = conf.getBoolean(GlutenConfig.GLUTEN_ENABLED_KEY, GLUTEN_ENABLED_BY_DEFAULT)
+ lazy val enableGlutenCostEvaluator = conf.getBoolean(
+ GlutenConfig.GLUTEN_COST_EVALUATOR_ENABLED,
+ GLUTEN_COST_EVALUATOR_DEFAULT_VALUE)
+ if (glutenEnabled && enableGlutenCostEvaluator) {
val costEvaluator = "org.apache.spark.sql.execution.adaptive.GlutenCostEvaluator"
conf.set(SQLConf.ADAPTIVE_CUSTOM_COST_EVALUATOR_CLASS.key, costEvaluator)
}
Review Comment:
`GlutenCostEvaluator` will determine whether gluten is enabled at runtime. CostEvaluator does not support dynamic changes. `GlutenCostEvaluator` is added for use the smaller table to build hashmap in shuffled hash join. Retained `enableGlutenCostEvaluator` condition and remove `glutenEnabled` condition would be more appropriate?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@gluten.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@gluten.apache.org
For additional commands, e-mail: commits-help@gluten.apache.org
Re: [PR] [GLUTEN-7856][CORE] Fix the setPredefinedConfigs initialization of GlutenPlugin [incubator-gluten]
Posted by "zhztheplayer (via GitHub)" <gi...@apache.org>.
zhztheplayer commented on code in PR #7857:
URL: https://github.com/apache/incubator-gluten/pull/7857#discussion_r1833700481
##########
gluten-core/src/main/scala/org/apache/gluten/GlutenPlugin.scala:
##########
@@ -134,7 +134,11 @@ private[gluten] class GlutenDriverPlugin extends DriverPlugin with Logging {
conf.set(SPARK_SESSION_EXTENSIONS.key, extensions)
// adaptive custom cost evaluator class
- if (GlutenConfig.getConf.enableGluten && GlutenConfig.getConf.enableGlutenCostEvaluator) {
+ val glutenEnabled = conf.getBoolean(GlutenConfig.GLUTEN_ENABLED_KEY, GLUTEN_ENABLED_BY_DEFAULT)
+ lazy val enableGlutenCostEvaluator = conf.getBoolean(
+ GlutenConfig.GLUTEN_COST_EVALUATOR_ENABLED,
+ GLUTEN_COST_EVALUATOR_DEFAULT_VALUE)
+ if (glutenEnabled && enableGlutenCostEvaluator) {
val costEvaluator = "org.apache.spark.sql.execution.adaptive.GlutenCostEvaluator"
conf.set(SQLConf.ADAPTIVE_CUSTOM_COST_EVALUATOR_CLASS.key, costEvaluator)
}
Review Comment:
It turns out that this part of code is problematical.
The entrypoint `GlutenPlugin` is called only once in the same Spark session. So say user could set `spark.gluten.enabled=false` then set it to true using `SET` prompt after a while, `GlutenCostEvaluator` may not load in the case.
Will there be any issue if we just make `GlutenCostEvaluator` always load? Which means removing the conditions, namely `if (glutenEnabled && enableGlutenCostEvaluator)` here.
cc @zml1206
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@gluten.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@gluten.apache.org
For additional commands, e-mail: commits-help@gluten.apache.org
Re: [PR] [GLUTEN-7856][CORE] Fix the setPredefinedConfigs initialization of GlutenPlugin [incubator-gluten]
Posted by "zml1206 (via GitHub)" <gi...@apache.org>.
zml1206 commented on code in PR #7857:
URL: https://github.com/apache/incubator-gluten/pull/7857#discussion_r1833716284
##########
gluten-core/src/main/scala/org/apache/gluten/GlutenPlugin.scala:
##########
@@ -134,7 +134,11 @@ private[gluten] class GlutenDriverPlugin extends DriverPlugin with Logging {
conf.set(SPARK_SESSION_EXTENSIONS.key, extensions)
// adaptive custom cost evaluator class
- if (GlutenConfig.getConf.enableGluten && GlutenConfig.getConf.enableGlutenCostEvaluator) {
+ val glutenEnabled = conf.getBoolean(GlutenConfig.GLUTEN_ENABLED_KEY, GLUTEN_ENABLED_BY_DEFAULT)
+ lazy val enableGlutenCostEvaluator = conf.getBoolean(
+ GlutenConfig.GLUTEN_COST_EVALUATOR_ENABLED,
+ GLUTEN_COST_EVALUATOR_DEFAULT_VALUE)
+ if (glutenEnabled && enableGlutenCostEvaluator) {
val costEvaluator = "org.apache.spark.sql.execution.adaptive.GlutenCostEvaluator"
conf.set(SQLConf.ADAPTIVE_CUSTOM_COST_EVALUATOR_CLASS.key, costEvaluator)
}
Review Comment:
`GlutenCostEvaluator` will judge whether gluten is enabled at runtime(https://github.com/apache/incubator-gluten/blob/3e6263e204aee9b5f1d1afe06102cb97251c08ed/shims/spark34/src/main/scala/org/apache/spark/sql/execution/adaptive/GlutenCostEvaluator.scala#L29), when gluten is disabled, the cost is the same as vanilla spark. `GlutenCostEvaluator` is added for use the smaller table to build hashmap in shuffled hash join and `CostEvaluator` does not support dynamic changes. So Retained `enableGlutenCostEvaluator` condition and remove `glutenEnabled` condition would be more appropriate?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@gluten.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@gluten.apache.org
For additional commands, e-mail: commits-help@gluten.apache.org
Re: [PR] [GLUTEN-7856][CORE] Fix the setPredefinedConfigs initialization of GlutenPlugin [incubator-gluten]
Posted by "weixiuli (via GitHub)" <gi...@apache.org>.
weixiuli commented on code in PR #7857:
URL: https://github.com/apache/incubator-gluten/pull/7857#discussion_r1835267461
##########
gluten-core/src/main/scala/org/apache/gluten/GlutenPlugin.scala:
##########
@@ -134,7 +134,11 @@ private[gluten] class GlutenDriverPlugin extends DriverPlugin with Logging {
conf.set(SPARK_SESSION_EXTENSIONS.key, extensions)
// adaptive custom cost evaluator class
- if (GlutenConfig.getConf.enableGluten && GlutenConfig.getConf.enableGlutenCostEvaluator) {
+ val glutenEnabled = conf.getBoolean(GlutenConfig.GLUTEN_ENABLED_KEY, GLUTEN_ENABLED_BY_DEFAULT)
+ lazy val enableGlutenCostEvaluator = conf.getBoolean(
+ GlutenConfig.GLUTEN_COST_EVALUATOR_ENABLED,
+ GLUTEN_COST_EVALUATOR_DEFAULT_VALUE)
+ if (glutenEnabled && enableGlutenCostEvaluator) {
val costEvaluator = "org.apache.spark.sql.execution.adaptive.GlutenCostEvaluator"
conf.set(SQLConf.ADAPTIVE_CUSTOM_COST_EVALUATOR_CLASS.key, costEvaluator)
}
Review Comment:
Should we only retain the `enableGlutenCostEvaluator` condition, no matter whether to enable gluten? @zml1206 @zhztheplayer
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@gluten.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@gluten.apache.org
For additional commands, e-mail: commits-help@gluten.apache.org
Re: [PR] [GLUTEN-7856][CORE] Fix the setPredefinedConfigs initialization of GlutenPlugin [incubator-gluten]
Posted by "weixiuli (via GitHub)" <gi...@apache.org>.
weixiuli commented on code in PR #7857:
URL: https://github.com/apache/incubator-gluten/pull/7857#discussion_r1835887860
##########
shims/spark33/src/main/scala/org/apache/spark/sql/execution/adaptive/GlutenCostEvaluator.scala:
##########
@@ -26,7 +26,7 @@ import org.apache.spark.sql.internal.SQLConf
case class GlutenCostEvaluator() extends CostEvaluator with SQLConfHelper {
override def evaluateCost(plan: SparkPlan): Cost = {
val forceOptimizeSkewedJoin = conf.getConf(SQLConf.ADAPTIVE_FORCE_OPTIMIZE_SKEWED_JOIN)
- if (GlutenConfig.getConf.enableGluten) {
+ if (GlutenConfig.getConf.enableGlutenCostEvaluator) {
Review Comment:
```
if (GlutenConfig.getConf.enableGluten && GlutenConfig.getConf.enableGlutenCostEvaluator) {
new GlutenCost(SimpleCostEvaluator(forceOptimizeSkewedJoin), plan)
} else {
SimpleCostEvaluator(forceOptimizeSkewedJoin).evaluateCost(plan)
}
```
right ?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@gluten.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@gluten.apache.org
For additional commands, e-mail: commits-help@gluten.apache.org