fix statistics

apache · Oct 18, 2024 · 45e3af3 · 45e3af3
1 parent dbb71d6
commit 45e3af3
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 8 deletions.
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
@@ -632,7 +632,7 @@ public class IoTDBConfig {
   private long cacheFileReaderClearPeriod = 100000;
 
   /** the max executing time of query in ms. Unit: millisecond */
-  private long queryTimeoutThreshold = 60000000;
+  private long queryTimeoutThreshold = 60000;
 
   /** the max time to live of a session in ms. Unit: millisecond */
   private int sessionTimeoutThreshold = 0;

diff --git a/...iotdb/db/queryengine/execution/operator/source/relational/aggregation/AvgAccumulator.java b/...iotdb/db/queryengine/execution/operator/source/relational/aggregation/AvgAccumulator.java
@@ -138,7 +138,7 @@ public boolean hasFinalResult() {
 
   @Override
   public void addStatistics(Statistics[] statistics) {
-    if (statistics == null) {
+    if (statistics == null || statistics[0] == null) {
       return;
     }
     initResult = true;

diff --git a/...tdb/db/queryengine/execution/operator/source/relational/aggregation/CountAccumulator.java b/...tdb/db/queryengine/execution/operator/source/relational/aggregation/CountAccumulator.java
@@ -82,9 +82,10 @@ public boolean hasFinalResult() {
 
   @Override
   public void addStatistics(Statistics[] statistics) {
-    if (statistics[0] == null) {
+    if (statistics == null || statistics[0] == null) {
       return;
     }
+
     countState += statistics[0].getCount();
   }
 

diff --git a/...tdb/db/queryengine/execution/operator/source/relational/aggregation/FirstAccumulator.java b/...tdb/db/queryengine/execution/operator/source/relational/aggregation/FirstAccumulator.java
@@ -201,7 +201,7 @@ public boolean hasFinalResult() {
 
   @Override
   public void addStatistics(Statistics[] statistics) {
-    if (statistics[0] == null) {
+    if (statistics == null || statistics[0] == null) {
       return;
     }
     switch (seriesDataType) {

diff --git a/...otdb/db/queryengine/execution/operator/source/relational/aggregation/LastAccumulator.java b/...otdb/db/queryengine/execution/operator/source/relational/aggregation/LastAccumulator.java
@@ -201,9 +201,10 @@ public boolean hasFinalResult() {
 
   @Override
   public void addStatistics(Statistics[] statistics) {
-    if (statistics[0] == null) {
+    if (statistics == null || statistics[0] == null) {
       return;
     }
+
     switch (seriesDataType) {
       case INT32:
       case DATE:

diff --git a/...iotdb/db/queryengine/execution/operator/source/relational/aggregation/MaxAccumulator.java b/...iotdb/db/queryengine/execution/operator/source/relational/aggregation/MaxAccumulator.java
@@ -200,7 +200,7 @@ public boolean hasFinalResult() {
 
   @Override
   public void addStatistics(Statistics[] statistics) {
-    if (statistics[0] == null) {
+    if (statistics == null || statistics[0] == null) {
       return;
     }
     switch (seriesDataType) {

diff --git a/...iotdb/db/queryengine/execution/operator/source/relational/aggregation/MinAccumulator.java b/...iotdb/db/queryengine/execution/operator/source/relational/aggregation/MinAccumulator.java
@@ -200,7 +200,7 @@ public boolean hasFinalResult() {
 
   @Override
   public void addStatistics(Statistics[] statistics) {
-    if (statistics[0] == null) {
+    if (statistics == null || statistics[0] == null) {
       return;
     }
     switch (seriesDataType) {

diff --git a/...iotdb/db/queryengine/execution/operator/source/relational/aggregation/SumAccumulator.java b/...iotdb/db/queryengine/execution/operator/source/relational/aggregation/SumAccumulator.java
@@ -114,9 +114,10 @@ public boolean hasFinalResult() {
 
   @Override
   public void addStatistics(Statistics[] statistics) {
-    if (statistics == null) {
+    if (statistics == null || statistics[0] == null) {
       return;
     }
+
     initResult = true;
     if (statistics[0] instanceof IntegerStatistics) {
       sumValue += statistics[0].getSumLongValue();