Skip to content

[IOTDB-262]fix that CachedPriorityMergeReader fails to deduplicate the last cache element #463

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

Merged
qiaojialin merged 3 commits into from
Oct 30, 2019
Merged

[IOTDB-262]fix that CachedPriorityMergeReader fails to deduplicate the last cache element #463

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0df35ae
fix that CachedPriorityMergeReader fails to deduplicate the last elem…
jt2594838 Oct 21, 2019
becc6d5
fix that reader is not put back to the heap and readers are not remov…
jt2594838 Oct 21, 2019
2948f2b
Merge branch 'master' into fix_duplicated_overlap_merge
jt2594838 Oct 29, 2019
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
21 changes: 16 additions & 5 deletions server/src/test/java/org/apache/iotdb/db/engine/merge/MergeOverLapTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import java.io.IOException;
import java.util.Collections;
import org.apache.commons.io.FileUtils;
import org.apache.iotdb.db.conf.IoTDBConstant;
import org.apache.iotdb.db.engine.fileSystem.SystemFileFactory;
import org.apache.iotdb.db.engine.merge.manage.MergeResource;
import org.apache.iotdb.db.engine.merge.task.MergeTask;
Expand Down Expand Up @@ -65,26 +66,36 @@ public void tearDown() throws IOException, StorageEngineException {
FileUtils.deleteDirectory(tempSGDir);
}

@Override
void prepareFiles(int seqFileNum, int unseqFileNum) throws IOException, WriteProcessException {
for (int i = 0; i < seqFileNum; i++) {
File file = SystemFileFactory.INSTANCE.getFile(i + "seq.tsfile");
File file = new File(
i + "seq" + IoTDBConstant.TSFILE_NAME_SEPARATOR + i + IoTDBConstant.TSFILE_NAME_SEPARATOR
+ i + IoTDBConstant.TSFILE_NAME_SEPARATOR + 0
+ ".tsfile");
TsFileResource tsFileResource = new TsFileResource(file);
seqResources.add(tsFileResource);
prepareFile(tsFileResource, i * ptNum, ptNum, 0);
}
for (int i = 0; i < unseqFileNum; i++) {
File file = SystemFileFactory.INSTANCE.getFile(i + "unseq.tsfile");
File file = new File(
i + "unseq" + IoTDBConstant.TSFILE_NAME_SEPARATOR + i + IoTDBConstant.TSFILE_NAME_SEPARATOR
+ i + IoTDBConstant.TSFILE_NAME_SEPARATOR + 0
+ ".tsfile");
TsFileResource tsFileResource = new TsFileResource(file);
unseqResources.add(tsFileResource);
prepareFile(tsFileResource, i * ptNum, ptNum * (i + 1) / unseqFileNum, 10000);
prepareUnseqFile(tsFileResource, i * ptNum, ptNum * (i + 1) / unseqFileNum, 10000);
}
File file = SystemFileFactory.INSTANCE.getFile(unseqFileNum + "unseq.tsfile");
File file = new File(
unseqFileNum + "unseq" + IoTDBConstant.TSFILE_NAME_SEPARATOR + unseqFileNum
+ IoTDBConstant.TSFILE_NAME_SEPARATOR + unseqFileNum + IoTDBConstant.TSFILE_NAME_SEPARATOR + 0
+ ".tsfile");
TsFileResource tsFileResource = new TsFileResource(file);
unseqResources.add(tsFileResource);
prepareUnseqFile(tsFileResource, 0, ptNum * unseqFileNum, 20000);
}

void prepareUnseqFile(TsFileResource tsFileResource, long timeOffset, long ptNum,
private void prepareUnseqFile(TsFileResource tsFileResource, long timeOffset, long ptNum,
long valueOffset)
throws IOException, WriteProcessException {
TsFileWriter fileWriter = new TsFileWriter(tsFileResource.getFile());
Expand Down
8 changes: 4 additions & 4 deletions server/src/test/java/org/apache/iotdb/db/engine/merge/MergeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,12 +114,12 @@ private void prepareSeries() throws MetadataErrorException, PathErrorException {
}
}

private void prepareFiles(int seqFileNum, int unseqFileNum)
void prepareFiles(int seqFileNum, int unseqFileNum)
throws IOException, WriteProcessException {
for (int i = 0; i < seqFileNum; i++) {
File file = new File(
i + "seq" + IoTDBConstant.TSFILE_NAME_SEPARATOR + i + IoTDBConstant.TSFILE_NAME_SEPARATOR
+ i
+ i + IoTDBConstant.TSFILE_NAME_SEPARATOR + 0
+ ".tsfile");
TsFileResource tsFileResource = new TsFileResource(file);
seqResources.add(tsFileResource);
Expand All @@ -129,14 +129,14 @@ private void prepareFiles(int seqFileNum, int unseqFileNum)
File file = new File(
i + "unseq" + IoTDBConstant.TSFILE_NAME_SEPARATOR
+ i + IoTDBConstant.TSFILE_NAME_SEPARATOR
+ i
+ i + IoTDBConstant.TSFILE_NAME_SEPARATOR + 0
+ ".tsfile");
TsFileResource tsFileResource = new TsFileResource(file);
unseqResources.add(tsFileResource);
prepareFile(tsFileResource, i * ptNum, ptNum * (i + 1) / unseqFileNum, 10000);
}
File file = new File(unseqFileNum + "unseq" + IoTDBConstant.TSFILE_NAME_SEPARATOR + unseqFileNum
+ IoTDBConstant.TSFILE_NAME_SEPARATOR + unseqFileNum + ".tsfile");
+ IoTDBConstant.TSFILE_NAME_SEPARATOR + unseqFileNum + IoTDBConstant.TSFILE_NAME_SEPARATOR + 0 + ".tsfile");
TsFileResource tsFileResource = new TsFileResource(file);
unseqResources.add(tsFileResource);
prepareFile(tsFileResource, 0, ptNum * unseqFileNum, 20000);
Expand Down