[incubator-iotdb] branch rel/0.8 updated: cherry pick [IOTDB-317] Fix flush + wrong aggregation causes failed query in v0.8.x

[hx...@apache.org]

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

hxd pushed a commit to branch rel/0.8
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git


The following commit(s) were added to refs/heads/rel/0.8 by this push:
     new 9c3dbca  cherry pick [IOTDB-317] Fix flush + wrong aggregation causes failed query in v0.8.x
9c3dbca is described below

commit 9c3dbca510a8942491dae9a82fbf006c571c257d
Author: Zesong Sun <sz...@mails.tsinghua.edu.cn>
AuthorDate: Thu Nov 28 15:37:55 2019 +0800

    cherry pick [IOTDB-317] Fix flush + wrong aggregation causes failed query in v0.8.x
---
 RELEASE_NOTES.md                                                       | 1 +
 .../org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java | 1 -
 server/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java    | 3 +--
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 39e3d30..e3633e4 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -24,6 +24,7 @@
 This is a bug-fix version of 0.8.1
 
 - [IOTDB-264] lack checking datatype before writing WAL
+- [IOTDB-317] Fix "flush + wrong aggregation" causes failed query in v0.8.x
 - NOTICE and LICENSE file update
 
 # Apache IoTDB (incubating) 0.8.1
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java
index 5d5f129..4b3a221 100755
--- a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java
@@ -424,7 +424,6 @@ public class StorageGroupProcessor {
       } catch (InterruptedException e) {
         logger.error("CloseFileNodeCondition error occurs while waiting for closing the storage "
             + "group {}", storageGroupName, e);
-        Thread.currentThread().interrupt();
       }
     }
   }
diff --git a/server/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java b/server/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java
index 4aa0a9e..3ac7ff3 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/TSServiceImpl.java
@@ -308,9 +308,8 @@ public class TSServiceImpl implements TSIService.Iface, ServerContext {
       }
     } catch (PathErrorException | MetadataErrorException | OutOfMemoryError e) {
       logger
-          .error(String.format("Failed to fetch timeseries %s's metadata", req.getColumnPath()),
+          .error(String.format("Failed to fetch timeseries %s's metadata", req.getColumnPath(), e),
               e);
-      Thread.currentThread().interrupt();
       status = getErrorStatus(
           String.format("Failed to fetch metadata because: %s", e));
       resp.setStatus(status);