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 6abde8f8d6 [CORE] Minor: Rename LimitTransformer to
LimitExecTransformer (#7843)
6abde8f8d6 is described below
commit 6abde8f8d61e9fc61130a42735a8a377d382d129
Author: Hongze Zhang <[email protected]>
AuthorDate: Fri Nov 8 10:33:43 2024 +0800
[CORE] Minor: Rename LimitTransformer to LimitExecTransformer (#7843)
---
.../gluten/backendsapi/velox/VeloxSparkPlanExecApi.scala | 2 +-
.../scala/org/apache/gluten/execution/MiscOperatorSuite.scala | 2 +-
.../gluten/execution/VeloxOrcDataTypeValidationSuite.scala | 2 +-
.../gluten/execution/VeloxParquetDataTypeValidationSuite.scala | 2 +-
.../{LimitTransformer.scala => LimitExecTransformer.scala} | 4 ++--
.../execution/TakeOrderedAndProjectExecTransformer.scala | 10 +++++-----
.../org/apache/gluten/extension/columnar/FallbackRules.scala | 4 ++--
.../apache/gluten/extension/columnar/OffloadSingleNode.scala | 4 ++--
8 files changed, 15 insertions(+), 15 deletions(-)
diff --git
a/backends-velox/src/main/scala/org/apache/gluten/backendsapi/velox/VeloxSparkPlanExecApi.scala
b/backends-velox/src/main/scala/org/apache/gluten/backendsapi/velox/VeloxSparkPlanExecApi.scala
index 7901374f6b..5925666d2c 100644
---
a/backends-velox/src/main/scala/org/apache/gluten/backendsapi/velox/VeloxSparkPlanExecApi.scala
+++
b/backends-velox/src/main/scala/org/apache/gluten/backendsapi/velox/VeloxSparkPlanExecApi.scala
@@ -806,7 +806,7 @@ class VeloxSparkPlanExecApi extends SparkPlanExecApi {
override def maybeCollapseTakeOrderedAndProject(plan: SparkPlan): SparkPlan
= {
// This to-top-n optimization assumes exchange operators were already
placed in input plan.
plan.transformUp {
- case p @ LimitTransformer(SortExecTransformer(sortOrder, _, child, _),
0, count) =>
+ case p @ LimitExecTransformer(SortExecTransformer(sortOrder, _, child,
_), 0, count) =>
val global = child.outputPartitioning.satisfies(AllTuples)
val topN = TopNTransformer(count, sortOrder, global, child)
if (topN.doValidate().ok()) {
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 7e9b48e96c..da5184f752 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
@@ -566,7 +566,7 @@ class MiscOperatorSuite extends
VeloxWholeStageTransformerSuite with AdaptiveSpa
| select * from lineitem limit 10
|) where l_suppkey != 0 limit 100;
|""".stripMargin) {
- checkGlutenOperatorMatch[LimitTransformer]
+ checkGlutenOperatorMatch[LimitExecTransformer]
}
}
diff --git
a/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxOrcDataTypeValidationSuite.scala
b/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxOrcDataTypeValidationSuite.scala
index 3bf49d33c5..24e04f2dfc 100644
---
a/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxOrcDataTypeValidationSuite.scala
+++
b/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxOrcDataTypeValidationSuite.scala
@@ -265,7 +265,7 @@ class VeloxOrcDataTypeValidationSuite extends
VeloxWholeStageTransformerSuite {
| select date, int from type1 limit 100
|) where int != 0 limit 10;
|""".stripMargin) {
- checkGlutenOperatorMatch[LimitTransformer]
+ checkGlutenOperatorMatch[LimitExecTransformer]
}
// Validation: Window.
diff --git
a/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxParquetDataTypeValidationSuite.scala
b/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxParquetDataTypeValidationSuite.scala
index 8b6cc63c95..57ca448fec 100644
---
a/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxParquetDataTypeValidationSuite.scala
+++
b/backends-velox/src/test/scala/org/apache/gluten/execution/VeloxParquetDataTypeValidationSuite.scala
@@ -264,7 +264,7 @@ class VeloxParquetDataTypeValidationSuite extends
VeloxWholeStageTransformerSuit
| select date, int from type1 limit 100
|) where int != 0 limit 10;
|""".stripMargin) {
- checkGlutenOperatorMatch[LimitTransformer]
+ checkGlutenOperatorMatch[LimitExecTransformer]
}
// Validation: Window.
diff --git
a/gluten-substrait/src/main/scala/org/apache/gluten/execution/LimitTransformer.scala
b/gluten-substrait/src/main/scala/org/apache/gluten/execution/LimitExecTransformer.scala
similarity index 97%
rename from
gluten-substrait/src/main/scala/org/apache/gluten/execution/LimitTransformer.scala
rename to
gluten-substrait/src/main/scala/org/apache/gluten/execution/LimitExecTransformer.scala
index 8859844be4..58ef90fd14 100644
---
a/gluten-substrait/src/main/scala/org/apache/gluten/execution/LimitTransformer.scala
+++
b/gluten-substrait/src/main/scala/org/apache/gluten/execution/LimitExecTransformer.scala
@@ -30,7 +30,7 @@ import org.apache.spark.sql.execution.SparkPlan
import scala.collection.JavaConverters._
-case class LimitTransformer(child: SparkPlan, offset: Long, count: Long)
+case class LimitExecTransformer(child: SparkPlan, offset: Long, count: Long)
extends UnaryTransformSupport {
// Note: "metrics" is made transient to avoid sending driver-side metrics to
tasks.
@@ -39,7 +39,7 @@ case class LimitTransformer(child: SparkPlan, offset: Long,
count: Long)
override def output: Seq[Attribute] = child.output
- override protected def withNewChildInternal(newChild: SparkPlan):
LimitTransformer =
+ override protected def withNewChildInternal(newChild: SparkPlan):
LimitExecTransformer =
copy(child = newChild)
override def metricsUpdater(): MetricsUpdater =
diff --git
a/gluten-substrait/src/main/scala/org/apache/gluten/execution/TakeOrderedAndProjectExecTransformer.scala
b/gluten-substrait/src/main/scala/org/apache/gluten/execution/TakeOrderedAndProjectExecTransformer.scala
index b31471e213..c4e192d183 100644
---
a/gluten-substrait/src/main/scala/org/apache/gluten/execution/TakeOrderedAndProjectExecTransformer.scala
+++
b/gluten-substrait/src/main/scala/org/apache/gluten/execution/TakeOrderedAndProjectExecTransformer.scala
@@ -73,7 +73,7 @@ case class TakeOrderedAndProjectExecTransformer(
var tagged: ValidationResult = null
val orderingSatisfies = SortOrder.orderingSatisfies(child.outputOrdering,
sortOrder)
if (orderingSatisfies) {
- val limitPlan = LimitTransformer(child, offset, limit)
+ val limitPlan = LimitExecTransformer(child, offset, limit)
tagged = limitPlan.doValidate()
} else {
// Here we are validating sort + limit which is a kind of whole stage
transformer,
@@ -86,7 +86,7 @@ case class TakeOrderedAndProjectExecTransformer(
if (!sortValidation.ok()) {
return sortValidation
}
- val limitPlan = LimitTransformer(sortPlan, offset, limit)
+ val limitPlan = LimitExecTransformer(sortPlan, offset, limit)
tagged = limitPlan.doValidate()
}
@@ -127,13 +127,13 @@ case class TakeOrderedAndProjectExecTransformer(
// remove this WholeStageTransformer, put the new sort, limit and
project
// into a new whole stage.
val localSortPlan = withLocalSort(wholeStage.child)
- LimitTransformer(localSortPlan, limitBeforeShuffleOffset, limit)
+ LimitExecTransformer(localSortPlan, limitBeforeShuffleOffset, limit)
case other =>
// if the child it is not WholeStageTransformer, add the adapter
first
// so that, later we can wrap WholeStageTransformer.
val localSortPlan = withLocalSort(
ColumnarCollapseTransformStages.wrapInputIteratorTransformer(other))
- LimitTransformer(localSortPlan, limitBeforeShuffleOffset, limit)
+ LimitExecTransformer(localSortPlan, limitBeforeShuffleOffset, limit)
}
val transformStageCounter: AtomicInteger =
ColumnarCollapseTransformStages.transformStageCounter
@@ -150,7 +150,7 @@ case class TakeOrderedAndProjectExecTransformer(
sortOrder,
false,
ColumnarCollapseTransformStages.wrapInputIteratorTransformer(transformedShuffleExec))
- LimitTransformer(localSortPlan, offset, limit)
+ LimitExecTransformer(localSortPlan, offset, limit)
}
val projectPlan = if (projectList != child.output) {
diff --git
a/gluten-substrait/src/main/scala/org/apache/gluten/extension/columnar/FallbackRules.scala
b/gluten-substrait/src/main/scala/org/apache/gluten/extension/columnar/FallbackRules.scala
index 794186bfa9..b557abe001 100644
---
a/gluten-substrait/src/main/scala/org/apache/gluten/extension/columnar/FallbackRules.scala
+++
b/gluten-substrait/src/main/scala/org/apache/gluten/extension/columnar/FallbackRules.scala
@@ -405,10 +405,10 @@ case class AddFallbackTagRule() extends Rule[SparkPlan] {
case plan: GlobalLimitExec =>
val (limit, offset) =
SparkShimLoader.getSparkShims.getLimitAndOffsetFromGlobalLimit(plan)
- val transformer = LimitTransformer(plan.child, offset, limit)
+ val transformer = LimitExecTransformer(plan.child, offset, limit)
transformer.doValidate().tagOnFallback(plan)
case plan: LocalLimitExec =>
- val transformer = LimitTransformer(plan.child, 0L, plan.limit)
+ val transformer = LimitExecTransformer(plan.child, 0L, plan.limit)
transformer.doValidate().tagOnFallback(plan)
case plan: GenerateExec =>
val transformer =
BackendsApiManager.getSparkPlanExecApiInstance.genGenerateTransformer(
diff --git
a/gluten-substrait/src/main/scala/org/apache/gluten/extension/columnar/OffloadSingleNode.scala
b/gluten-substrait/src/main/scala/org/apache/gluten/extension/columnar/OffloadSingleNode.scala
index ce5b212069..220a45f7b3 100644
---
a/gluten-substrait/src/main/scala/org/apache/gluten/extension/columnar/OffloadSingleNode.scala
+++
b/gluten-substrait/src/main/scala/org/apache/gluten/extension/columnar/OffloadSingleNode.scala
@@ -298,11 +298,11 @@ object OffloadOthers {
val child = plan.child
val (limit, offset) =
SparkShimLoader.getSparkShims.getLimitAndOffsetFromGlobalLimit(plan)
- LimitTransformer(child, offset, limit)
+ LimitExecTransformer(child, offset, limit)
case plan: LocalLimitExec =>
logDebug(s"Columnar Processing for ${plan.getClass} is currently
supported.")
val child = plan.child
- LimitTransformer(child, 0L, plan.limit)
+ LimitExecTransformer(child, 0L, plan.limit)
case plan: GenerateExec =>
logDebug(s"Columnar Processing for ${plan.getClass} is currently
supported.")
val child = plan.child
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
