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 2022/01/22 02:03:32 UTC
[iotdb] branch master updated: [IOTDB-2464] simplify crossSpaceComapctionExceptionHandler (#4945)
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new ed816e4 [IOTDB-2464] simplify crossSpaceComapctionExceptionHandler (#4945)
ed816e4 is described below
commit ed816e440d9f1a99c96b2bb69d88bb813553448e
Author: 周沛辰 <45...@users.noreply.github.com>
AuthorDate: Sat Jan 22 10:02:55 2022 +0800
[IOTDB-2464] simplify crossSpaceComapctionExceptionHandler (#4945)
---
server/src/assembly/resources/conf/iotdb-engine.properties | 2 +-
server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java | 2 +-
.../engine/compaction/cross/CrossSpaceCompactionExceptionHandler.java | 3 ---
3 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/server/src/assembly/resources/conf/iotdb-engine.properties b/server/src/assembly/resources/conf/iotdb-engine.properties
index 1cbe7e8..2502244 100644
--- a/server/src/assembly/resources/conf/iotdb-engine.properties
+++ b/server/src/assembly/resources/conf/iotdb-engine.properties
@@ -486,7 +486,7 @@ timestamp_precision=ms
# The limit of write throughput merge can reach per second
# Datatype: int
-# compaction_write_throughput_mb_per_sec=8
+# compaction_write_throughput_mb_per_sec=30
# The maximum session idle time. unit: ms
# Idle sessions are the ones that performs neither query or non-query operations for a period of time
diff --git a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
index fac6dcd..b5009d4 100644
--- a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
+++ b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
@@ -577,7 +577,7 @@ public class IoTDBConfig {
private long mergeIntervalSec = 0L;
/** The limit of compaction merge can reach per second */
- private int compactionWriteThroughputMbPerSec = 8;
+ private int compactionWriteThroughputMbPerSec = 30;
/**
* How many thread will be set up to perform compaction, 10 by default. Set to 1 when less than or
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/compaction/cross/CrossSpaceCompactionExceptionHandler.java b/server/src/main/java/org/apache/iotdb/db/engine/compaction/cross/CrossSpaceCompactionExceptionHandler.java
index 58efc87..eb7dc80 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/compaction/cross/CrossSpaceCompactionExceptionHandler.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/compaction/cross/CrossSpaceCompactionExceptionHandler.java
@@ -159,10 +159,7 @@ public class CrossSpaceCompactionExceptionHandler {
}
boolean removeAllTargetFile = true;
- TsFileResourceList list =
- tsFileManager.getSequenceListByTimePartition(targetTsFiles.get(0).getTimePartition());
for (TsFileResource targetTsFile : targetTsFiles) {
- list.remove(targetTsFile);
if (!targetTsFile.remove()) {
LOGGER.error(
"{} [Compaction][Exception] failed to delete target tsfile {} when handling exception",