From 35d7dc68fb5daac57638786ba9ca195355cc64b2 Mon Sep 17 00:00:00 2001 From: zml1206 Date: Fri, 13 Mar 2026 10:21:07 +0800 Subject: [PATCH 1/2] [CORE] Fix AssertNotNull mapping [CORE] Fix AssertNotNull mapping --- .../gluten/backendsapi/velox/VeloxSparkPlanExecApi.scala | 4 +++- .../org/apache/gluten/expression/ExpressionMappings.scala | 2 -- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/backends-velox/src/main/scala/org/apache/gluten/backendsapi/velox/VeloxSparkPlanExecApi.scala b/backends-velox/src/main/scala/org/apache/gluten/backendsapi/velox/VeloxSparkPlanExecApi.scala index 338bef20dfe5..877ab011e424 100644 --- a/backends-velox/src/main/scala/org/apache/gluten/backendsapi/velox/VeloxSparkPlanExecApi.scala +++ b/backends-velox/src/main/scala/org/apache/gluten/backendsapi/velox/VeloxSparkPlanExecApi.scala @@ -21,6 +21,7 @@ import org.apache.gluten.config.{GlutenConfig, HashShuffleWriterType, ReservedKe import org.apache.gluten.exception.{GlutenExceptionUtil, GlutenNotSupportException} import org.apache.gluten.execution._ import org.apache.gluten.expression._ +import org.apache.gluten.expression.ExpressionNames.ASSERT_NOT_NULL import org.apache.gluten.expression.aggregate.{HLLAdapter, VeloxBloomFilterAggregate, VeloxCollectList, VeloxCollectSet} import org.apache.gluten.extension.JoinKeysTag import org.apache.gluten.extension.columnar.FallbackTags @@ -40,7 +41,7 @@ import org.apache.spark.sql.catalyst.catalog.BucketSpec import org.apache.spark.sql.catalyst.catalog.CatalogTypes.TablePartitionSpec import org.apache.spark.sql.catalyst.expressions._ import org.apache.spark.sql.catalyst.expressions.aggregate.{AggregateExpression, CollectList, CollectSet} -import org.apache.spark.sql.catalyst.expressions.objects.StaticInvoke +import org.apache.spark.sql.catalyst.expressions.objects.{AssertNotNull, StaticInvoke} import org.apache.spark.sql.catalyst.optimizer.BuildSide import org.apache.spark.sql.catalyst.plans.JoinType import org.apache.spark.sql.catalyst.plans.physical._ @@ -1094,6 +1095,7 @@ class VeloxSparkPlanExecApi extends SparkPlanExecApi with Logging { Sig[VeloxBloomFilterMightContain](ExpressionNames.MIGHT_CONTAIN), Sig[VeloxBloomFilterAggregate](ExpressionNames.BLOOM_FILTER_AGG), Sig[MapFilter](ExpressionNames.MAP_FILTER), + Sig[AssertNotNull](ASSERT_NOT_NULL), // For test purpose. Sig[VeloxDummyExpression](VeloxDummyExpression.VELOX_DUMMY_EXPRESSION) ) diff --git a/gluten-substrait/src/main/scala/org/apache/gluten/expression/ExpressionMappings.scala b/gluten-substrait/src/main/scala/org/apache/gluten/expression/ExpressionMappings.scala index 77ad2dde0943..b13aced2a62c 100644 --- a/gluten-substrait/src/main/scala/org/apache/gluten/expression/ExpressionMappings.scala +++ b/gluten-substrait/src/main/scala/org/apache/gluten/expression/ExpressionMappings.scala @@ -23,7 +23,6 @@ import org.apache.gluten.sql.shims.SparkShimLoader import org.apache.spark.sql.catalyst.expressions._ import org.apache.spark.sql.catalyst.expressions.aggregate._ -import org.apache.spark.sql.catalyst.expressions.objects.AssertNotNull import org.apache.spark.sql.catalyst.optimizer.NormalizeNaNAndZero import org.apache.spark.sql.execution.ScalarSubquery @@ -295,7 +294,6 @@ object ExpressionMappings { Sig[WidthBucket](WIDTH_BUCKET), Sig[ReplicateRows](REPLICATE_ROWS), Sig[RaiseError](RAISE_ERROR), - Sig[AssertNotNull](ASSERT_NOT_NULL), Sig[SparkVersion](VERSION), // Decimal Sig[UnscaledValue](UNSCALED_VALUE), From 06fa35be717418fada3f24ed2b439e53f556ba84 Mon Sep 17 00:00:00 2001 From: zml1206 Date: Fri, 13 Mar 2026 10:27:26 +0800 Subject: [PATCH 2/2] update --- .../gluten/backendsapi/velox/VeloxSparkPlanExecApi.scala | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/backends-velox/src/main/scala/org/apache/gluten/backendsapi/velox/VeloxSparkPlanExecApi.scala b/backends-velox/src/main/scala/org/apache/gluten/backendsapi/velox/VeloxSparkPlanExecApi.scala index 877ab011e424..08b996409495 100644 --- a/backends-velox/src/main/scala/org/apache/gluten/backendsapi/velox/VeloxSparkPlanExecApi.scala +++ b/backends-velox/src/main/scala/org/apache/gluten/backendsapi/velox/VeloxSparkPlanExecApi.scala @@ -21,7 +21,6 @@ import org.apache.gluten.config.{GlutenConfig, HashShuffleWriterType, ReservedKe import org.apache.gluten.exception.{GlutenExceptionUtil, GlutenNotSupportException} import org.apache.gluten.execution._ import org.apache.gluten.expression._ -import org.apache.gluten.expression.ExpressionNames.ASSERT_NOT_NULL import org.apache.gluten.expression.aggregate.{HLLAdapter, VeloxBloomFilterAggregate, VeloxCollectList, VeloxCollectSet} import org.apache.gluten.extension.JoinKeysTag import org.apache.gluten.extension.columnar.FallbackTags @@ -1095,7 +1094,7 @@ class VeloxSparkPlanExecApi extends SparkPlanExecApi with Logging { Sig[VeloxBloomFilterMightContain](ExpressionNames.MIGHT_CONTAIN), Sig[VeloxBloomFilterAggregate](ExpressionNames.BLOOM_FILTER_AGG), Sig[MapFilter](ExpressionNames.MAP_FILTER), - Sig[AssertNotNull](ASSERT_NOT_NULL), + Sig[AssertNotNull](ExpressionNames.ASSERT_NOT_NULL), // For test purpose. Sig[VeloxDummyExpression](VeloxDummyExpression.VELOX_DUMMY_EXPRESSION) )