jixuan1989 commented on a change in pull request #1169:
URL: https://github.com/apache/incubator-iotdb/pull/1169#discussion_r429718370
##########
File path:
server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java
##########
@@ -1875,35 +1918,52 @@ public void removeFullyOverlapFiles(TsFileResource
resource) {
closeQueryLock.writeLock().lock();
try {
Iterator<TsFileResource> iterator = sequenceFileTreeSet.iterator();
- removeFullyOverlapFiles(resource, iterator);
+ removeFullyOverlapFiles(resource, iterator, true);
iterator = unSequenceFileList.iterator();
- removeFullyOverlapFiles(resource, iterator);
+ removeFullyOverlapFiles(resource, iterator, false);
} finally {
closeQueryLock.writeLock().unlock();
writeUnlock();
}
}
- private void removeFullyOverlapFiles(TsFileResource resource,
Iterator<TsFileResource> iterator) {
+ private void removeFullyOverlapFiles(TsFileResource newTsFile,
Iterator<TsFileResource> iterator
+ , boolean isSeq) {
while (iterator.hasNext()) {
- TsFileResource seqFile = iterator.next();
- if
(resource.getHistoricalVersions().containsAll(seqFile.getHistoricalVersions())
- &&
!resource.getHistoricalVersions().equals(seqFile.getHistoricalVersions())
- && seqFile.getWriteQueryLock().writeLock().tryLock()) {
+ TsFileResource existingTsFile = iterator.next();
+ if
(newTsFile.getHistoricalVersions().containsAll(existingTsFile.getHistoricalVersions())
+ &&
!newTsFile.getHistoricalVersions().equals(existingTsFile.getHistoricalVersions())
+ && existingTsFile.tryWriteLock()) {
try {
- iterator.remove();
- seqFile.remove();
+ removeFullyOverlapFile(existingTsFile, iterator, isSeq);
} catch (Exception e) {
logger.error("Something gets wrong while removing FullyOverlapFiles
", e);
throw e;
} finally {
- seqFile.getWriteQueryLock().writeLock().unlock();
+ existingTsFile.writeUnlock();
}
}
}
}
+ private void removeFullyOverlapFile(TsFileResource tsFileResource,
Iterator<TsFileResource> iterator
+ , boolean isSeq) {
+ if (!tsFileResource.isClosed()) {
+ // also remove the TsFileProcessor if the overlapped file is not closed
+ long timePartition = tsFileResource.getTimePartition();
+ Map<Long, TsFileProcessor> fileProcessorMap = isSeq ?
workSequenceTsFileProcessors :
+ workUnsequenceTsFileProcessors;
+ TsFileProcessor tsFileProcessor = fileProcessorMap.get(timePartition);
+ if (tsFileProcessor != null && tsFileProcessor.getTsFileResource() ==
tsFileResource) {
+ tsFileProcessor.syncClose();
Review comment:
added
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
