fixup

apache · Nov 26, 2024 · 20aae2f · 20aae2f
1 parent 1321f08
commit 20aae2f
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 10 deletions.
diff --git a/gluten-substrait/src/main/scala/org/apache/gluten/execution/ColumnarToRowExecBase.scala b/gluten-substrait/src/main/scala/org/apache/gluten/execution/ColumnarToRowExecBase.scala
@@ -46,6 +46,12 @@ abstract class ColumnarToRowExecBase(child: SparkPlan)
 
   override def rowType0(): Convention.RowType = Convention.RowType.VanillaRow
 
+  override def requiredChildConvention(): Seq[ConventionReq] = {
+    List(
+      ConventionReq.ofBatch(
+        ConventionReq.BatchType.Is(BackendsApiManager.getSettings.primaryBatchType)))
+  }
+
   override def doExecuteBroadcast[T](): Broadcast[T] = {
     // Require for explicit implementation, otherwise throw error.
     super.doExecuteBroadcast[T]()
@@ -56,10 +62,4 @@ abstract class ColumnarToRowExecBase(child: SparkPlan)
   override def doExecute(): RDD[InternalRow] = {
     doExecuteInternal()
   }
-
-  override def requiredChildConvention(): Seq[ConventionReq] = {
-    List(
-      ConventionReq.ofBatch(
-        ConventionReq.BatchType.Is(BackendsApiManager.getSettings.primaryBatchType)))
-  }
 }
diff --git a/gluten-substrait/src/main/scala/org/apache/gluten/execution/RowToColumnarExecBase.scala b/gluten-substrait/src/main/scala/org/apache/gluten/execution/RowToColumnarExecBase.scala
@@ -17,7 +17,7 @@
 package org.apache.gluten.execution
 
 import org.apache.gluten.backendsapi.BackendsApiManager
-import org.apache.gluten.extension.columnar.transition.Convention
+import org.apache.gluten.extension.columnar.transition.{Convention, ConventionReq}
 
 import org.apache.spark.broadcast
 import org.apache.spark.rdd.RDD
@@ -49,6 +49,10 @@ abstract class RowToColumnarExecBase(child: SparkPlan)
 
   override def rowType0(): Convention.RowType = Convention.RowType.None
 
+  override def requiredChildConvention(): Seq[ConventionReq] = {
+    Seq(ConventionReq.row)
+  }
+
   final override def doExecute(): RDD[InternalRow] = {
     child.execute()
   }

diff --git a/gluten-substrait/src/main/scala/org/apache/spark/sql/execution/ColumnarWriteFilesExec.scala b/gluten-substrait/src/main/scala/org/apache/spark/sql/execution/ColumnarWriteFilesExec.scala
@@ -51,9 +51,12 @@ abstract class ColumnarWriteFilesExec protected (
   override lazy val references: AttributeSet = AttributeSet.empty
 
   override def requiredChildConvention(): Seq[ConventionReq] = {
-    List(
-      ConventionReq.ofBatch(
-        ConventionReq.BatchType.Is(BackendsApiManager.getSettings.primaryBatchType)))
+    val req = ConventionReq.ofBatch(
+      ConventionReq.BatchType.Is(BackendsApiManager.getSettings.primaryBatchType))
+    Seq.tabulate(2)(
+      _ => {
+        req
+      })
   }
 
   /**