You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by qi...@apache.org on 2021/06/04 06:49:04 UTC
[iotdb] branch remove_clear_compaction_status_0.11 created (now
b5b61fb)
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a change to branch remove_clear_compaction_status_0.11
in repository https://gitbox.apache.org/repos/asf/iotdb.git.
at b5b61fb remove redundant clearCompactionStatus
This branch includes the following new commits:
new b5b61fb remove redundant clearCompactionStatus
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[iotdb] 01/01: remove redundant clearCompactionStatus
Posted by qi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch remove_clear_compaction_status_0.11
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit b5b61fb6e8ecedeabde742de92dd0e407863b7d5
Author: qiaojialin <64...@qq.com>
AuthorDate: Fri Jun 4 14:48:27 2021 +0800
remove redundant clearCompactionStatus
---
.../iotdb/db/engine/compaction/TsFileManagement.java | 7 ++-----
.../db/engine/storagegroup/StorageGroupProcessor.java | 2 +-
.../db/engine/compaction/LevelCompactionCacheTest.java | 9 ++++-----
.../db/engine/compaction/LevelCompactionLogTest.java | 6 +++---
.../db/engine/compaction/LevelCompactionMergeTest.java | 16 ++++++++--------
.../engine/compaction/LevelCompactionMoreDataTest.java | 8 ++++----
.../compaction/NoCompactionTsFileManagementTest.java | 8 ++++----
7 files changed, 26 insertions(+), 30 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/compaction/TsFileManagement.java b/server/src/main/java/org/apache/iotdb/db/engine/compaction/TsFileManagement.java
index db611dc..339ac27 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/compaction/TsFileManagement.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/compaction/TsFileManagement.java
@@ -152,23 +152,20 @@ public abstract class TsFileManagement {
protected abstract void merge(long timePartition);
- public class CompactionMergeTask extends StorageGroupCompactionTask {
+ public class CompactionOnePartitionUtil {
private CloseCompactionMergeCallBack closeCompactionMergeCallBack;
private long timePartitionId;
- public CompactionMergeTask(
+ public CompactionOnePartitionUtil(
CloseCompactionMergeCallBack closeCompactionMergeCallBack, long timePartitionId) {
- super(storageGroupName);
this.closeCompactionMergeCallBack = closeCompactionMergeCallBack;
this.timePartitionId = timePartitionId;
}
- @Override
public void run() {
merge(timePartitionId);
closeCompactionMergeCallBack.call(isMergeExecutedInCurrentTask, timePartitionId);
- clearCompactionStatus();
}
}
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 00128d3..1ce64d3 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
@@ -1890,7 +1890,7 @@ public class StorageGroupProcessor {
// fork and filter current tsfile, then commit then to compaction merge
tsFileManagement.forkCurrentFileList(timePartition);
tsFileManagement.setForceFullMerge(fullMerge);
- tsFileManagement.new CompactionMergeTask(this::closeCompactionMergeCallBack, timePartition)
+ tsFileManagement.new CompactionOnePartitionUtil(this::closeCompactionMergeCallBack, timePartition)
.run();
} catch (IOException e) {
this.closeCompactionMergeCallBack(false, timePartition);
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/compaction/LevelCompactionCacheTest.java b/server/src/test/java/org/apache/iotdb/db/engine/compaction/LevelCompactionCacheTest.java
index 9c581cf..4ec4dc0 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/compaction/LevelCompactionCacheTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/compaction/LevelCompactionCacheTest.java
@@ -19,12 +19,11 @@
package org.apache.iotdb.db.engine.compaction;
-import java.util.concurrent.ConcurrentHashMap;
import org.apache.iotdb.db.constant.TestConstant;
import org.apache.iotdb.db.engine.cache.ChunkCache;
import org.apache.iotdb.db.engine.cache.TimeSeriesMetadataCache;
import org.apache.iotdb.db.engine.cache.TimeSeriesMetadataCache.TimeSeriesMetadataCacheKey;
-import org.apache.iotdb.db.engine.compaction.TsFileManagement.CompactionMergeTask;
+import org.apache.iotdb.db.engine.compaction.TsFileManagement.CompactionOnePartitionUtil;
import org.apache.iotdb.db.engine.compaction.level.LevelCompactionTsFileManagement;
import org.apache.iotdb.db.engine.storagegroup.TsFileResource;
import org.apache.iotdb.db.exception.StorageEngineException;
@@ -94,11 +93,11 @@ public class LevelCompactionCacheTest extends LevelCompactionTest {
levelCompactionTsFileManagement.addAll(seqResources, true);
levelCompactionTsFileManagement.addAll(unseqResources, false);
levelCompactionTsFileManagement.forkCurrentFileList(0);
- CompactionMergeTask compactionMergeTask =
+ CompactionOnePartitionUtil compactionOnePartitionUtil =
levelCompactionTsFileManagement
- .new CompactionMergeTask(this::closeCompactionMergeCallBack, 0);
+ .new CompactionOnePartitionUtil(this::closeCompactionMergeCallBack, 0);
compactionMergeWorking = true;
- compactionMergeTask.run();
+ compactionOnePartitionUtil.run();
while (compactionMergeWorking) {
// wait
}
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/compaction/LevelCompactionLogTest.java b/server/src/test/java/org/apache/iotdb/db/engine/compaction/LevelCompactionLogTest.java
index 8bb4e9c..020a485 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/compaction/LevelCompactionLogTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/compaction/LevelCompactionLogTest.java
@@ -26,7 +26,7 @@ import java.io.File;
import java.io.IOException;
import org.apache.commons.io.FileUtils;
import org.apache.iotdb.db.constant.TestConstant;
-import org.apache.iotdb.db.engine.compaction.TsFileManagement.CompactionMergeTask;
+import org.apache.iotdb.db.engine.compaction.TsFileManagement.CompactionOnePartitionUtil;
import org.apache.iotdb.db.engine.compaction.level.LevelCompactionTsFileManagement;
import org.apache.iotdb.db.exception.StorageEngineException;
import org.apache.iotdb.db.exception.metadata.MetadataException;
@@ -61,10 +61,10 @@ public class LevelCompactionLogTest extends LevelCompactionTest {
levelCompactionTsFileManagement.addAll(seqResources, true);
levelCompactionTsFileManagement.addAll(unseqResources, false);
levelCompactionTsFileManagement.forkCurrentFileList(0);
- CompactionMergeTask compactionMergeTask = levelCompactionTsFileManagement.new CompactionMergeTask(
+ CompactionOnePartitionUtil compactionOnePartitionUtil = levelCompactionTsFileManagement.new CompactionOnePartitionUtil(
this::closeCompactionMergeCallBack, 0);
compactionMergeWorking = true;
- compactionMergeTask.run();
+ compactionOnePartitionUtil.run();
while (compactionMergeWorking) {
//wait
}
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/compaction/LevelCompactionMergeTest.java b/server/src/test/java/org/apache/iotdb/db/engine/compaction/LevelCompactionMergeTest.java
index 4a6632c..f687957 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/compaction/LevelCompactionMergeTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/compaction/LevelCompactionMergeTest.java
@@ -28,7 +28,7 @@ import java.util.List;
import org.apache.commons.io.FileUtils;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.constant.TestConstant;
-import org.apache.iotdb.db.engine.compaction.TsFileManagement.CompactionMergeTask;
+import org.apache.iotdb.db.engine.compaction.TsFileManagement.CompactionOnePartitionUtil;
import org.apache.iotdb.db.engine.compaction.level.LevelCompactionTsFileManagement;
import org.apache.iotdb.db.engine.modification.Deletion;
import org.apache.iotdb.db.engine.modification.Modification;
@@ -76,10 +76,10 @@ public class LevelCompactionMergeTest extends LevelCompactionTest {
levelCompactionTsFileManagement.addAll(seqResources, true);
levelCompactionTsFileManagement.addAll(unseqResources, false);
levelCompactionTsFileManagement.forkCurrentFileList(0);
- CompactionMergeTask compactionMergeTask = levelCompactionTsFileManagement.new CompactionMergeTask(
+ CompactionOnePartitionUtil compactionOnePartitionUtil = levelCompactionTsFileManagement.new CompactionOnePartitionUtil(
this::closeCompactionMergeCallBack, 0);
compactionMergeWorking = true;
- compactionMergeTask.run();
+ compactionOnePartitionUtil.run();
while (compactionMergeWorking) {
//wait
}
@@ -111,10 +111,10 @@ public class LevelCompactionMergeTest extends LevelCompactionTest {
levelCompactionTsFileManagement.addAll(seqResources, true);
levelCompactionTsFileManagement.addAll(unseqResources, false);
levelCompactionTsFileManagement.forkCurrentFileList(0);
- CompactionMergeTask compactionMergeTask = levelCompactionTsFileManagement.new CompactionMergeTask(
+ CompactionOnePartitionUtil compactionOnePartitionUtil = levelCompactionTsFileManagement.new CompactionOnePartitionUtil(
this::closeCompactionMergeCallBack, 0);
compactionMergeWorking = true;
- compactionMergeTask.run();
+ compactionOnePartitionUtil.run();
while (compactionMergeWorking) {
//wait
}
@@ -162,11 +162,11 @@ public class LevelCompactionMergeTest extends LevelCompactionTest {
levelCompactionTsFileManagement.addAll(seqResources, true);
levelCompactionTsFileManagement.addAll(unseqResources, false);
levelCompactionTsFileManagement.forkCurrentFileList(0);
- CompactionMergeTask compactionMergeTask =
+ CompactionOnePartitionUtil compactionOnePartitionUtil =
levelCompactionTsFileManagement
- .new CompactionMergeTask(this::closeCompactionMergeCallBack, 0);
+ .new CompactionOnePartitionUtil(this::closeCompactionMergeCallBack, 0);
compactionMergeWorking = true;
- compactionMergeTask.run();
+ compactionOnePartitionUtil.run();
while (compactionMergeWorking) {
// wait
}
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/compaction/LevelCompactionMoreDataTest.java b/server/src/test/java/org/apache/iotdb/db/engine/compaction/LevelCompactionMoreDataTest.java
index 565741a..be923eb 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/compaction/LevelCompactionMoreDataTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/compaction/LevelCompactionMoreDataTest.java
@@ -21,7 +21,7 @@ package org.apache.iotdb.db.engine.compaction;
import org.apache.iotdb.db.conf.IoTDBConstant;
import org.apache.iotdb.db.constant.TestConstant;
-import org.apache.iotdb.db.engine.compaction.TsFileManagement.CompactionMergeTask;
+import org.apache.iotdb.db.engine.compaction.TsFileManagement.CompactionOnePartitionUtil;
import org.apache.iotdb.db.engine.compaction.level.LevelCompactionTsFileManagement;
import org.apache.iotdb.db.engine.storagegroup.TsFileResource;
import org.apache.iotdb.db.exception.StorageEngineException;
@@ -198,11 +198,11 @@ public class LevelCompactionMoreDataTest extends LevelCompactionTest {
levelCompactionTsFileManagement.addAll(seqResources, true);
levelCompactionTsFileManagement.addAll(unseqResources, false);
levelCompactionTsFileManagement.forkCurrentFileList(0);
- CompactionMergeTask compactionMergeTask =
+ CompactionOnePartitionUtil compactionOnePartitionUtil =
levelCompactionTsFileManagement
- .new CompactionMergeTask(this::closeCompactionMergeCallBack, 0);
+ .new CompactionOnePartitionUtil(this::closeCompactionMergeCallBack, 0);
compactionMergeWorking = true;
- compactionMergeTask.run();
+ compactionOnePartitionUtil.run();
while (compactionMergeWorking) {
// wait
}
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/compaction/NoCompactionTsFileManagementTest.java b/server/src/test/java/org/apache/iotdb/db/engine/compaction/NoCompactionTsFileManagementTest.java
index e3f21f3..36b0706 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/compaction/NoCompactionTsFileManagementTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/compaction/NoCompactionTsFileManagementTest.java
@@ -29,7 +29,7 @@ import java.util.Iterator;
import org.apache.commons.io.FileUtils;
import org.apache.iotdb.db.conf.IoTDBConstant;
import org.apache.iotdb.db.constant.TestConstant;
-import org.apache.iotdb.db.engine.compaction.TsFileManagement.CompactionMergeTask;
+import org.apache.iotdb.db.engine.compaction.TsFileManagement.CompactionOnePartitionUtil;
import org.apache.iotdb.db.engine.compaction.no.NoCompactionTsFileManagement;
import org.apache.iotdb.db.engine.storagegroup.TsFileResource;
import org.apache.iotdb.db.exception.StorageEngineException;
@@ -113,11 +113,11 @@ public class NoCompactionTsFileManagementTest extends LevelCompactionTest {
+ ".tsfile"))), false);
noCompactionTsFileManagement.forkCurrentFileList(0);
noCompactionTsFileManagement.recover();
- CompactionMergeTask compactionMergeTask =
+ CompactionOnePartitionUtil compactionOnePartitionUtil =
noCompactionTsFileManagement
- .new CompactionMergeTask(
+ .new CompactionOnePartitionUtil(
(boolean isMergeExecutedInCurrentTask, long timePartitionId) -> {}, 0);
- compactionMergeTask.run();
+ compactionOnePartitionUtil.run();
assertEquals(1, noCompactionTsFileManagement.size(true));
assertEquals(1, noCompactionTsFileManagement.size(false));
noCompactionTsFileManagement.clear();