Skip to content

Iotdb 3525 #85

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
THUMarkLau wants to merge 15 commits into
base: master
Choose a base branch
from
Open

Iotdb 3525 #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
5c1cf71
add future for AbstractCompactionTask
THUMarkLau Jun 17, 2022
e2aa5e7
Merge remote-tracking branch 'upstream/master' into IOTDB-3525
THUMarkLau Jun 18, 2022
7336def
remove future in AbstractCompactionTask
THUMarkLau Jun 18, 2022
0d4f944
fix some ut
THUMarkLau Jun 18, 2022
bb2ef31
Fix some UT
THUMarkLau Jun 20, 2022
b2b0cb6
fix ut
THUMarkLau Jun 21, 2022
93ab165
merge with upstream/master
THUMarkLau Jun 22, 2022
137b035
try to fix IT
THUMarkLau Jun 22, 2022
60489e9
acclerate UT
THUMarkLau Jun 22, 2022
031ff99
fix UT
THUMarkLau Jun 23, 2022
c8f1a77
edit according to review
THUMarkLau Jun 27, 2022
d461937
remove return value of AbstractCompactionTask
THUMarkLau Jun 27, 2022
089c97d
merge with upstream/master
THUMarkLau Jun 28, 2022
9d9052f
remove redundant exception catch
THUMarkLau Jun 28, 2022
79a811b
fit UT
THUMarkLau Jun 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions integration/src/test/java/org/apache/iotdb/db/integration/IoTDBSizeTieredCompactionIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1021,7 +1021,7 @@ public void testSequenceInnerCompactionContinously() throws SQLException {
CompactionPriority compactionPriority =
IoTDBDescriptor.getInstance().getConfig().getCompactionPriority();
IoTDBDescriptor.getInstance().getConfig().setCompactionPriority(CompactionPriority.INNER_CROSS);
long originCompactionNum = CompactionTaskManager.getInstance().getFinishTaskNum();
long originCompactionNum = CompactionTaskManager.getInstance().getFinishedTaskNum();
try (Connection connection = EnvFactory.getEnv().getConnection();
Statement statement = connection.createStatement()) {
for (int i = 1; i <= 3; i++) {
Expand All @@ -1044,7 +1044,7 @@ public void testSequenceInnerCompactionContinously() throws SQLException {
}
statement.execute("MERGE");
int totalWaitingTime = 0;
while (CompactionTaskManager.getInstance().getFinishTaskNum() - originCompactionNum < 2) {
while (CompactionTaskManager.getInstance().getFinishedTaskNum() - originCompactionNum < 2) {
try {
Thread.sleep(100);
} catch (InterruptedException e) {
Expand All @@ -1060,7 +1060,7 @@ public void testSequenceInnerCompactionContinously() throws SQLException {
}
}
statement.execute("Merge");
while (CompactionTaskManager.getInstance().getFinishTaskNum() - originCompactionNum < 3) {
while (CompactionTaskManager.getInstance().getFinishedTaskNum() - originCompactionNum < 3) {
try {
Thread.sleep(100);
} catch (InterruptedException e) {
Expand Down Expand Up @@ -1102,7 +1102,7 @@ public void testSequenceInnerCompactionConcurrently() throws SQLException {
long oriTargetFileSize =
IoTDBDescriptor.getInstance().getConfig().getTargetCompactionFileSize();
IoTDBDescriptor.getInstance().getConfig().setTargetCompactionFileSize(600);
long originCompactionNum = CompactionTaskManager.getInstance().getFinishTaskNum();
long originCompactionNum = CompactionTaskManager.getInstance().getFinishedTaskNum();
try (Connection connection = EnvFactory.getEnv().getConnection();
Statement statement = connection.createStatement()) {
for (int i = 1; i <= 3; i++) {
Expand All @@ -1124,7 +1124,7 @@ public void testSequenceInnerCompactionConcurrently() throws SQLException {
statement.execute("FLUSH");
}
long totalWaitingTime = 0;
while (CompactionTaskManager.getInstance().getFinishTaskNum() - originCompactionNum < 1) {
while (CompactionTaskManager.getInstance().getFinishedTaskNum() - originCompactionNum < 1) {
try {
Thread.sleep(100);
} catch (InterruptedException e) {
Expand Down Expand Up @@ -1167,7 +1167,7 @@ public void testUnsequenceInnerCompactionContinously() throws SQLException {
IoTDBDescriptor.getInstance().getConfig().getTargetCompactionFileSize();
IoTDBDescriptor.getInstance().getConfig().setConcurrentCompactionThread(2);
IoTDBDescriptor.getInstance().getConfig().setTargetCompactionFileSize(600);
long originFinishCount = CompactionTaskManager.getInstance().getFinishTaskNum();
long originFinishCount = CompactionTaskManager.getInstance().getFinishedTaskNum();
CompactionPriority compactionPriority =
IoTDBDescriptor.getInstance().getConfig().getCompactionPriority();
IoTDBDescriptor.getInstance().getConfig().setCompactionPriority(CompactionPriority.INNER_CROSS);
Expand Down Expand Up @@ -1199,7 +1199,7 @@ public void testUnsequenceInnerCompactionContinously() throws SQLException {
}
long totalWaitingTime = 0;
statement.execute("MERGE");
while (CompactionTaskManager.getInstance().getFinishTaskNum() - originFinishCount < 1) {
while (CompactionTaskManager.getInstance().getFinishedTaskNum() - originFinishCount < 1) {
try {
Thread.sleep(100);
} catch (InterruptedException e) {
Expand Down Expand Up @@ -1239,7 +1239,7 @@ public void testUnsequenceInnerCompactionConcurrently() throws SQLException {
long oriTargetFileSize =
IoTDBDescriptor.getInstance().getConfig().getTargetCompactionFileSize();
IoTDBDescriptor.getInstance().getConfig().setTargetCompactionFileSize(600);
long originCompactionNum = CompactionTaskManager.getInstance().getFinishTaskNum();
long originCompactionNum = CompactionTaskManager.getInstance().getFinishedTaskNum();
try (Connection connection = EnvFactory.getEnv().getConnection();
Statement statement = connection.createStatement()) {
for (int i = 1; i <= 3; i++) {
Expand Down Expand Up @@ -1267,7 +1267,7 @@ public void testUnsequenceInnerCompactionConcurrently() throws SQLException {
statement.execute("FLUSH");
}
int totalWaitingTime = 0;
while (CompactionTaskManager.getInstance().getFinishTaskNum() - originCompactionNum < 1) {
while (CompactionTaskManager.getInstance().getFinishedTaskNum() - originCompactionNum < 1) {
try {
Thread.sleep(100);
} catch (InterruptedException e) {
Expand Down Expand Up @@ -1305,7 +1305,7 @@ public void testSequenceAndUnsequenceInnerCompactionConcurrently() throws SQLExc
long oriTargetFileSize =
IoTDBDescriptor.getInstance().getConfig().getTargetCompactionFileSize();
IoTDBDescriptor.getInstance().getConfig().setTargetCompactionFileSize(600);
long originCompactionNum = CompactionTaskManager.getInstance().getFinishTaskNum();
long originCompactionNum = CompactionTaskManager.getInstance().getFinishedTaskNum();
try (Connection connection = EnvFactory.getEnv().getConnection();
Statement statement = connection.createStatement()) {
for (int i = 1; i <= 3; i++) {
Expand Down Expand Up @@ -1336,7 +1336,7 @@ public void testSequenceAndUnsequenceInnerCompactionConcurrently() throws SQLExc
statement.execute("FLUSH");
}
int totalWaitingTime = 0;
while (CompactionTaskManager.getInstance().getFinishTaskNum() - originCompactionNum < 2) {
while (CompactionTaskManager.getInstance().getFinishedTaskNum() - originCompactionNum < 2) {
try {
Thread.sleep(100);
} catch (InterruptedException e) {
Expand Down
6 changes: 3 additions & 3 deletions server/src/main/java/org/apache/iotdb/db/engine/compaction/CompactionScheduler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,18 +58,18 @@ public static void scheduleCompaction(TsFileManager tsFileManager, long timePart
try {
tryToSubmitCrossSpaceCompactionTask(
tsFileManager.getStorageGroupName(),
tsFileManager.getDataRegion(),
tsFileManager.getDataRegionId(),
timePartition,
tsFileManager);
tryToSubmitInnerSpaceCompactionTask(
tsFileManager.getStorageGroupName(),
tsFileManager.getDataRegion(),
tsFileManager.getDataRegionId(),
timePartition,
tsFileManager,
true);
tryToSubmitInnerSpaceCompactionTask(
tsFileManager.getStorageGroupName(),
tsFileManager.getDataRegion(),
tsFileManager.getDataRegionId(),
timePartition,
tsFileManager,
false);
Expand Down
Loading