You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by hu...@apache.org on 2022/06/01 08:25:17 UTC
[iotdb] 01/01: bug fix
This is an automated email from the ASF dual-hosted git repository.
hui pushed a commit to branch IOTDB-3340
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit a7543a1ad1ec64bc8d873fc91ec7e7f7cb0122e5
Author: Minghui Liu <li...@foxmail.com>
AuthorDate: Wed Jun 1 16:24:48 2022 +0800
bug fix
---
.../iotdb/db/mpp/plan/expression/multi/FunctionExpression.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/expression/multi/FunctionExpression.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/expression/multi/FunctionExpression.java
index 61a2b45dbf..a004ecaeaf 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/expression/multi/FunctionExpression.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/expression/multi/FunctionExpression.java
@@ -55,6 +55,7 @@ import java.io.IOException;
import java.nio.ByteBuffer;
import java.time.ZoneId;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
@@ -116,7 +117,11 @@ public class FunctionExpression extends Expression {
public FunctionExpression(ByteBuffer byteBuffer) {
functionName = ReadWriteIOUtils.readString(byteBuffer);
- functionAttributes = ReadWriteIOUtils.readMap(byteBuffer);
+
+ Map<String, String> deserializedFunctionAttributes = ReadWriteIOUtils.readMap(byteBuffer);
+ functionAttributes =
+ deserializedFunctionAttributes != null ? deserializedFunctionAttributes : new HashMap<>();
+
int expressionSize = ReadWriteIOUtils.readInt(byteBuffer);
List<Expression> expressions = new ArrayList<>();
for (int i = 0; i < expressionSize; i++) {