From 1fc362a645a9dd5fc2130c06982e40e2dbb9d883 Mon Sep 17 00:00:00 2001 From: Hongze Zhang Date: Mon, 16 Jun 2025 09:00:13 +0200 Subject: [PATCH 1/2] [SPARK-52484] Remove child.supportsColumnar assertion in ColumnarToRowExec --- .../main/scala/org/apache/spark/sql/execution/Columnar.scala | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/Columnar.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/Columnar.scala index 4c9ae155ec17a..85ed1a24fc6eb 100644 --- a/sql/core/src/main/scala/org/apache/spark/sql/execution/Columnar.scala +++ b/sql/core/src/main/scala/org/apache/spark/sql/execution/Columnar.scala @@ -32,7 +32,6 @@ import org.apache.spark.sql.execution.metric.{SQLMetric, SQLMetrics} import org.apache.spark.sql.execution.vectorized.WritableColumnVector import org.apache.spark.sql.types._ import org.apache.spark.sql.vectorized.{ColumnarBatch, ColumnVector} -import org.apache.spark.util.Utils /** * Holds a user defined rule that can be used to inject columnar implementations of various @@ -66,9 +65,6 @@ trait ColumnarToRowTransition extends UnaryExecNode * [[MapPartitionsInRWithArrowExec]]. Eventually this should replace those implementations. */ case class ColumnarToRowExec(child: SparkPlan) extends ColumnarToRowTransition with CodegenSupport { - // supportsColumnar requires to be only called on driver side, see also SPARK-37779. - assert(Utils.isInRunningSparkTask || child.supportsColumnar) - override def output: Seq[Attribute] = child.output override def outputPartitioning: Partitioning = child.outputPartitioning From 7c9c49cec8110d8d0c814343084cf4de60bc5de6 Mon Sep 17 00:00:00 2001 From: Hongze Zhang Date: Mon, 16 Jun 2025 09:30:04 +0200 Subject: [PATCH 2/2] empty