(incubator-gluten) branch main updated: [GLUTEN-6600]Fix NPE issue when running window query(#6803)

[kejia]

This is an automated email from the ASF dual-hosted git repository.

kejia pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-gluten.git


The following commit(s) were added to refs/heads/main by this push:
     new bf9ebd5b1 [GLUTEN-6600]Fix NPE issue when running window query(#6803)
bf9ebd5b1 is described below

commit bf9ebd5b1c69dc0e0fb1db9f9a120ee99aa93921
Author: JiaKe <ke.a....@intel.com>
AuthorDate: Wed Aug 14 14:03:53 2024 +0800

    [GLUTEN-6600]Fix NPE issue when running window query(#6803)
---
 .../src/main/scala/org/apache/gluten/GlutenPlugin.scala     | 13 +++++++++----
 .../org/apache/gluten/expression/ExpressionMappings.scala   |  5 +++--
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/gluten-core/src/main/scala/org/apache/gluten/GlutenPlugin.scala 
b/gluten-core/src/main/scala/org/apache/gluten/GlutenPlugin.scala
index 16929ca4b..dbf927909 100644
--- a/gluten-core/src/main/scala/org/apache/gluten/GlutenPlugin.scala
+++ b/gluten-core/src/main/scala/org/apache/gluten/GlutenPlugin.scala
@@ -74,10 +74,15 @@ private[gluten] class GlutenDriverPlugin extends 
DriverPlugin with Logging {
     BackendsApiManager.initialize()
     BackendsApiManager.getListenerApiInstance.onDriverStart(sc, pluginContext)
     GlutenListenerFactory.addToSparkListenerBus(sc)
-    ExpressionMappings.expressionExtensionTransformer =
-      ExpressionUtil.extendedExpressionTransformer(
-        conf.get(GlutenConfig.GLUTEN_EXTENDED_EXPRESSION_TRAN_CONF, "")
-      )
+
+    val expressionExtensionTransformer = 
ExpressionUtil.extendedExpressionTransformer(
+      conf.get(GlutenConfig.GLUTEN_EXTENDED_EXPRESSION_TRAN_CONF, "")
+    )
+
+    if (expressionExtensionTransformer != null) {
+      ExpressionMappings.expressionExtensionTransformer = 
expressionExtensionTransformer
+    }
+
     Collections.emptyMap()
   }
 
diff --git 
a/gluten-core/src/main/scala/org/apache/gluten/expression/ExpressionMappings.scala
 
b/gluten-core/src/main/scala/org/apache/gluten/expression/ExpressionMappings.scala
index e0628f111..f2bb4a906 100644
--- 
a/gluten-core/src/main/scala/org/apache/gluten/expression/ExpressionMappings.scala
+++ 
b/gluten-core/src/main/scala/org/apache/gluten/expression/ExpressionMappings.scala
@@ -19,7 +19,7 @@ package org.apache.gluten.expression
 import org.apache.gluten.GlutenConfig
 import org.apache.gluten.backendsapi.BackendsApiManager
 import org.apache.gluten.expression.ExpressionNames._
-import org.apache.gluten.extension.ExpressionExtensionTrait
+import org.apache.gluten.extension.{DefaultExpressionExtensionTransformer, 
ExpressionExtensionTrait}
 import org.apache.gluten.sql.shims.SparkShimLoader
 
 import org.apache.spark.sql.catalyst.expressions._
@@ -354,5 +354,6 @@ object ExpressionMappings {
       .toMap[Class[_], String]
   }
 
-  var expressionExtensionTransformer: ExpressionExtensionTrait = _
+  var expressionExtensionTransformer: ExpressionExtensionTrait =
+    DefaultExpressionExtensionTransformer()
 }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@gluten.apache.org
For additional commands, e-mail: commits-h...@gluten.apache.org