[SCALA & JAVA] Fix ExpressionEvaluator api change null pointer issue

Signed-off-by: Chendi Xue <chendi.xue@intel.com>
oap-project · Jan 4, 2021 · 9c51360 · 9c51360
1 parent 93f8525
commit 9c51360
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/core/src/main/java/com/intel/oap/vectorized/ExpressionEvaluator.java b/core/src/main/java/com/intel/oap/vectorized/ExpressionEvaluator.java
@@ -238,6 +238,7 @@ public void close() {
   }
 
   byte[] getSchemaBytesBuf(Schema schema) throws IOException {
+    if (schema == null) return null; 
     ByteArrayOutputStream out = new ByteArrayOutputStream();
     MessageSerializer.serialize(new WriteChannel(Channels.newChannel(out)), schema);
     return out.toByteArray();

diff --git a/core/src/main/scala/org/apache/spark/sql/execution/ColumnarBroadcastExchangeExec.scala b/core/src/main/scala/org/apache/spark/sql/execution/ColumnarBroadcastExchangeExec.scala
@@ -190,7 +190,8 @@ class ColumnarBroadcastExchangeExec(mode: BroadcastMode, child: SparkPlan)
           throw e
       } finally {
         val timeout: Int = SQLConf.get.broadcastTimeout.toInt
-        relation.asInstanceOf[ColumnarHashedRelation].countDownClose(timeout)
+        if (relation != null)
+          relation.asInstanceOf[ColumnarHashedRelation].countDownClose(timeout)
       }
     }
   }