You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ma...@apache.org on 2022/11/02 08:11:19 UTC
[iotdb] branch IOTDB-4800 updated: rewrite ut
This is an automated email from the ASF dual-hosted git repository.
marklau99 pushed a commit to branch IOTDB-4800
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/IOTDB-4800 by this push:
new d5ef10d71c rewrite ut
d5ef10d71c is described below
commit d5ef10d71c49e1679168401d37ce09b6bcfe63e7
Author: Liu Xuxin <li...@outlook.com>
AuthorDate: Wed Nov 2 16:11:09 2022 +0800
rewrite ut
---
.../engine/compaction/CompactionTaskManager.java | 1 +
.../compaction/inner/InnerSpaceCompactionTask.java | 7 +++-
.../engine/compaction/AbstractCompactionTest.java | 48 +++++++---------------
.../ReadPointCompactionPerformerTest.java | 5 +--
.../cross/CrossSpaceCompactionExceptionTest.java | 3 +-
.../compaction/cross/CrossSpaceCompactionTest.java | 20 +--------
.../cross/CrossSpaceCompactionValidationTest.java | 3 +-
.../RewriteCrossSpaceCompactionRecoverTest.java | 3 +-
.../cross/RewriteCrossSpaceCompactionTest.java | 16 +++++---
.../inner/InnerCompactionEmptyTsFileTest.java | 1 +
.../inner/InnerCompactionMoreDataTest.java | 47 ++-------------------
.../inner/InnerCompactionSchedulerTest.java | 3 +-
.../compaction/inner/InnerCompactionTest.java | 15 -------
...eCrossSpaceCompactionRecoverCompatibleTest.java | 3 +-
.../SizeTieredCompactionRecoverCompatibleTest.java | 3 +-
.../compaction/utils/CompactionCheckerUtils.java | 4 ++
16 files changed, 55 insertions(+), 127 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/compaction/CompactionTaskManager.java b/server/src/main/java/org/apache/iotdb/db/engine/compaction/CompactionTaskManager.java
index a63f15e974..649a277716 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/compaction/CompactionTaskManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/compaction/CompactionTaskManager.java
@@ -382,6 +382,7 @@ public class CompactionTaskManager implements IService {
initThreadPool();
finishedTaskNum.set(0);
candidateCompactionTaskQueue.clear();
+ init = true;
}
currentTaskNum = new AtomicInteger(0);
logger.info("Compaction task manager started.");
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/compaction/inner/InnerSpaceCompactionTask.java b/server/src/main/java/org/apache/iotdb/db/engine/compaction/inner/InnerSpaceCompactionTask.java
index 92124a4db4..13e68bdea8 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/compaction/inner/InnerSpaceCompactionTask.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/compaction/inner/InnerSpaceCompactionTask.java
@@ -211,8 +211,11 @@ public class InnerSpaceCompactionTask extends AbstractCompactionTask {
TsFileMetricManager.getInstance().deleteFile(resource.getTsFile().length(), sequence);
}
// inner space compaction task has only one target file
- TsFileMetricManager.getInstance()
- .addFile(targetTsFileList.get(0).getTsFile().length(), sequence);
+ if (targetTsFileList.size() > 0) {
+ // if the target tsfile is empty file, it will be removed
+ TsFileMetricManager.getInstance()
+ .addFile(targetTsFileList.get(0).getTsFile().length(), sequence);
+ }
double costTime = (System.currentTimeMillis() - startTime) / 1000.0d;
LOGGER.info(
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/compaction/AbstractCompactionTest.java b/server/src/test/java/org/apache/iotdb/db/engine/compaction/AbstractCompactionTest.java
index 5e380fcc20..9b69007ea5 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/compaction/AbstractCompactionTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/compaction/AbstractCompactionTest.java
@@ -19,15 +19,16 @@
package org.apache.iotdb.db.engine.compaction;
import org.apache.iotdb.commons.exception.MetadataException;
-import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.constant.TestConstant;
+import org.apache.iotdb.db.engine.cache.BloomFilterCache;
+import org.apache.iotdb.db.engine.cache.ChunkCache;
+import org.apache.iotdb.db.engine.cache.TimeSeriesMetadataCache;
import org.apache.iotdb.db.engine.compaction.utils.CompactionConfigRestorer;
import org.apache.iotdb.db.engine.storagegroup.TsFileResource;
import org.apache.iotdb.db.engine.storagegroup.TsFileResourceStatus;
import org.apache.iotdb.db.exception.StorageEngineException;
import org.apache.iotdb.db.query.control.FileReaderManager;
-import org.apache.iotdb.db.service.IoTDB;
import org.apache.iotdb.db.utils.EnvironmentUtils;
import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor;
import org.apache.iotdb.tsfile.exception.write.WriteProcessException;
@@ -44,7 +45,6 @@ import org.junit.Assert;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.List;
import static org.apache.iotdb.tsfile.common.constant.TsFileConstant.PATH_SEPARATOR;
@@ -104,7 +104,8 @@ public class AbstractCompactionTest {
private int fileVersion = 0;
- public void setUp() throws IOException, WriteProcessException, MetadataException {
+ public void setUp()
+ throws IOException, WriteProcessException, MetadataException, InterruptedException {
if (!SEQ_DIRS.exists()) {
Assert.assertTrue(SEQ_DIRS.mkdirs());
}
@@ -112,8 +113,12 @@ public class AbstractCompactionTest {
Assert.assertTrue(UNSEQ_DIRS.mkdirs());
}
dataType = TSDataType.INT64;
- EnvironmentUtils.envSetUp();
- IoTDB.configManager.init();
+ CompactionTaskManager.getInstance().restart();
+ seqResources.clear();
+ unseqResources.clear();
+ ChunkCache.getInstance().clear();
+ TimeSeriesMetadataCache.getInstance().clear();
+ BloomFilterCache.getInstance().clear();
}
/**
@@ -315,51 +320,26 @@ public class AbstractCompactionTest {
dataTypes.add(dataType);
encodings.add(TSEncoding.PLAIN);
compressionTypes.add(CompressionType.UNCOMPRESSED);
- IoTDB.schemaProcessor.createTimeseries(
- new PartialPath(COMPACTION_TEST_SG + PATH_SEPARATOR + "d" + i, "s" + j),
- dataType,
- TSEncoding.PLAIN,
- CompressionType.UNCOMPRESSED,
- Collections.emptyMap());
- }
- IoTDB.schemaProcessor.createAlignedTimeSeries(
- new PartialPath(COMPACTION_TEST_SG + PATH_SEPARATOR + "d" + (i + 10000)),
- measurements,
- dataTypes,
- encodings,
- compressionTypes);
- } else {
- for (int j = 0; j < measurementNum; j++) {
- IoTDB.schemaProcessor.createTimeseries(
- new PartialPath(COMPACTION_TEST_SG + PATH_SEPARATOR + "d" + i, "s" + j),
- dataType,
- TSEncoding.PLAIN,
- CompressionType.UNCOMPRESSED,
- Collections.emptyMap());
}
}
}
}
- protected void deleteTimeseriesInMManager(List<String> timeseries) throws MetadataException {
- for (String path : timeseries) {
- IoTDB.schemaProcessor.deleteTimeseries(new PartialPath(path));
- }
- }
+ protected void deleteTimeseriesInMManager(List<String> timeseries) throws MetadataException {}
public void tearDown() throws IOException, StorageEngineException {
new CompactionConfigRestorer().restoreCompactionConfig();
removeFiles();
+ CompactionTaskManager.getInstance().stop();
seqResources.clear();
unseqResources.clear();
- IoTDB.configManager.clear();
IoTDBDescriptor.getInstance().getConfig().setTargetChunkSize(oldTargetChunkSize);
IoTDBDescriptor.getInstance()
.getConfig()
.setMaxCrossCompactionCandidateFileNum(oldMaxCrossCompactionFileNum);
TSFileDescriptor.getInstance().getConfig().setGroupSizeInByte(oldChunkGroupSize);
TSFileDescriptor.getInstance().getConfig().setMaxNumberOfPointsInPage(oldPagePointSize);
- EnvironmentUtils.cleanEnv();
+ EnvironmentUtils.cleanAllDir();
if (SEQ_DIRS.exists()) {
FileUtils.deleteDirectory(SEQ_DIRS);
}
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/compaction/ReadPointCompactionPerformerTest.java b/server/src/test/java/org/apache/iotdb/db/engine/compaction/ReadPointCompactionPerformerTest.java
index 1d718647d9..1771931f65 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/compaction/ReadPointCompactionPerformerTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/compaction/ReadPointCompactionPerformerTest.java
@@ -74,7 +74,8 @@ public class ReadPointCompactionPerformerTest extends AbstractCompactionTest {
private final String oldThreadName = Thread.currentThread().getName();
@Before
- public void setUp() throws IOException, WriteProcessException, MetadataException {
+ public void setUp()
+ throws IOException, WriteProcessException, MetadataException, InterruptedException {
super.setUp();
IoTDBDescriptor.getInstance().getConfig().setTargetChunkSize(1024);
Thread.currentThread().setName("pool-1-IoTDB-Compaction-1");
@@ -5057,9 +5058,7 @@ public class ReadPointCompactionPerformerTest extends AbstractCompactionTest {
}
generateModsFile(seriesPaths, seqResources, Long.MIN_VALUE, Long.MAX_VALUE);
generateModsFile(seriesPaths, unseqResources, Long.MIN_VALUE, Long.MAX_VALUE);
- deleteTimeseriesInMManager(seriesPaths);
setDataType(TSDataType.TEXT);
- registerTimeseriesInMManger(2, 7, true);
List<Integer> deviceIndex = new ArrayList<>();
deviceIndex.add(1);
deviceIndex.add(3);
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/CrossSpaceCompactionExceptionTest.java b/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/CrossSpaceCompactionExceptionTest.java
index 53067b3c5b..ca85729a0c 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/CrossSpaceCompactionExceptionTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/CrossSpaceCompactionExceptionTest.java
@@ -58,7 +58,8 @@ public class CrossSpaceCompactionExceptionTest extends AbstractCompactionTest {
private final String oldThreadName = Thread.currentThread().getName();
@Before
- public void setUp() throws IOException, WriteProcessException, MetadataException {
+ public void setUp()
+ throws IOException, WriteProcessException, MetadataException, InterruptedException {
super.setUp();
IoTDBDescriptor.getInstance().getConfig().setTargetChunkSize(1024);
Thread.currentThread().setName("pool-1-IoTDB-Compaction-1");
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/CrossSpaceCompactionTest.java b/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/CrossSpaceCompactionTest.java
index 47a86d215c..be3f273092 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/CrossSpaceCompactionTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/CrossSpaceCompactionTest.java
@@ -20,8 +20,8 @@
package org.apache.iotdb.db.engine.compaction.cross;
import org.apache.iotdb.commons.exception.MetadataException;
-import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
+import org.apache.iotdb.db.engine.cache.BloomFilterCache;
import org.apache.iotdb.db.engine.cache.ChunkCache;
import org.apache.iotdb.db.engine.cache.TimeSeriesMetadataCache;
import org.apache.iotdb.db.engine.compaction.CompactionTaskManager;
@@ -39,11 +39,7 @@ import org.apache.iotdb.db.engine.storagegroup.TsFileResource;
import org.apache.iotdb.db.engine.storagegroup.TsFileResourceList;
import org.apache.iotdb.db.engine.storagegroup.TsFileResourceStatus;
import org.apache.iotdb.db.exception.StorageEngineException;
-import org.apache.iotdb.db.service.IoTDB;
import org.apache.iotdb.db.utils.EnvironmentUtils;
-import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor;
-import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
-import org.apache.iotdb.tsfile.file.metadata.enums.TSEncoding;
import org.apache.iotdb.tsfile.read.TimeValuePair;
import org.apache.iotdb.tsfile.utils.Pair;
@@ -55,7 +51,6 @@ import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
@@ -99,17 +94,6 @@ public class CrossSpaceCompactionTest {
@Before
public void setUp() throws MetadataException {
- IoTDB.configManager.init();
- IoTDB.schemaProcessor.setStorageGroup(new PartialPath(COMPACTION_TEST_SG));
- for (String fullPath : fullPaths) {
- PartialPath path = new PartialPath(fullPath);
- IoTDB.schemaProcessor.createTimeseries(
- path,
- TSDataType.INT64,
- TSEncoding.valueOf(TSFileDescriptor.getInstance().getConfig().getValueEncoder()),
- TSFileDescriptor.getInstance().getConfig().getCompressor(),
- Collections.emptyMap());
- }
CompactionTaskManager.getInstance().start();
Thread.currentThread().setName("pool-1-IoTDB-Compaction-1");
}
@@ -120,7 +104,7 @@ public class CrossSpaceCompactionTest {
CompactionClearUtils.deleteEmptyDir(new File("target"));
ChunkCache.getInstance().clear();
TimeSeriesMetadataCache.getInstance().clear();
- IoTDB.configManager.clear();
+ BloomFilterCache.getInstance().clear();
CompactionTaskManager.getInstance().stop();
EnvironmentUtils.cleanAllDir();
Thread.currentThread().setName(oldThreadName);
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/CrossSpaceCompactionValidationTest.java b/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/CrossSpaceCompactionValidationTest.java
index 577c59cfc7..12f79efa6e 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/CrossSpaceCompactionValidationTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/CrossSpaceCompactionValidationTest.java
@@ -53,7 +53,8 @@ public class CrossSpaceCompactionValidationTest extends AbstractCompactionTest {
private final String oldThreadName = Thread.currentThread().getName();
@Before
- public void setUp() throws IOException, WriteProcessException, MetadataException {
+ public void setUp()
+ throws IOException, WriteProcessException, MetadataException, InterruptedException {
super.setUp();
IoTDBDescriptor.getInstance().getConfig().setTargetChunkSize(1024);
TSFileDescriptor.getInstance().getConfig().setMaxNumberOfPointsInPage(30);
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/RewriteCrossSpaceCompactionRecoverTest.java b/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/RewriteCrossSpaceCompactionRecoverTest.java
index 77731b19bd..0016da72d7 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/RewriteCrossSpaceCompactionRecoverTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/RewriteCrossSpaceCompactionRecoverTest.java
@@ -56,7 +56,8 @@ public class RewriteCrossSpaceCompactionRecoverTest extends AbstractCompactionTe
private final String oldThreadName = Thread.currentThread().getName();
@Before
- public void setUp() throws IOException, WriteProcessException, MetadataException {
+ public void setUp()
+ throws IOException, WriteProcessException, MetadataException, InterruptedException {
super.setUp();
IoTDBDescriptor.getInstance().getConfig().setTargetChunkSize(1024);
Thread.currentThread().setName("pool-1-IoTDB-Compaction-1");
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/RewriteCrossSpaceCompactionTest.java b/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/RewriteCrossSpaceCompactionTest.java
index 697f6685af..d6250d8a7a 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/RewriteCrossSpaceCompactionTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/RewriteCrossSpaceCompactionTest.java
@@ -35,6 +35,7 @@ import org.apache.iotdb.db.exception.StorageEngineException;
import org.apache.iotdb.db.query.control.FileReaderManager;
import org.apache.iotdb.db.query.reader.series.SeriesRawDataBatchReader;
import org.apache.iotdb.db.utils.EnvironmentUtils;
+import org.apache.iotdb.db.wal.recover.WALRecoverManager;
import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor;
import org.apache.iotdb.tsfile.common.constant.TsFileConstant;
import org.apache.iotdb.tsfile.exception.write.WriteProcessException;
@@ -59,6 +60,7 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.concurrent.CountDownLatch;
import java.util.concurrent.atomic.AtomicInteger;
import static org.apache.iotdb.commons.conf.IoTDBConstant.CROSS_COMPACTION_TMP_FILE_SUFFIX;
@@ -70,8 +72,10 @@ public class RewriteCrossSpaceCompactionTest extends AbstractCompactionTest {
private final String oldThreadName = Thread.currentThread().getName();
@Before
- public void setUp() throws IOException, WriteProcessException, MetadataException {
+ public void setUp()
+ throws IOException, WriteProcessException, MetadataException, InterruptedException {
super.setUp();
+ WALRecoverManager.getInstance().setAllDataRegionScannedLatch(new CountDownLatch(1));
IoTDBDescriptor.getInstance().getConfig().setTargetChunkSize(1024);
Thread.currentThread().setName("pool-1-IoTDB-Compaction-1");
}
@@ -592,7 +596,7 @@ public class RewriteCrossSpaceCompactionTest extends AbstractCompactionTest {
createFiles(2, 1, 5, 100, 450, 20450, 0, 0, true, false);
vsgp.getTsFileResourceManager().addAll(seqResources, true);
vsgp.getTsFileResourceManager().addAll(unseqResources, false);
- vsgp.delete(
+ vsgp.deleteByDevice(
new PartialPath(
COMPACTION_TEST_SG
+ PATH_SEPARATOR
@@ -618,7 +622,7 @@ public class RewriteCrossSpaceCompactionTest extends AbstractCompactionTest {
task.setSourceFilesToCompactionCandidate();
task.checkValidAndSetMerging();
// delete data in source file during compaction
- vsgp.delete(
+ vsgp.deleteByDevice(
new PartialPath(
COMPACTION_TEST_SG
+ PATH_SEPARATOR
@@ -713,7 +717,7 @@ public class RewriteCrossSpaceCompactionTest extends AbstractCompactionTest {
createFiles(2, 1, 5, 100, 450, 20450, 0, 0, true, false);
vsgp.getTsFileResourceManager().addAll(seqResources, true);
vsgp.getTsFileResourceManager().addAll(unseqResources, false);
- vsgp.delete(
+ vsgp.deleteByDevice(
new PartialPath(
COMPACTION_TEST_SG
+ PATH_SEPARATOR
@@ -739,7 +743,7 @@ public class RewriteCrossSpaceCompactionTest extends AbstractCompactionTest {
task.setSourceFilesToCompactionCandidate();
task.checkValidAndSetMerging();
// delete data in source file during compaction
- vsgp.delete(
+ vsgp.deleteByDevice(
new PartialPath(
COMPACTION_TEST_SG
+ PATH_SEPARATOR
@@ -751,7 +755,7 @@ public class RewriteCrossSpaceCompactionTest extends AbstractCompactionTest {
1200,
0,
null);
- vsgp.delete(
+ vsgp.deleteByDevice(
new PartialPath(
COMPACTION_TEST_SG
+ PATH_SEPARATOR
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/compaction/inner/InnerCompactionEmptyTsFileTest.java b/server/src/test/java/org/apache/iotdb/db/engine/compaction/inner/InnerCompactionEmptyTsFileTest.java
index e93c0ff687..c8e299cdf7 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/compaction/inner/InnerCompactionEmptyTsFileTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/compaction/inner/InnerCompactionEmptyTsFileTest.java
@@ -51,6 +51,7 @@ public class InnerCompactionEmptyTsFileTest extends InnerCompactionTest {
seqFileNum = 0;
unseqFileNum = 4;
super.setUp();
+ CompactionTaskManager.getInstance().restart();
tempSGDir = new File(TestConstant.BASE_OUTPUT_PATH.concat("tempSG"));
tempSGDir.mkdirs();
tsFileManager = new TsFileManager(COMPACTION_TEST_SG, "0", tempSGDir.getAbsolutePath());
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/compaction/inner/InnerCompactionMoreDataTest.java b/server/src/test/java/org/apache/iotdb/db/engine/compaction/inner/InnerCompactionMoreDataTest.java
index 017ba94aa2..1985692747 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/compaction/inner/InnerCompactionMoreDataTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/compaction/inner/InnerCompactionMoreDataTest.java
@@ -22,6 +22,7 @@ package org.apache.iotdb.db.engine.compaction.inner;
import org.apache.iotdb.commons.conf.IoTDBConstant;
import org.apache.iotdb.commons.exception.MetadataException;
import org.apache.iotdb.commons.path.MeasurementPath;
+import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.db.constant.TestConstant;
import org.apache.iotdb.db.engine.compaction.CompactionScheduler;
import org.apache.iotdb.db.engine.compaction.CompactionTaskManager;
@@ -31,8 +32,6 @@ import org.apache.iotdb.db.engine.storagegroup.TsFileResourceStatus;
import org.apache.iotdb.db.exception.StorageEngineException;
import org.apache.iotdb.db.query.context.QueryContext;
import org.apache.iotdb.db.query.reader.series.SeriesRawDataBatchReader;
-import org.apache.iotdb.db.utils.SchemaTestUtils;
-import org.apache.iotdb.tsfile.common.constant.TsFileConstant;
import org.apache.iotdb.tsfile.exception.write.WriteProcessException;
import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
@@ -101,43 +100,6 @@ public class InnerCompactionMoreDataTest extends InnerCompactionTest {
seqResources.add(tsFileResource);
prepareFile(tsFileResource, i * ptNum, ptNum, 0);
}
- for (int i = 0; i < unseqFileNum; i++) {
- File file =
- new File(
- TestConstant.getTestTsFileDir("root.compactionTest", 0, 0)
- .concat(
- (10000 + i)
- + IoTDBConstant.FILE_NAME_SEPARATOR
- + (10000 + i)
- + IoTDBConstant.FILE_NAME_SEPARATOR
- + 0
- + IoTDBConstant.FILE_NAME_SEPARATOR
- + 0
- + ".tsfile"));
- TsFileResource tsFileResource = new TsFileResource(file);
- tsFileResource.setStatus(TsFileResourceStatus.CLOSED);
- tsFileResource.updatePlanIndexes((long) (i + seqFileNum));
- unseqResources.add(tsFileResource);
- prepareFile(tsFileResource, i * ptNum, ptNum * (i + 1) / unseqFileNum, 10000);
- }
-
- File file =
- new File(
- TestConstant.getTestTsFileDir("root.compactionTest", 0, 0)
- .concat(
- unseqFileNum
- + IoTDBConstant.FILE_NAME_SEPARATOR
- + unseqFileNum
- + IoTDBConstant.FILE_NAME_SEPARATOR
- + 0
- + IoTDBConstant.FILE_NAME_SEPARATOR
- + 0
- + ".tsfile"));
- TsFileResource tsFileResource = new TsFileResource(file);
- tsFileResource.setStatus(TsFileResourceStatus.CLOSED);
- tsFileResource.updatePlanIndexes(seqFileNum + unseqFileNum);
- unseqResources.add(tsFileResource);
- prepareFile(tsFileResource, 0, ptNum * unseqFileNum, 20000);
}
@Override
@@ -202,10 +164,9 @@ public class InnerCompactionMoreDataTest extends InnerCompactionTest {
CompactionTaskManager.getInstance().waitAllCompactionFinish();
QueryContext context = new QueryContext();
MeasurementPath path =
- SchemaTestUtils.getMeasurementPath(
- deviceIds[0]
- + TsFileConstant.PATH_SEPARATOR
- + measurementSchemas[2688].getMeasurementId());
+ new MeasurementPath(
+ new PartialPath(deviceIds[0], measurementSchemas[2688].getMeasurementId()),
+ measurementSchemas[2688].getType());
IBatchReader tsFilesReader =
new SeriesRawDataBatchReader(
path,
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/compaction/inner/InnerCompactionSchedulerTest.java b/server/src/test/java/org/apache/iotdb/db/engine/compaction/inner/InnerCompactionSchedulerTest.java
index 69972a511c..07f9f35e7d 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/compaction/inner/InnerCompactionSchedulerTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/compaction/inner/InnerCompactionSchedulerTest.java
@@ -50,7 +50,8 @@ public class InnerCompactionSchedulerTest extends AbstractCompactionTest {
IoTDBDescriptor.getInstance().getConfig().getMaxInnerCompactionCandidateFileNum();
@Before
- public void setUp() throws IOException, WriteProcessException, MetadataException {
+ public void setUp()
+ throws IOException, WriteProcessException, MetadataException, InterruptedException {
CompactionTaskManager.getInstance().start();
super.setUp();
originFileSize = IoTDBDescriptor.getInstance().getConfig().getTargetCompactionFileSize();
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/compaction/inner/InnerCompactionTest.java b/server/src/test/java/org/apache/iotdb/db/engine/compaction/inner/InnerCompactionTest.java
index 7d3265fa33..22a5825edf 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/compaction/inner/InnerCompactionTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/compaction/inner/InnerCompactionTest.java
@@ -21,7 +21,6 @@ package org.apache.iotdb.db.engine.compaction.inner;
import org.apache.iotdb.commons.conf.IoTDBConstant;
import org.apache.iotdb.commons.exception.MetadataException;
-import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.db.constant.TestConstant;
import org.apache.iotdb.db.engine.cache.ChunkCache;
import org.apache.iotdb.db.engine.cache.TimeSeriesMetadataCache;
@@ -31,7 +30,6 @@ import org.apache.iotdb.db.engine.storagegroup.TsFileResource;
import org.apache.iotdb.db.engine.storagegroup.TsFileResourceStatus;
import org.apache.iotdb.db.exception.StorageEngineException;
import org.apache.iotdb.db.query.control.FileReaderManager;
-import org.apache.iotdb.db.service.IoTDB;
import org.apache.iotdb.db.utils.EnvironmentUtils;
import org.apache.iotdb.tsfile.exception.write.WriteProcessException;
import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType;
@@ -50,7 +48,6 @@ import org.junit.Before;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.List;
import static org.apache.iotdb.commons.conf.IoTDBConstant.PATH_SEPARATOR;
@@ -102,18 +99,6 @@ public abstract class InnerCompactionTest {
for (int i = 0; i < deviceNum; i++) {
deviceIds[i] = COMPACTION_TEST_SG + PATH_SEPARATOR + "device" + i;
}
- IoTDB.schemaProcessor.setStorageGroup(new PartialPath(COMPACTION_TEST_SG));
- for (String device : deviceIds) {
- for (MeasurementSchema measurementSchema : measurementSchemas) {
- PartialPath devicePath = new PartialPath(device);
- IoTDB.schemaProcessor.createTimeseries(
- devicePath.concatNode(measurementSchema.getMeasurementId()),
- measurementSchema.getType(),
- measurementSchema.getEncodingType(),
- measurementSchema.getCompressor(),
- Collections.emptyMap());
- }
- }
}
void prepareFiles(int seqFileNum, int unseqFileNum) throws IOException, WriteProcessException {
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/compaction/recover/RewriteCrossSpaceCompactionRecoverCompatibleTest.java b/server/src/test/java/org/apache/iotdb/db/engine/compaction/recover/RewriteCrossSpaceCompactionRecoverCompatibleTest.java
index 7274c0fdec..768765af7f 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/compaction/recover/RewriteCrossSpaceCompactionRecoverCompatibleTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/compaction/recover/RewriteCrossSpaceCompactionRecoverCompatibleTest.java
@@ -57,7 +57,8 @@ public class RewriteCrossSpaceCompactionRecoverCompatibleTest extends AbstractCo
@Override
@Before
- public void setUp() throws IOException, MetadataException, WriteProcessException {
+ public void setUp()
+ throws IOException, MetadataException, WriteProcessException, InterruptedException {
super.setUp();
Thread.currentThread().setName("pool-1-IoTDB-Compaction-1");
}
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/compaction/recover/SizeTieredCompactionRecoverCompatibleTest.java b/server/src/test/java/org/apache/iotdb/db/engine/compaction/recover/SizeTieredCompactionRecoverCompatibleTest.java
index e4a438dd5c..d1d0fd574f 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/compaction/recover/SizeTieredCompactionRecoverCompatibleTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/compaction/recover/SizeTieredCompactionRecoverCompatibleTest.java
@@ -55,7 +55,8 @@ import static org.apache.iotdb.tsfile.common.constant.TsFileConstant.PATH_SEPARA
public class SizeTieredCompactionRecoverCompatibleTest extends AbstractCompactionTest {
@Override
@Before
- public void setUp() throws IOException, MetadataException, WriteProcessException {
+ public void setUp()
+ throws IOException, MetadataException, WriteProcessException, InterruptedException {
super.setUp();
}
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/compaction/utils/CompactionCheckerUtils.java b/server/src/test/java/org/apache/iotdb/db/engine/compaction/utils/CompactionCheckerUtils.java
index b5f7bee02f..1b69c979d4 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/compaction/utils/CompactionCheckerUtils.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/compaction/utils/CompactionCheckerUtils.java
@@ -21,6 +21,7 @@ package org.apache.iotdb.db.engine.compaction.utils;
import org.apache.iotdb.commons.exception.IllegalPathException;
import org.apache.iotdb.commons.path.PartialPath;
+import org.apache.iotdb.db.engine.cache.BloomFilterCache;
import org.apache.iotdb.db.engine.cache.ChunkCache;
import org.apache.iotdb.db.engine.cache.TimeSeriesMetadataCache;
import org.apache.iotdb.db.engine.modification.Deletion;
@@ -101,6 +102,9 @@ public class CompactionCheckerUtils {
*/
public static Map<String, List<TimeValuePair>> readFiles(List<TsFileResource> tsFileResources)
throws IOException, IllegalPathException {
+ ChunkCache.getInstance().clear();
+ TimeSeriesMetadataCache.getInstance().clear();
+ BloomFilterCache.getInstance().clear();
Map<String, Map<Long, TimeValuePair>> mapResult = new HashMap<>();
for (TsFileResource tsFileResource : tsFileResources) {
try (TsFileSequenceReader reader = new TsFileSequenceReader(tsFileResource.getTsFilePath())) {