You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ch...@apache.org on 2022/06/02 04:01:31 UTC

[iotdb] 01/01: fix aggregation bug

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

chaow pushed a commit to branch fix_aggregation_bug_0602
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit 538af4e2475b2aa23ffe9553ae25cf09c17a1c34
Author: chaow <94...@qq.com>
AuthorDate: Thu Jun 2 12:00:37 2022 +0800

    fix aggregation bug
---
 .../apache/iotdb/db/mpp/plan/expression/multi/FunctionExpression.java   | 2 +-
 server/src/test/resources/datanode1conf/iotdb-engine.properties         | 2 +-
 server/src/test/resources/datanode2conf/iotdb-engine.properties         | 2 +-
 server/src/test/resources/datanode3conf/iotdb-engine.properties         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

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 1befeda0b9..5841a07c00 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
@@ -124,7 +124,7 @@ public class FunctionExpression extends Expression {
             : new LinkedHashMap<>();
 
     int expressionSize = ReadWriteIOUtils.readInt(byteBuffer);
-    List<Expression> expressions = new ArrayList<>();
+    expressions = new ArrayList<>();
     for (int i = 0; i < expressionSize; i++) {
       expressions.add(Expression.deserialize(byteBuffer));
     }
diff --git a/server/src/test/resources/datanode1conf/iotdb-engine.properties b/server/src/test/resources/datanode1conf/iotdb-engine.properties
index cced42b412..0677ac9253 100644
--- a/server/src/test/resources/datanode1conf/iotdb-engine.properties
+++ b/server/src/test/resources/datanode1conf/iotdb-engine.properties
@@ -24,7 +24,7 @@ rpc_port=6667
 data_block_manager_port=8777
 internal_port=9003
 data_region_consensus_port=40010
-schema_region_consensus_port=50010
+schema_region_consensus_port=50030
 
 config_nodes=0.0.0.0:22277,0.0.0.0:22279,0.0.0.0:22281
 
diff --git a/server/src/test/resources/datanode2conf/iotdb-engine.properties b/server/src/test/resources/datanode2conf/iotdb-engine.properties
index c570d996b7..fed3086d75 100644
--- a/server/src/test/resources/datanode2conf/iotdb-engine.properties
+++ b/server/src/test/resources/datanode2conf/iotdb-engine.properties
@@ -24,7 +24,7 @@ rpc_port=6669
 data_block_manager_port=8779
 internal_port=9005
 data_region_consensus_port=40012
-schema_region_consensus_port=50012
+schema_region_consensus_port=50032
 
 config_nodes=0.0.0.0:22277,0.0.0.0:22279,0.0.0.0:22281
 
diff --git a/server/src/test/resources/datanode3conf/iotdb-engine.properties b/server/src/test/resources/datanode3conf/iotdb-engine.properties
index 956faee018..05caf287af 100644
--- a/server/src/test/resources/datanode3conf/iotdb-engine.properties
+++ b/server/src/test/resources/datanode3conf/iotdb-engine.properties
@@ -24,7 +24,7 @@ rpc_port=6671
 data_block_manager_port=8781
 internal_port=9007
 data_region_consensus_port=40014
-schema_region_consensus_port=50014
+schema_region_consensus_port=50034
 
 config_nodes=0.0.0.0:22277,0.0.0.0:22279,0.0.0.0:22281