From e59945530c49e751e44198cd2595069b53a68758 Mon Sep 17 00:00:00 2001 From: Yuming Wang Date: Thu, 28 Mar 2024 11:24:31 +0800 Subject: [PATCH] fix conflict --- .../sql/comet/execution/shuffle/CometShuffleExchangeExec.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spark/src/main/scala/org/apache/spark/sql/comet/execution/shuffle/CometShuffleExchangeExec.scala b/spark/src/main/scala/org/apache/spark/sql/comet/execution/shuffle/CometShuffleExchangeExec.scala index 851491939..213954bf5 100644 --- a/spark/src/main/scala/org/apache/spark/sql/comet/execution/shuffle/CometShuffleExchangeExec.scala +++ b/spark/src/main/scala/org/apache/spark/sql/comet/execution/shuffle/CometShuffleExchangeExec.scala @@ -38,6 +38,7 @@ import org.apache.spark.sql.catalyst.expressions.{Attribute, BoundReference, Uns import org.apache.spark.sql.catalyst.expressions.codegen.LazilyGeneratedOrdering import org.apache.spark.sql.catalyst.plans.logical.Statistics import org.apache.spark.sql.catalyst.plans.physical._ +import org.apache.spark.sql.catalyst.types.DataTypeUtils import org.apache.spark.sql.comet.{CometExec, CometMetricNode, CometPlan} import org.apache.spark.sql.execution._ import org.apache.spark.sql.execution.exchange.{ENSURE_REQUIREMENTS, ShuffleExchangeLike, ShuffleOrigin} @@ -55,7 +56,6 @@ import org.apache.comet.serde.{OperatorOuterClass, PartitioningOuterClass, Query import org.apache.comet.serde.OperatorOuterClass.Operator import org.apache.comet.serde.QueryPlanSerde.serializeDataType import org.apache.comet.shims.ShimCometShuffleExchangeExec -import org.apache.spark.sql.catalyst.types.DataTypeUtils /** * Performs a shuffle that will result in the desired partitioning.