diff --git a/server/src/test/java/org/apache/iotdb/db/engine/merge/MergeOverLapTest.java b/server/src/test/java/org/apache/iotdb/db/engine/merge/MergeOverLapTest.java index 0dfcd51aa2f77..820253f1c6934 100644 --- a/server/src/test/java/org/apache/iotdb/db/engine/merge/MergeOverLapTest.java +++ b/server/src/test/java/org/apache/iotdb/db/engine/merge/MergeOverLapTest.java @@ -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; @@ -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()); diff --git a/server/src/test/java/org/apache/iotdb/db/engine/merge/MergeTest.java b/server/src/test/java/org/apache/iotdb/db/engine/merge/MergeTest.java index b9e809e34aeb9..fb9981c91a7c2 100644 --- a/server/src/test/java/org/apache/iotdb/db/engine/merge/MergeTest.java +++ b/server/src/test/java/org/apache/iotdb/db/engine/merge/MergeTest.java @@ -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); @@ -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);