fix NPE issue

apache · Aug 13, 2024 · 15b9b94 · 15b9b94
1 parent 1e5a7c9
commit 15b9b94
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/gluten-core/src/main/scala/org/apache/gluten/expression/AggregateFunctionsBuilder.scala b/gluten-core/src/main/scala/org/apache/gluten/expression/AggregateFunctionsBuilder.scala
@@ -31,7 +31,8 @@ object AggregateFunctionsBuilder {
     // First handle the custom aggregate functions
     val (substraitAggFuncName, inputTypes) =
       if (
-        ExpressionMappings.expressionExtensionTransformer.extensionExpressionsMapping.contains(
+        ExpressionMappings.expressionExtensionTransformer != null &&
+          ExpressionMappings.expressionExtensionTransformer.extensionExpressionsMapping.contains(
           aggregateFunc.getClass)
       ) {
         val (substraitAggFuncName, inputTypes) =

diff --git a/gluten-core/src/main/scala/org/apache/gluten/expression/ExpressionConverter.scala b/gluten-core/src/main/scala/org/apache/gluten/expression/ExpressionConverter.scala
@@ -155,8 +155,9 @@ object ExpressionConverter extends SQLConfHelper with Logging {
 
     expr match {
       case extendedExpr
-          if ExpressionMappings.expressionExtensionTransformer.extensionExpressionsMapping.contains(
-            extendedExpr.getClass) =>
+          if ExpressionMappings.expressionExtensionTransformer != null
+            && ExpressionMappings.expressionExtensionTransformer.extensionExpressionsMapping
+              .contains(extendedExpr.getClass) =>
         // Use extended expression transformer to replace custom expression first
         ExpressionMappings.expressionExtensionTransformer
           .replaceWithExtensionExpressionTransformer(substraitExprName, extendedExpr, attributeSeq)

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
@@ -338,8 +338,11 @@ object ExpressionMappings {
 
   def expressionsMap: Map[Class[_], String] = {
     val blacklist = GlutenConfig.getConf.expressionBlacklist
-    val supportedExprs = defaultExpressionsMap ++
-      expressionExtensionTransformer.extensionExpressionsMapping
+
+    var supportedExprs = defaultExpressionsMap
+    if (expressionExtensionTransformer != null) {
+      supportedExprs = supportedExprs ++ expressionExtensionTransformer.extensionExpressionsMapping
+    }
     if (blacklist.isEmpty) {
       supportedExprs
     } else {