make as a query level config

apache · Jun 19, 2024 · f75f346 · f75f346
1 parent 51b4911
commit f75f346
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 5 deletions.
diff --git a/shims/common/src/main/scala/org/apache/gluten/GlutenConfig.scala b/shims/common/src/main/scala/org/apache/gluten/GlutenConfig.scala
@@ -597,7 +597,7 @@ object GlutenConfig {
   val GLUTEN_DYNAMIC_OFFHEAP_SIZING_MEMORY_FRACTION =
     "spark.gluten.memory.dynamic.offHeap.sizing.memory.fraction"
 
-  val GLUTEN_COST_EVALUATOR_ENABLED = "spark.gluten.sql.execution.adaptive.costEvaluator.enabled"
+  val GLUTEN_COST_EVALUATOR_ENABLED = "spark.gluten.sql.adaptive.costEvaluator.enabled"
 
   var ins: GlutenConfig = _
 

diff --git a/.../spark32/src/main/scala/org/apache/spark/sql/execution/adaptive/GlutenCostEvaluator.scala b/.../spark32/src/main/scala/org/apache/spark/sql/execution/adaptive/GlutenCostEvaluator.scala
@@ -16,11 +16,17 @@
  */
 package org.apache.spark.sql.execution.adaptive
 
+import org.apache.gluten.GlutenConfig
+
 import org.apache.spark.sql.execution.SparkPlan
 
 /** This [[CostEvaluator]] is to force use the new physical plan when cost is equal. */
 case class GlutenCostEvaluator() extends CostEvaluator {
   override def evaluateCost(plan: SparkPlan): Cost = {
-    new GlutenCost(SimpleCostEvaluator, plan)
+    if (GlutenConfig.getConf.enableGluten) {
+      new GlutenCost(SimpleCostEvaluator, plan)
+    } else {
+      SimpleCostEvaluator.evaluateCost(plan)
+    }
   }
 }
diff --git a/.../spark33/src/main/scala/org/apache/spark/sql/execution/adaptive/GlutenCostEvaluator.scala b/.../spark33/src/main/scala/org/apache/spark/sql/execution/adaptive/GlutenCostEvaluator.scala
@@ -16,6 +16,8 @@
  */
 package org.apache.spark.sql.execution.adaptive
 
+import org.apache.gluten.GlutenConfig
+
 import org.apache.spark.sql.catalyst.SQLConfHelper
 import org.apache.spark.sql.execution.SparkPlan
 import org.apache.spark.sql.internal.SQLConf
@@ -24,6 +26,10 @@ 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)
-    new GlutenCost(SimpleCostEvaluator(forceOptimizeSkewedJoin), plan)
+    if (GlutenConfig.getConf.enableGluten) {
+      new GlutenCost(SimpleCostEvaluator(forceOptimizeSkewedJoin), plan)
+    } else {
+      SimpleCostEvaluator(forceOptimizeSkewedJoin).evaluateCost(plan)
+    }
   }
 }
diff --git a/.../spark34/src/main/scala/org/apache/spark/sql/execution/adaptive/GlutenCostEvaluator.scala b/.../spark34/src/main/scala/org/apache/spark/sql/execution/adaptive/GlutenCostEvaluator.scala
@@ -16,6 +16,8 @@
  */
 package org.apache.spark.sql.execution.adaptive
 
+import org.apache.gluten.GlutenConfig
+
 import org.apache.spark.sql.catalyst.SQLConfHelper
 import org.apache.spark.sql.execution.SparkPlan
 import org.apache.spark.sql.internal.SQLConf
@@ -24,6 +26,10 @@ 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)
-    new GlutenCost(SimpleCostEvaluator(forceOptimizeSkewedJoin), plan)
+    if (GlutenConfig.getConf.enableGluten) {
+      new GlutenCost(SimpleCostEvaluator(forceOptimizeSkewedJoin), plan)
+    } else {
+      SimpleCostEvaluator(forceOptimizeSkewedJoin).evaluateCost(plan)
+    }
   }
 }
diff --git a/.../spark35/src/main/scala/org/apache/spark/sql/execution/adaptive/GlutenCostEvaluator.scala b/.../spark35/src/main/scala/org/apache/spark/sql/execution/adaptive/GlutenCostEvaluator.scala
@@ -16,6 +16,8 @@
  */
 package org.apache.spark.sql.execution.adaptive
 
+import org.apache.gluten.GlutenConfig
+
 import org.apache.spark.sql.catalyst.SQLConfHelper
 import org.apache.spark.sql.execution.SparkPlan
 import org.apache.spark.sql.internal.SQLConf
@@ -24,6 +26,10 @@ 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)
-    new GlutenCost(SimpleCostEvaluator(forceOptimizeSkewedJoin), plan)
+    if (GlutenConfig.getConf.enableGluten) {
+      new GlutenCost(SimpleCostEvaluator(forceOptimizeSkewedJoin), plan)
+    } else {
+      SimpleCostEvaluator(forceOptimizeSkewedJoin).evaluateCost(plan)
+    }
   }
 }