You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ha...@apache.org on 2021/07/20 03:04:28 UTC
[iotdb] branch resource_debug updated (6aad61d -> 806baf0)
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a change to branch resource_debug
in repository https://gitbox.apache.org/repos/asf/iotdb.git.
from 6aad61d log
add 82bad0e [IoTDB-1501][To rel/0.11] Fix compaction recover delete tsfile bug (#3581)
add 8ff38b7 skip non exist measurement in where clause (#3590)
new 0e48cea Merge branch 'rel/0.11' of https://github.com/apache/iotdb into resource_debug
new 806baf0 optimize log
The 2 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.
Summary of changes:
.../compaction/CompactionMergeTaskPoolManager.java | 54 +++++++++-----
.../level/LevelCompactionTsFileManagement.java | 87 ++++++++++++++--------
.../engine/storagegroup/StorageGroupProcessor.java | 8 +-
.../iotdb/db/qp/strategy/PhysicalGenerator.java | 23 ++++--
.../compaction/LevelCompactionRecoverTest.java | 8 +-
.../iotdb/db/integration/IoTDBAlignByDeviceIT.java | 42 +++++++++++
6 files changed, 156 insertions(+), 66 deletions(-)
[iotdb] 01/02: Merge branch 'rel/0.11' of
https://github.com/apache/iotdb into resource_debug
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a commit to branch resource_debug
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 0e48cea684271fcedb7d4ca96a6ed72e04ad988a
Merge: 6aad61d 8ff38b7
Author: HTHou <hh...@outlook.com>
AuthorDate: Tue Jul 20 11:02:24 2021 +0800
Merge branch 'rel/0.11' of https://github.com/apache/iotdb into resource_debug
.../compaction/CompactionMergeTaskPoolManager.java | 54 +++++++++-----
.../level/LevelCompactionTsFileManagement.java | 87 ++++++++++++++--------
.../iotdb/db/qp/strategy/PhysicalGenerator.java | 23 ++++--
.../compaction/LevelCompactionRecoverTest.java | 8 +-
.../iotdb/db/integration/IoTDBAlignByDeviceIT.java | 42 +++++++++++
5 files changed, 154 insertions(+), 60 deletions(-)
[iotdb] 02/02: optimize log
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a commit to branch resource_debug
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 806baf071b0f709f054124f930f6e452ef939b39
Author: HTHou <hh...@outlook.com>
AuthorDate: Tue Jul 20 11:02:44 2021 +0800
optimize log
---
.../iotdb/db/engine/storagegroup/StorageGroupProcessor.java | 8 ++------
1 file changed, 2 insertions(+), 6 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 9721446..4f042ce 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
@@ -757,9 +757,7 @@ public class StorageGroupProcessor {
public void insertTablet(InsertTabletPlan insertTabletPlan) throws BatchInsertionException {
if (!checkSorted(insertTabletPlan.getTimes())) {
logger.error("Tablet is not sorted!!!!!");
- for (long time : insertTabletPlan.getTimes()) {
- logger.error("Time: {}", time);
- }
+ logger.error("Time: {}", Arrays.asList(insertTabletPlan.getTimes()));
System.exit(1);
}
writeLock();
@@ -908,9 +906,7 @@ public class StorageGroupProcessor {
try {
if (!config.isEnablePartition() && start != 0) {
logger.error("start index in InsertTabletPlan != 0, start index={}", start);
- for (long time : insertTabletPlan.getTimes()) {
- logger.error("Time: {}", time);
- }
+ logger.error("Time: {}", Arrays.asList(insertTabletPlan.getTimes()));
System.exit(1);
}
tsFileProcessor.insertTablet(insertTabletPlan, start, end, results);