Skip to content

Commit 5c8e55a

Browse files
authored
[CORE] Remove remaining Spark 3.2 compatibility code (apache#11731)
1 parent 243c2b3 commit 5c8e55a

48 files changed

Lines changed: 72 additions & 176 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

backends-clickhouse/src-delta33/main/scala/org/apache/spark/sql/execution/DeletionVectorWriteTransformer.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ case class DeletionVectorWriteTransformer(
9696

9797
override def batchType(): Convention.BatchType = BackendsApiManager.getSettings.primaryBatchType
9898

99-
override def rowType0(): Convention.RowType = Convention.RowType.None
99+
override def rowType(): Convention.RowType = Convention.RowType.None
100100

101101
override protected def doExecute(): RDD[InternalRow] = throw new UnsupportedOperationException()
102102
}

backends-clickhouse/src-delta33/main/scala/org/apache/spark/sql/perf/DeltaOptimizedWriterTransformer.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ case class DeltaOptimizedWriterTransformer(
248248

249249
override def batchType(): Convention.BatchType = BackendsApiManager.getSettings.primaryBatchType
250250

251-
override def rowType0(): Convention.RowType = Convention.RowType.None
251+
override def rowType(): Convention.RowType = Convention.RowType.None
252252

253253
override protected def doExecute(): RDD[InternalRow] = {
254254
child.execute()

backends-clickhouse/src/main/scala/org/apache/gluten/execution/CHColumnarToCarrierRowExec.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import org.apache.spark.sql.vectorized.ColumnarBatch
2626
case class CHColumnarToCarrierRowExec(override val child: SparkPlan)
2727
extends ColumnarToCarrierRowExecBase {
2828
override protected def fromBatchType(): Convention.BatchType = CHBatchType
29-
override def rowType0(): Convention.RowType = CHCarrierRowType
29+
override def rowType(): Convention.RowType = CHCarrierRowType
3030
override protected def withNewChildInternal(newChild: SparkPlan): SparkPlan =
3131
copy(child = newChild)
3232
// Since https://github.com/apache/incubator-gluten/pull/1595.

backends-velox/src-delta33/main/scala/org/apache/spark/sql/delta/perf/GlutenDeltaOptimizedWriterExec.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ case class GlutenDeltaOptimizedWriterExec(
235235

236236
override def batchType(): Convention.BatchType = VeloxBatchType
237237

238-
override def rowType0(): Convention.RowType = Convention.RowType.None
238+
override def rowType(): Convention.RowType = Convention.RowType.None
239239
}
240240

241241
/**

backends-velox/src-delta33/main/scala/org/apache/spark/sql/delta/stats/GlutenDeltaJobStatsTracker.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ object GlutenDeltaJobStatsTracker extends Logging {
331331
with LeafExecNode {
332332
override def output: Seq[Attribute] = keySchema ++ dataSchema
333333
override def batchType(): Convention.BatchType = VeloxBatchType
334-
override def rowType0(): Convention.RowType = Convention.RowType.None
334+
override def rowType(): Convention.RowType = Convention.RowType.None
335335
override protected def doExecute(): RDD[InternalRow] = throw new UnsupportedOperationException()
336336
override protected def doExecuteColumnar(): RDD[ColumnarBatch] =
337337
throw new UnsupportedOperationException()

backends-velox/src/main/scala/org/apache/gluten/execution/ColumnarPartialGenerateExec.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,7 @@ case class ColumnarPartialGenerateExec(generateExec: GenerateExec, child: SparkP
385385

386386
override def batchType(): Convention.BatchType = BackendsApiManager.getSettings.primaryBatchType
387387

388-
override def rowType0(): Convention.RowType = Convention.RowType.None
388+
override def rowType(): Convention.RowType = Convention.RowType.None
389389

390390
final override def doExecute(): RDD[InternalRow] = {
391391
throw new UnsupportedOperationException(

backends-velox/src/main/scala/org/apache/gluten/execution/ColumnarPartialProjectExec.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ case class ColumnarPartialProjectExec(projectList: Seq[Expression], child: Spark
8787

8888
override def batchType(): Convention.BatchType = BackendsApiManager.getSettings.primaryBatchType
8989

90-
override def rowType0(): Convention.RowType = Convention.RowType.None
90+
override def rowType(): Convention.RowType = Convention.RowType.None
9191

9292
final override def doExecute(): RDD[InternalRow] = {
9393
throw new UnsupportedOperationException(

backends-velox/src/main/scala/org/apache/gluten/execution/GpuResizeBufferColumnarBatchExec.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,5 +64,5 @@ case class GpuResizeBufferColumnarBatchExec(override val child: SparkPlan, minOu
6464

6565
override def batchType(): Convention.BatchType = VeloxBatchType
6666

67-
override def rowType0(): Convention.RowType = Convention.RowType.None
67+
override def rowType(): Convention.RowType = Convention.RowType.None
6868
}

backends-velox/src/main/scala/org/apache/gluten/execution/VeloxColumnarToCarrierRowExec.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import org.apache.spark.sql.execution.SparkPlan
2424
case class VeloxColumnarToCarrierRowExec(override val child: SparkPlan)
2525
extends ColumnarToCarrierRowExecBase {
2626
override protected def fromBatchType(): Convention.BatchType = VeloxBatchType
27-
override def rowType0(): Convention.RowType = VeloxCarrierRowType
27+
override def rowType(): Convention.RowType = VeloxCarrierRowType
2828
override protected def withNewChildInternal(newChild: SparkPlan): SparkPlan =
2929
copy(child = newChild)
3030
}

backends-velox/src/main/scala/org/apache/gluten/execution/VeloxResizeBatchesExec.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,5 +61,5 @@ case class VeloxResizeBatchesExec(
6161

6262
override def batchType(): Convention.BatchType = VeloxBatchType
6363

64-
override def rowType0(): Convention.RowType = Convention.RowType.None
64+
override def rowType(): Convention.RowType = Convention.RowType.None
6565
}

0 commit comments

Comments
 (0)