update

apache · Jan 21, 2025 · e3a8ed1 · e3a8ed1
1 parent 90f1960
commit e3a8ed1
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 23 deletions.
diff --git a/...ickhouse/src/main/scala/org/apache/gluten/backendsapi/clickhouse/CHSparkPlanExecApi.scala b/...ickhouse/src/main/scala/org/apache/gluten/backendsapi/clickhouse/CHSparkPlanExecApi.scala
@@ -939,7 +939,7 @@ class CHSparkPlanExecApi extends SparkPlanExecApi with Logging {
       numSlices: Int,
       numElements: BigInt,
       outputAttributes: Seq[Attribute],
-      child: Seq[SparkPlan]): RangeExecBaseTransformer =
+      child: Seq[SparkPlan]): ColumnarRangeBaseExec =
     throw new GlutenNotSupportException("ColumnarRange is not supported in ch backend.")
 
 }
diff --git a/...ends-velox/src/main/scala/org/apache/gluten/backendsapi/velox/VeloxSparkPlanExecApi.scala b/...ends-velox/src/main/scala/org/apache/gluten/backendsapi/velox/VeloxSparkPlanExecApi.scala
@@ -845,7 +845,7 @@ class VeloxSparkPlanExecApi extends SparkPlanExecApi {
       numSlices: Int,
       numElements: BigInt,
       outputAttributes: Seq[Attribute],
-      child: Seq[SparkPlan]): RangeExecBaseTransformer =
+      child: Seq[SparkPlan]): ColumnarRangeBaseExec =
     ColumnarRangeExec(start, end, step, numSlices, numElements, outputAttributes, child)
 
 }
diff --git a/backends-velox/src/main/scala/org/apache/gluten/execution/ColumnarRangeExec.scala b/backends-velox/src/main/scala/org/apache/gluten/execution/ColumnarRangeExec.scala
@@ -27,8 +27,8 @@ import org.apache.spark.sql.execution.SparkPlan
 import org.apache.spark.sql.vectorized.{ColumnarBatch, ColumnVector}
 
 /**
- * ColumnarRangeExec is a concrete implementation of RangeExecBaseTransformer that executes the
- * Range operation and supports columnar processing. It generates columnar batches for the specified
+ * ColumnarRangeExec is a concrete implementation of ColumnarRangeBaseExec that executes the Range
+ * operation and supports columnar processing. It generates columnar batches for the specified
  * range.
  *
  * @param start
@@ -54,14 +54,7 @@ case class ColumnarRangeExec(
     numElements: BigInt,
     outputAttributes: Seq[Attribute],
     child: Seq[SparkPlan]
-) extends RangeExecBaseTransformer(
-    start,
-    end,
-    step,
-    numSlices,
-    numElements,
-    outputAttributes,
-    child) {
+) extends ColumnarRangeBaseExec(start, end, step, numSlices, numElements, outputAttributes, child) {
 
   override def batchType(): Convention.BatchType = {
     ArrowJavaBatch

diff --git a/gluten-substrait/src/main/scala/org/apache/gluten/backendsapi/SparkPlanExecApi.scala b/gluten-substrait/src/main/scala/org/apache/gluten/backendsapi/SparkPlanExecApi.scala
@@ -702,6 +702,6 @@ trait SparkPlanExecApi {
       numSlices: Int,
       numElements: BigInt,
       outputAttributes: Seq[Attribute],
-      child: Seq[SparkPlan]): RangeExecBaseTransformer
+      child: Seq[SparkPlan]): ColumnarRangeBaseExec
 
 }
diff --git a/gluten-substrait/src/main/scala/org/apache/gluten/execution/RangeExecBaseTransformer.scala b/gluten-substrait/src/main/scala/org/apache/gluten/execution/RangeExecBaseTransformer.scala
@@ -26,7 +26,7 @@ import org.apache.spark.sql.execution.{LeafExecNode, RangeExec, SparkPlan}
  * Base class for RangeExec transformation, can be implemented by the by supported backends.
  * Currently velox is supported.
  */
-abstract class RangeExecBaseTransformer(
+abstract class ColumnarRangeBaseExec(
     start: Long,
     end: Long,
     step: Long,
@@ -50,11 +50,11 @@ abstract class RangeExecBaseTransformer(
 }
 
 /**
- * Companion object for RangeExecBaseTransformer, provides factory methods to create instance from
+ * Companion object for ColumnarRangeBaseExec, provides factory methods to create instance from
  * existing RangeExec plan.
  */
-object RangeExecBaseTransformer {
-  def from(rangeExec: RangeExec): RangeExecBaseTransformer = {
+object ColumnarRangeBaseExec {
+  def from(rangeExec: RangeExec): ColumnarRangeBaseExec = {
     BackendsApiManager.getSparkPlanExecApiInstance
       .genColumnarRangeExec(
         rangeExec.start,

diff --git a/...en-ut/spark33/src/test/scala/org/apache/spark/sql/execution/GlutenSQLRangeExecSuite.scala b/...en-ut/spark33/src/test/scala/org/apache/spark/sql/execution/GlutenSQLRangeExecSuite.scala
@@ -16,7 +16,7 @@
  */
 package org.apache.spark.sql.execution
 
-import org.apache.gluten.execution.RangeExecBaseTransformer
+import org.apache.gluten.execution.ColumnarRangeBaseExec
 
 import org.apache.spark.sql.{DataFrame, GlutenSQLTestsTrait, Row}
 import org.apache.spark.sql.functions.sum
@@ -38,7 +38,7 @@ class GlutenSQLRangeExecSuite extends GlutenSQLTestsTrait {
 
     checkAnswer(df, expectedData)
 
-    assertGlutenOperatorMatch[RangeExecBaseTransformer](df)
+    assertGlutenOperatorMatch[ColumnarRangeBaseExec](df)
   }
 
   testGluten("ColumnarRangeExec with step") {
@@ -47,7 +47,7 @@ class GlutenSQLRangeExecSuite extends GlutenSQLTestsTrait {
 
     checkAnswer(df, expectedData)
 
-    assertGlutenOperatorMatch[RangeExecBaseTransformer](df)
+    assertGlutenOperatorMatch[ColumnarRangeBaseExec](df)
   }
 
   testGluten("ColumnarRangeExec with filter") {
@@ -56,7 +56,7 @@ class GlutenSQLRangeExecSuite extends GlutenSQLTestsTrait {
 
     checkAnswer(df, expectedData)
 
-    assertGlutenOperatorMatch[RangeExecBaseTransformer](df)
+    assertGlutenOperatorMatch[ColumnarRangeBaseExec](df)
   }
 
   testGluten("ColumnarRangeExec with aggregation") {
@@ -66,7 +66,7 @@ class GlutenSQLRangeExecSuite extends GlutenSQLTestsTrait {
 
     checkAnswer(sumDf, expectedData)
 
-    assertGlutenOperatorMatch[RangeExecBaseTransformer](df)
+    assertGlutenOperatorMatch[ColumnarRangeBaseExec](df)
   }
 
   testGluten("ColumnarRangeExec with join") {
@@ -77,6 +77,6 @@ class GlutenSQLRangeExecSuite extends GlutenSQLTestsTrait {
 
     checkAnswer(joinDf, expectedData)
 
-    assertGlutenOperatorMatch[RangeExecBaseTransformer](joinDf)
+    assertGlutenOperatorMatch[ColumnarRangeBaseExec](joinDf)
   }
 }