[incubator-iotdb] 01/01: Fix inserting unsequence data after upgrading

[haonan]

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

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

commit c2ede09a3f9f98fe09edc779015019744e161939
Author: HTHou <hhao...@outlook.com>
AuthorDate: Thu May 21 11:18:07 2020 +0800

    Fix inserting unsequence data after upgrading
---
 .../iotdb/db/engine/storagegroup/StorageGroupProcessor.java       | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

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 6033e40..596bede 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
@@ -1491,9 +1491,11 @@ public class StorageGroupProcessor {
     List<TsFileResource> upgradedResources = 
tsFileResource.getUpgradedResources();
     for (TsFileResource resource : upgradedResources) {
       long partitionId = resource.getTimePartition();
-      resource.getEndTimeMap().forEach((device, time) -> 
-        updateNewlyFlushedPartitionLatestFlushedTimeForEachDevice(partitionId, 
device, time)
-      );
+      partitionLatestFlushedTimeForEachDevice
+          .get(partitionId).putAll(resource.getEndTimeMap());
+      resource.getEndTimeMap().forEach((device, time) -> {
+        updateNewlyFlushedPartitionLatestFlushedTimeForEachDevice(partitionId, 
device, time);
+      });
     }
     insertLock.writeLock().lock();
     mergeLock.writeLock().lock();