You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by xi...@apache.org on 2021/08/24 07:32:29 UTC
[iotdb] 01/01: Fix time partition desc bug
This is an automated email from the ASF dual-hosted git repository.
xiangweiwei pushed a commit to branch timePartitionDesc
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 8e228da3338aa098ea61c369c41264713a77f01f
Author: Alima777 <wx...@gmail.com>
AuthorDate: Tue Aug 24 15:31:38 2021 +0800
Fix time partition desc bug
---
.../compaction/level/LevelCompactionTsFileManagement.java | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/compaction/level/LevelCompactionTsFileManagement.java b/server/src/main/java/org/apache/iotdb/db/engine/compaction/level/LevelCompactionTsFileManagement.java
index 3a6363a..6725b17 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/compaction/level/LevelCompactionTsFileManagement.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/compaction/level/LevelCompactionTsFileManagement.java
@@ -43,13 +43,13 @@ import java.io.IOException;
import java.nio.file.Files;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.SortedSet;
+import java.util.TreeMap;
import java.util.TreeSet;
import static org.apache.iotdb.db.engine.compaction.utils.CompactionLogger.COMPACTION_LOG_NAME;
@@ -74,10 +74,14 @@ public class LevelCompactionTsFileManagement extends TsFileManagement {
private final boolean enableUnseqCompaction =
IoTDBDescriptor.getInstance().getConfig().isEnableUnseqCompaction();
- // First map is partition list; Second list is level list; Third list is file list in level;
+ /**
+ * Long -> partition list. Use treemap to keep the small partition in front.
+ * List<SortedSet<TsFileResource>> -> File level list<file list in each level>
+ */
private final Map<Long, List<SortedSet<TsFileResource>>> sequenceTsFileResources =
- new HashMap<>();
- private final Map<Long, List<List<TsFileResource>>> unSequenceTsFileResources = new HashMap<>();
+ new TreeMap<>();
+
+ private final Map<Long, List<List<TsFileResource>>> unSequenceTsFileResources = new TreeMap<>();
private final List<List<TsFileResource>> forkedSequenceTsFileResources = new ArrayList<>();
private final List<List<TsFileResource>> forkedUnSequenceTsFileResources = new ArrayList<>();
private final List<TsFileResource> sequenceRecoverTsFileResources = new ArrayList<>();