jt2594838 commented on a change in pull request #1169:
URL: https://github.com/apache/incubator-iotdb/pull/1169#discussion_r427948610
##########
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()) {
Review comment:
Yes, and we will leave this for merge.
----------------------------------------------------------------
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]
