This is an automated email from the ASF dual-hosted git repository.
shuwenwei pushed a commit to branch useTsFileIDInFileReaderManager
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 35a9bd19466113cc1e1ae951b94f531b8915271a
Author: shuwenwei <s13979062...@gmail.com>
AuthorDate: Fri Aug 1 16:04:06 2025 +0800
Replace the key in FileReaderManager to TsFileID
---
.../db/storageengine/buffer/BloomFilterCache.java | 7 +-
.../iotdb/db/storageengine/buffer/ChunkCache.java | 3 +-
.../buffer/TimeSeriesMetadataCache.java | 5 +-
.../db/storageengine/dataregion/DataRegion.java | 2 +-
.../dataregion/read/control/FileReaderManager.java | 85 ++++++++++++----------
.../compaction/CompactionWithMinTimestampTest.java | 4 +-
.../compaction/FastAlignedCrossCompactionTest.java | 4 +-
.../FastCrossCompactionPerformerTest.java | 4 +-
.../FastInnerCompactionPerformerTest.java | 4 +-
.../FastNonAlignedCrossCompactionTest.java | 4 +-
.../compaction/ReadChunkInnerCompactionTest.java | 4 +-
.../ReadPointAlignedCrossCompactionTest.java | 4 +-
.../ReadPointCompactionPerformerTest.java | 4 +-
.../ReadPointNonAlignedCrossCompactionTest.java | 4 +-
.../cross/CrossSpaceCompactionSelectorTest.java | 4 +-
.../inner/InnerSpaceCompactionSelectorTest.java | 4 +-
...TableModelReadChunkCompactionPerformerTest.java | 4 +-
...TableModelReadPointCompactionPerformerTest.java | 4 +-
.../utils/MultiTsFileDeviceIteratorTest.java | 4 +-
19 files changed, 85 insertions(+), 73 deletions(-)
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/buffer/BloomFilterCache.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/buffer/BloomFilterCache.java
index 7a41352098b..69f957ae87e 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/buffer/BloomFilterCache.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/buffer/BloomFilterCache.java
@@ -210,7 +210,12 @@ public class BloomFilterCache {
try {
cacheMiss = true;
TsFileSequenceReader reader =
- FileReaderManager.getInstance().get(bloomFilterCacheKey.filePath,
true, ioSizeRecorder);
+ FileReaderManager.getInstance()
+ .get(
+ bloomFilterCacheKey.filePath,
+ bloomFilterCacheKey.tsFileID,
+ true,
+ ioSizeRecorder);
return reader.readBloomFilter(ioSizeRecorder);
} catch (IOException e) {
throw new IoTDBIORuntimeException(e);
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/buffer/ChunkCache.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/buffer/ChunkCache.java
index 1c39b993a3c..aced45a48c9 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/buffer/ChunkCache.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/buffer/ChunkCache.java
@@ -307,7 +307,8 @@ public class ChunkCache {
try {
cacheMiss = true;
TsFileSequenceReader reader =
- FileReaderManager.getInstance().get(key.getFilePath(), key.closed,
ioSizeRecorder);
+ FileReaderManager.getInstance()
+ .get(key.getFilePath(), key.tsFileID, key.closed,
ioSizeRecorder);
Chunk chunk = reader.readMemChunk(key.offsetOfChunkHeader,
ioSizeRecorder);
// to save memory footprint, we don't save measurementId in
ChunkHeader of Chunk
chunk.getHeader().setMeasurementID(null);
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/buffer/TimeSeriesMetadataCache.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/buffer/TimeSeriesMetadataCache.java
index f2cd55c5e7d..c3fef67b5f1 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/buffer/TimeSeriesMetadataCache.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/buffer/TimeSeriesMetadataCache.java
@@ -132,7 +132,8 @@ public class TimeSeriesMetadataCache {
// bloom filter part
TsFileSequenceReader reader =
- FileReaderManager.getInstance().get(filePath, true,
bloomFilterIoSizeRecorder);
+ FileReaderManager.getInstance()
+ .get(filePath, key.tsFileID, true, bloomFilterIoSizeRecorder);
BloomFilter bloomFilter =
reader.readBloomFilter(bloomFilterIoSizeRecorder);
queryContext.getQueryStatistics().getLoadBloomFilterFromDiskCount().incrementAndGet();
if (bloomFilter != null
@@ -193,7 +194,7 @@ public class TimeSeriesMetadataCache {
loadBloomFilterTime = System.nanoTime() - loadBloomFilterStartTime;
TsFileSequenceReader reader =
FileReaderManager.getInstance()
- .get(filePath, true, timeSeriesMetadataIoSizeRecorder);
+ .get(filePath, key.tsFileID, true,
timeSeriesMetadataIoSizeRecorder);
List<TimeseriesMetadata> timeSeriesMetadataList =
reader.readTimeseriesMetadata(
key.device,
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java
index 04bed96d2ff..b9493415a33 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java
@@ -2998,7 +2998,7 @@ public class DataRegion implements IDataRegionForQuery {
if (!oldTsFileResource.getTsFile().exists()) {
tsFileManager.remove(oldTsFileResource, oldTsFileResource.isSeq());
}
-
FileReaderManager.getInstance().closeFileAndRemoveReader(oldTsFileResource.getTsFilePath());
+
FileReaderManager.getInstance().closeFileAndRemoveReader(oldTsFileResource.getTsFileID());
oldTsFileResource.setSettleTsFileCallBack(null);
SettleService.getINSTANCE().getFilesToBeSettledCount().addAndGet(-1);
} catch (IOException e) {
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/read/control/FileReaderManager.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/read/control/FileReaderManager.java
index 29c4e79550a..738f0038e5b 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/read/control/FileReaderManager.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/read/control/FileReaderManager.java
@@ -20,6 +20,7 @@
package org.apache.iotdb.db.storageengine.dataregion.read.control;
import org.apache.iotdb.commons.utils.TestOnly;
+import org.apache.iotdb.db.storageengine.dataregion.tsfile.TsFileID;
import org.apache.iotdb.db.storageengine.dataregion.tsfile.TsFileResource;
import org.apache.tsfile.read.TsFileSequenceReader;
@@ -57,25 +58,25 @@ public class FileReaderManager {
* the key of closedFileReaderMap is the file path and the value of
closedFileReaderMap is the
* corresponding reader.
*/
- private Map<String, TsFileSequenceReader> closedFileReaderMap;
+ private Map<TsFileID, TsFileSequenceReader> closedFileReaderMap;
/**
* the key of unclosedFileReaderMap is the file path and the value of
unclosedFileReaderMap is the
* corresponding reader.
*/
- private Map<String, TsFileSequenceReader> unclosedFileReaderMap;
+ private Map<TsFileID, TsFileSequenceReader> unclosedFileReaderMap;
/**
* the key of closedFileReaderMap is the file path and the value of
closedFileReaderMap is the
* file's reference count.
*/
- private Map<String, AtomicInteger> closedReferenceMap;
+ private Map<TsFileID, AtomicInteger> closedReferenceMap;
/**
* the key of unclosedFileReaderMap is the file path and the value of
unclosedFileReaderMap is the
* file's reference count.
*/
- private Map<String, AtomicInteger> unclosedReferenceMap;
+ private Map<TsFileID, AtomicInteger> unclosedReferenceMap;
private FileReaderManager() {
closedFileReaderMap = new ConcurrentHashMap<>();
@@ -88,14 +89,14 @@ public class FileReaderManager {
return FileReaderManagerHelper.INSTANCE;
}
- public synchronized void closeFileAndRemoveReader(String filePath) throws
IOException {
- closedReferenceMap.remove(filePath);
- TsFileSequenceReader reader = closedFileReaderMap.remove(filePath);
+ public synchronized void closeFileAndRemoveReader(TsFileID tsFileID) throws
IOException {
+ closedReferenceMap.remove(tsFileID);
+ TsFileSequenceReader reader = closedFileReaderMap.remove(tsFileID);
if (reader != null) {
reader.close();
}
- unclosedReferenceMap.remove(filePath);
- reader = unclosedFileReaderMap.remove(filePath);
+ unclosedReferenceMap.remove(tsFileID);
+ reader = unclosedFileReaderMap.remove(tsFileID);
if (reader != null) {
reader.close();
}
@@ -106,15 +107,16 @@ public class FileReaderManager {
* exists, just get it from closedFileReaderMap or unclosedFileReaderMap
depending on isClosing .
* Otherwise a new reader will be created and cached.
*
- * @param filePath the path of the file, of which the reader is desired.
+ * @param filePath the path of the tsfile
+ * @param tsFileID the id of the tsfile, of which the reader is desired.
* @param isClosed whether the corresponding file still receives insertions
or not.
* @return the reader of the file specified by filePath.
* @throws IOException when reader cannot be created.
*/
@SuppressWarnings("squid:S2095")
- public synchronized TsFileSequenceReader get(String filePath, boolean
isClosed)
+ public synchronized TsFileSequenceReader get(String filePath, TsFileID
tsFileID, boolean isClosed)
throws IOException {
- return get(filePath, isClosed, null);
+ return get(filePath, tsFileID, isClosed, null);
}
/**
@@ -122,7 +124,8 @@ public class FileReaderManager {
* exists, just get it from closedFileReaderMap or unclosedFileReaderMap
depending on isClosing .
* Otherwise a new reader will be created and cached.
*
- * @param filePath the path of the file, of which the reader is desired.
+ * @param filePath the path of the tsfile
+ * @param tsFileID the id of the tsfile, of which the reader is desired.
* @param isClosed whether the corresponding file still receives insertions
or not.
* @param ioSizeRecorder can be null
* @return the reader of the file specified by filePath.
@@ -130,11 +133,12 @@ public class FileReaderManager {
*/
@SuppressWarnings("squid:S2095")
public synchronized TsFileSequenceReader get(
- String filePath, boolean isClosed, LongConsumer ioSizeRecorder) throws
IOException {
+ String filePath, TsFileID tsFileID, boolean isClosed, LongConsumer
ioSizeRecorder)
+ throws IOException {
- Map<String, TsFileSequenceReader> readerMap =
+ Map<TsFileID, TsFileSequenceReader> readerMap =
!isClosed ? unclosedFileReaderMap : closedFileReaderMap;
- if (!readerMap.containsKey(filePath)) {
+ if (!readerMap.containsKey(tsFileID)) {
int currentOpenedReaderCount = readerMap.size();
if (currentOpenedReaderCount >= MAX_CACHED_FILE_SIZE
&& (currentOpenedReaderCount % PRINT_INTERVAL == 0)) {
@@ -149,11 +153,11 @@ public class FileReaderManager {
// already do the version check in TsFileSequenceReader's constructor
tsFileReader = new TsFileSequenceReader(filePath, ioSizeRecorder);
}
- readerMap.put(filePath, tsFileReader);
+ readerMap.put(tsFileID, tsFileReader);
return tsFileReader;
}
- return readerMap.get(filePath);
+ return readerMap.get(tsFileID);
}
/**
@@ -165,11 +169,11 @@ public class FileReaderManager {
synchronized (this) {
if (!isClosed) {
unclosedReferenceMap
- .computeIfAbsent(tsFile.getTsFilePath(), k -> new AtomicInteger())
+ .computeIfAbsent(tsFile.getTsFileID(), k -> new AtomicInteger())
.getAndIncrement();
} else {
closedReferenceMap
- .computeIfAbsent(tsFile.getTsFilePath(), k -> new AtomicInteger())
+ .computeIfAbsent(tsFile.getTsFileID(), k -> new AtomicInteger())
.getAndIncrement();
}
}
@@ -181,29 +185,30 @@ public class FileReaderManager {
*/
public void decreaseFileReaderReference(TsFileResource tsFile, boolean
isClosed) {
synchronized (this) {
- if (!isClosed &&
unclosedReferenceMap.containsKey(tsFile.getTsFilePath())) {
- if (unclosedReferenceMap.get(tsFile.getTsFilePath()).decrementAndGet()
== 0) {
- closeUnUsedReaderAndRemoveRef(tsFile.getTsFilePath(), false);
+ if (!isClosed && unclosedReferenceMap.containsKey(tsFile.getTsFileID()))
{
+ if (unclosedReferenceMap.get(tsFile.getTsFileID()).decrementAndGet()
== 0) {
+ closeUnUsedReaderAndRemoveRef(tsFile.getTsFilePath(),
tsFile.getTsFileID(), false);
}
- } else if (closedReferenceMap.containsKey(tsFile.getTsFilePath())
- && (closedReferenceMap.get(tsFile.getTsFilePath()).decrementAndGet()
== 0)) {
- closeUnUsedReaderAndRemoveRef(tsFile.getTsFilePath(), true);
+ } else if (closedReferenceMap.containsKey(tsFile.getTsFileID())
+ && (closedReferenceMap.get(tsFile.getTsFileID()).decrementAndGet()
== 0)) {
+ closeUnUsedReaderAndRemoveRef(tsFile.getTsFilePath(),
tsFile.getTsFileID(), true);
}
}
tsFile.readUnlock();
}
- private void closeUnUsedReaderAndRemoveRef(String tsFilePath, boolean
isClosed) {
- Map<String, TsFileSequenceReader> readerMap =
+ private void closeUnUsedReaderAndRemoveRef(
+ String tsFilePath, TsFileID tsFileID, boolean isClosed) {
+ Map<TsFileID, TsFileSequenceReader> readerMap =
isClosed ? closedFileReaderMap : unclosedFileReaderMap;
- Map<String, AtomicInteger> refMap = isClosed ? closedReferenceMap :
unclosedReferenceMap;
+ Map<TsFileID, AtomicInteger> refMap = isClosed ? closedReferenceMap :
unclosedReferenceMap;
synchronized (this) {
// check ref num again
- if (refMap.get(tsFilePath).get() != 0) {
+ if (refMap.get(tsFileID).get() != 0) {
return;
}
- TsFileSequenceReader reader = readerMap.get(tsFilePath);
+ TsFileSequenceReader reader = readerMap.get(tsFileID);
if (reader != null) {
try {
reader.close();
@@ -211,8 +216,8 @@ public class FileReaderManager {
logger.error("Can not close TsFileSequenceReader {} !",
reader.getFileName(), e);
}
}
- readerMap.remove(tsFilePath);
- refMap.remove(tsFilePath);
+ readerMap.remove(tsFileID);
+ refMap.remove(tsFileID);
if (resourceLogger.isDebugEnabled()) {
resourceLogger.debug("{} TsFileReader is closed because of no
reference.", tsFilePath);
}
@@ -226,10 +231,10 @@ public class FileReaderManager {
* @throws IOException if failed to close file handlers, IOException will be
thrown
*/
public synchronized void closeAndRemoveAllOpenedReaders() throws IOException
{
- Iterator<Map.Entry<String, TsFileSequenceReader>> iterator =
+ Iterator<Map.Entry<TsFileID, TsFileSequenceReader>> iterator =
closedFileReaderMap.entrySet().iterator();
while (iterator.hasNext()) {
- Map.Entry<String, TsFileSequenceReader> entry = iterator.next();
+ Map.Entry<TsFileID, TsFileSequenceReader> entry = iterator.next();
entry.getValue().close();
if (resourceLogger.isDebugEnabled()) {
resourceLogger.debug("{} closedTsFileReader is closed.",
entry.getKey());
@@ -239,7 +244,7 @@ public class FileReaderManager {
}
iterator = unclosedFileReaderMap.entrySet().iterator();
while (iterator.hasNext()) {
- Map.Entry<String, TsFileSequenceReader> entry = iterator.next();
+ Map.Entry<TsFileID, TsFileSequenceReader> entry = iterator.next();
entry.getValue().close();
if (resourceLogger.isDebugEnabled()) {
resourceLogger.debug("{} unclosedTsFileReader is closed.",
entry.getKey());
@@ -251,17 +256,17 @@ public class FileReaderManager {
/** This method is only for unit tests. */
public synchronized boolean contains(TsFileResource tsFile, boolean
isClosed) {
- return (isClosed &&
closedFileReaderMap.containsKey(tsFile.getTsFilePath()))
- || (!isClosed &&
unclosedFileReaderMap.containsKey(tsFile.getTsFilePath()));
+ return (isClosed && closedFileReaderMap.containsKey(tsFile.getTsFileID()))
+ || (!isClosed &&
unclosedFileReaderMap.containsKey(tsFile.getTsFileID()));
}
@TestOnly
- public Map<String, TsFileSequenceReader> getClosedFileReaderMap() {
+ public Map<TsFileID, TsFileSequenceReader> getClosedFileReaderMap() {
return closedFileReaderMap;
}
@TestOnly
- public Map<String, TsFileSequenceReader> getUnclosedFileReaderMap() {
+ public Map<TsFileID, TsFileSequenceReader> getUnclosedFileReaderMap() {
return unclosedFileReaderMap;
}
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/CompactionWithMinTimestampTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/CompactionWithMinTimestampTest.java
index 3f375a5c233..567c6712890 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/CompactionWithMinTimestampTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/CompactionWithMinTimestampTest.java
@@ -64,10 +64,10 @@ public class CompactionWithMinTimestampTest extends
AbstractCompactionTest {
super.tearDown();
Thread.currentThread().setName(oldThreadName);
for (TsFileResource tsFileResource : seqResources) {
-
FileReaderManager.getInstance().closeFileAndRemoveReader(tsFileResource.getTsFilePath());
+
FileReaderManager.getInstance().closeFileAndRemoveReader(tsFileResource.getTsFileID());
}
for (TsFileResource tsFileResource : unseqResources) {
-
FileReaderManager.getInstance().closeFileAndRemoveReader(tsFileResource.getTsFilePath());
+
FileReaderManager.getInstance().closeFileAndRemoveReader(tsFileResource.getTsFileID());
}
}
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/FastAlignedCrossCompactionTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/FastAlignedCrossCompactionTest.java
index 3ed01d101b3..f4c59e8743d 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/FastAlignedCrossCompactionTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/FastAlignedCrossCompactionTest.java
@@ -78,10 +78,10 @@ public class FastAlignedCrossCompactionTest extends
AbstractCompactionTest {
public void tearDown() throws IOException, StorageEngineException {
super.tearDown();
for (TsFileResource tsFileResource : seqResources) {
-
FileReaderManager.getInstance().closeFileAndRemoveReader(tsFileResource.getTsFilePath());
+
FileReaderManager.getInstance().closeFileAndRemoveReader(tsFileResource.getTsFileID());
}
for (TsFileResource tsFileResource : unseqResources) {
-
FileReaderManager.getInstance().closeFileAndRemoveReader(tsFileResource.getTsFilePath());
+
FileReaderManager.getInstance().closeFileAndRemoveReader(tsFileResource.getTsFileID());
}
}
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/FastCrossCompactionPerformerTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/FastCrossCompactionPerformerTest.java
index 011bbf71a2a..25f3acd89ee 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/FastCrossCompactionPerformerTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/FastCrossCompactionPerformerTest.java
@@ -95,10 +95,10 @@ public class FastCrossCompactionPerformerTest extends
AbstractCompactionTest {
validateSeqFiles();
super.tearDown();
for (TsFileResource tsFileResource : seqResources) {
-
FileReaderManager.getInstance().closeFileAndRemoveReader(tsFileResource.getTsFilePath());
+
FileReaderManager.getInstance().closeFileAndRemoveReader(tsFileResource.getTsFileID());
}
for (TsFileResource tsFileResource : unseqResources) {
-
FileReaderManager.getInstance().closeFileAndRemoveReader(tsFileResource.getTsFilePath());
+
FileReaderManager.getInstance().closeFileAndRemoveReader(tsFileResource.getTsFileID());
}
targetResources.clear();
}
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/FastInnerCompactionPerformerTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/FastInnerCompactionPerformerTest.java
index 2b63981c767..d75d7c4ede7 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/FastInnerCompactionPerformerTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/FastInnerCompactionPerformerTest.java
@@ -96,10 +96,10 @@ public class FastInnerCompactionPerformerTest extends
AbstractCompactionTest {
public void tearDown() throws IOException, StorageEngineException {
super.tearDown();
for (TsFileResource tsFileResource : seqResources) {
-
FileReaderManager.getInstance().closeFileAndRemoveReader(tsFileResource.getTsFilePath());
+
FileReaderManager.getInstance().closeFileAndRemoveReader(tsFileResource.getTsFileID());
}
for (TsFileResource tsFileResource : unseqResources) {
-
FileReaderManager.getInstance().closeFileAndRemoveReader(tsFileResource.getTsFilePath());
+
FileReaderManager.getInstance().closeFileAndRemoveReader(tsFileResource.getTsFileID());
}
IoTDBDescriptor.getInstance()
.getConfig()
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/FastNonAlignedCrossCompactionTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/FastNonAlignedCrossCompactionTest.java
index 0b6312bc9cb..8d4b5131c7a 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/FastNonAlignedCrossCompactionTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/FastNonAlignedCrossCompactionTest.java
@@ -80,10 +80,10 @@ public class FastNonAlignedCrossCompactionTest extends
AbstractCompactionTest {
public void tearDown() throws IOException, StorageEngineException {
super.tearDown();
for (TsFileResource tsFileResource : seqResources) {
-
FileReaderManager.getInstance().closeFileAndRemoveReader(tsFileResource.getTsFilePath());
+
FileReaderManager.getInstance().closeFileAndRemoveReader(tsFileResource.getTsFileID());
}
for (TsFileResource tsFileResource : unseqResources) {
-
FileReaderManager.getInstance().closeFileAndRemoveReader(tsFileResource.getTsFilePath());
+
FileReaderManager.getInstance().closeFileAndRemoveReader(tsFileResource.getTsFileID());
}
}
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/ReadChunkInnerCompactionTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/ReadChunkInnerCompactionTest.java
index 9d02499f28f..972db81b20a 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/ReadChunkInnerCompactionTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/ReadChunkInnerCompactionTest.java
@@ -95,10 +95,10 @@ public class ReadChunkInnerCompactionTest extends
AbstractCompactionTest {
public void tearDown() throws IOException, StorageEngineException {
super.tearDown();
for (TsFileResource tsFileResource : seqResources) {
-
FileReaderManager.getInstance().closeFileAndRemoveReader(tsFileResource.getTsFilePath());
+
FileReaderManager.getInstance().closeFileAndRemoveReader(tsFileResource.getTsFileID());
}
for (TsFileResource tsFileResource : unseqResources) {
-
FileReaderManager.getInstance().closeFileAndRemoveReader(tsFileResource.getTsFilePath());
+
FileReaderManager.getInstance().closeFileAndRemoveReader(tsFileResource.getTsFileID());
}
}
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/ReadPointAlignedCrossCompactionTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/ReadPointAlignedCrossCompactionTest.java
index 69fb5e9f5d7..f96cdf85cda 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/ReadPointAlignedCrossCompactionTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/ReadPointAlignedCrossCompactionTest.java
@@ -81,10 +81,10 @@ public class ReadPointAlignedCrossCompactionTest extends
AbstractCompactionTest
super.tearDown();
Thread.currentThread().setName(oldThreadName);
for (TsFileResource tsFileResource : seqResources) {
-
FileReaderManager.getInstance().closeFileAndRemoveReader(tsFileResource.getTsFilePath());
+
FileReaderManager.getInstance().closeFileAndRemoveReader(tsFileResource.getTsFileID());
}
for (TsFileResource tsFileResource : unseqResources) {
-
FileReaderManager.getInstance().closeFileAndRemoveReader(tsFileResource.getTsFilePath());
+
FileReaderManager.getInstance().closeFileAndRemoveReader(tsFileResource.getTsFileID());
}
}
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/ReadPointCompactionPerformerTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/ReadPointCompactionPerformerTest.java
index 65163221af4..f21571ce4f8 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/ReadPointCompactionPerformerTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/ReadPointCompactionPerformerTest.java
@@ -88,10 +88,10 @@ public class ReadPointCompactionPerformerTest extends
AbstractCompactionTest {
super.tearDown();
Thread.currentThread().setName(oldThreadName);
for (TsFileResource tsFileResource : seqResources) {
-
FileReaderManager.getInstance().closeFileAndRemoveReader(tsFileResource.getTsFilePath());
+
FileReaderManager.getInstance().closeFileAndRemoveReader(tsFileResource.getTsFileID());
}
for (TsFileResource tsFileResource : unseqResources) {
-
FileReaderManager.getInstance().closeFileAndRemoveReader(tsFileResource.getTsFilePath());
+
FileReaderManager.getInstance().closeFileAndRemoveReader(tsFileResource.getTsFileID());
}
}
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/ReadPointNonAlignedCrossCompactionTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/ReadPointNonAlignedCrossCompactionTest.java
index 0ccf61b560c..645fb0d781b 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/ReadPointNonAlignedCrossCompactionTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/ReadPointNonAlignedCrossCompactionTest.java
@@ -82,10 +82,10 @@ public class ReadPointNonAlignedCrossCompactionTest extends
AbstractCompactionTe
super.tearDown();
Thread.currentThread().setName(oldThreadName);
for (TsFileResource tsFileResource : seqResources) {
-
FileReaderManager.getInstance().closeFileAndRemoveReader(tsFileResource.getTsFilePath());
+
FileReaderManager.getInstance().closeFileAndRemoveReader(tsFileResource.getTsFileID());
}
for (TsFileResource tsFileResource : unseqResources) {
-
FileReaderManager.getInstance().closeFileAndRemoveReader(tsFileResource.getTsFilePath());
+
FileReaderManager.getInstance().closeFileAndRemoveReader(tsFileResource.getTsFileID());
}
}
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/cross/CrossSpaceCompactionSelectorTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/cross/CrossSpaceCompactionSelectorTest.java
index a17d52e75f8..0a33a91799a 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/cross/CrossSpaceCompactionSelectorTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/cross/CrossSpaceCompactionSelectorTest.java
@@ -63,10 +63,10 @@ public class CrossSpaceCompactionSelectorTest extends
AbstractCompactionTest {
public void tearDown() throws IOException, StorageEngineException {
super.tearDown();
for (TsFileResource tsFileResource : seqResources) {
-
FileReaderManager.getInstance().closeFileAndRemoveReader(tsFileResource.getTsFilePath());
+
FileReaderManager.getInstance().closeFileAndRemoveReader(tsFileResource.getTsFileID());
}
for (TsFileResource tsFileResource : unseqResources) {
-
FileReaderManager.getInstance().closeFileAndRemoveReader(tsFileResource.getTsFilePath());
+
FileReaderManager.getInstance().closeFileAndRemoveReader(tsFileResource.getTsFileID());
}
}
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/inner/InnerSpaceCompactionSelectorTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/inner/InnerSpaceCompactionSelectorTest.java
index 325901312b2..6872ab6b762 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/inner/InnerSpaceCompactionSelectorTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/inner/InnerSpaceCompactionSelectorTest.java
@@ -58,10 +58,10 @@ public class InnerSpaceCompactionSelectorTest extends
AbstractCompactionTest {
public void tearDown() throws IOException, StorageEngineException {
super.tearDown();
for (TsFileResource tsFileResource : seqResources) {
-
FileReaderManager.getInstance().closeFileAndRemoveReader(tsFileResource.getTsFilePath());
+
FileReaderManager.getInstance().closeFileAndRemoveReader(tsFileResource.getTsFileID());
}
for (TsFileResource tsFileResource : unseqResources) {
-
FileReaderManager.getInstance().closeFileAndRemoveReader(tsFileResource.getTsFilePath());
+
FileReaderManager.getInstance().closeFileAndRemoveReader(tsFileResource.getTsFileID());
}
}
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/tablemodel/TableModelReadChunkCompactionPerformerTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/tablemodel/TableModelReadChunkCompactionPerformerTest.java
index a294ba01485..7c175a16c84 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/tablemodel/TableModelReadChunkCompactionPerformerTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/tablemodel/TableModelReadChunkCompactionPerformerTest.java
@@ -64,10 +64,10 @@ public class TableModelReadChunkCompactionPerformerTest
extends AbstractCompacti
super.tearDown();
Thread.currentThread().setName(oldThreadName);
for (TsFileResource tsFileResource : seqResources) {
-
FileReaderManager.getInstance().closeFileAndRemoveReader(tsFileResource.getTsFilePath());
+
FileReaderManager.getInstance().closeFileAndRemoveReader(tsFileResource.getTsFileID());
}
for (TsFileResource tsFileResource : unseqResources) {
-
FileReaderManager.getInstance().closeFileAndRemoveReader(tsFileResource.getTsFilePath());
+
FileReaderManager.getInstance().closeFileAndRemoveReader(tsFileResource.getTsFileID());
}
}
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/tablemodel/TableModelReadPointCompactionPerformerTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/tablemodel/TableModelReadPointCompactionPerformerTest.java
index 1cbb803d529..740c2434fdb 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/tablemodel/TableModelReadPointCompactionPerformerTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/tablemodel/TableModelReadPointCompactionPerformerTest.java
@@ -59,10 +59,10 @@ public class TableModelReadPointCompactionPerformerTest
extends AbstractCompacti
super.tearDown();
Thread.currentThread().setName(oldThreadName);
for (TsFileResource tsFileResource : seqResources) {
-
FileReaderManager.getInstance().closeFileAndRemoveReader(tsFileResource.getTsFilePath());
+
FileReaderManager.getInstance().closeFileAndRemoveReader(tsFileResource.getTsFileID());
}
for (TsFileResource tsFileResource : unseqResources) {
-
FileReaderManager.getInstance().closeFileAndRemoveReader(tsFileResource.getTsFilePath());
+
FileReaderManager.getInstance().closeFileAndRemoveReader(tsFileResource.getTsFileID());
}
}
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/utils/MultiTsFileDeviceIteratorTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/utils/MultiTsFileDeviceIteratorTest.java
index 49259236aa9..1180247a2d3 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/utils/MultiTsFileDeviceIteratorTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/utils/MultiTsFileDeviceIteratorTest.java
@@ -81,10 +81,10 @@ public class MultiTsFileDeviceIteratorTest extends
AbstractCompactionTest {
public void tearDown() throws IOException, StorageEngineException {
super.tearDown();
for (TsFileResource tsFileResource : seqResources) {
-
FileReaderManager.getInstance().closeFileAndRemoveReader(tsFileResource.getTsFilePath());
+
FileReaderManager.getInstance().closeFileAndRemoveReader(tsFileResource.getTsFileID());
}
for (TsFileResource tsFileResource : unseqResources) {
-
FileReaderManager.getInstance().closeFileAndRemoveReader(tsFileResource.getTsFilePath());
+
FileReaderManager.getInstance().closeFileAndRemoveReader(tsFileResource.getTsFileID());
}
Thread.currentThread().setName(oldThreadName);
}
