This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch rel/0.12
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/rel/0.12 by this push:
new 503ddb9 [To rel/0.12][IOTDB-1879] Fix some Unsequence files never be
merged to higher level or Sequence folder (#4219)
503ddb9 is described below
commit 503ddb92fbeb52b9ca4bcddd8567540c4ba974d7
Author: liuxuxin <[email protected]>
AuthorDate: Thu Oct 28 22:03:52 2021 +0800
[To rel/0.12][IOTDB-1879] Fix some Unsequence files never be merged to
higher level or Sequence folder (#4219)
---
RELEASE_NOTES.md | 1 +
.../compaction/level/LevelCompactionTsFileManagement.java | 11 -----------
.../java/org/apache/iotdb/db/engine/merge/task/MergeTask.java | 6 +++---
3 files changed, 4 insertions(+), 14 deletions(-)
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index efff62f..5818af8 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -59,6 +59,7 @@
* [IOTDB-1838] The compacting status in SGP is always false
* [IOTDB-1846]Fix the error when count the total number of devices in cluster
mode
* [IOTDB-1850] Fix deserialize page merge rate limiter
+* [IOTDB-1879] Fix some Unsequence files never be merged to higher level or
Sequence folder
* [ISSUE-3945] Fix Fuzzy query not support multiDevices and alignByDevice
Dataset
* fix merge ClassCastException: MeasurementMNode
* change sync version check to major version
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 a85b8fa..644eec1 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
@@ -617,17 +617,6 @@ public class LevelCompactionTsFileManagement extends
TsFileManagement {
if (enableUnseqCompaction && !sequence && i == currMaxLevel - 2) {
// do not merge current unseq file level to upper level and just
merge all of them to
// seq file
- compactionSelectionLock.lock();
- try {
- if (!checkAndSetFilesMergingIfNotSet(
- getTsFileListByTimePartition(true, timePartition),
mergeResources.get(i))) {
- // if any of the source file is being merged
- // end the selection
- return false;
- }
- } finally {
- compactionSelectionLock.unlock();
- }
isSeqMerging = false;
isMergeExecutedInCurrentTask =
merge(
diff --git
a/server/src/main/java/org/apache/iotdb/db/engine/merge/task/MergeTask.java
b/server/src/main/java/org/apache/iotdb/db/engine/merge/task/MergeTask.java
index 1fb5f39..11bc8a5 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/merge/task/MergeTask.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/merge/task/MergeTask.java
@@ -133,10 +133,10 @@ public class MergeTask implements Callable<Void> {
}
if (logger.isInfoEnabled()) {
logger.info(
- "{} starts to merge {} seqFiles, {} unseqFiles",
+ "{} starts to merge seqFiles: {}, unseqFiles: {}",
taskName,
- resource.getSeqFiles().size(),
- resource.getUnseqFiles().size());
+ resource.getSeqFiles(),
+ resource.getUnseqFiles());
}
long startTime = System.currentTimeMillis();
long totalFileSize =
