You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ja...@apache.org on 2020/02/25 07:54:11 UTC
[incubator-iotdb] branch FileClosedDebug updated: change some remove
This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a commit to branch FileClosedDebug
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
The following commit(s) were added to refs/heads/FileClosedDebug by this push:
new bd7944d change some remove
bd7944d is described below
commit bd7944d1b6f0320c3232352309319e43a23ef252
Author: JackieTien97 <Ja...@foxmail.com>
AuthorDate: Tue Feb 25 15:53:53 2020 +0800
change some remove
---
.../apache/iotdb/db/query/control/QueryFileManager.java | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/query/control/QueryFileManager.java b/server/src/main/java/org/apache/iotdb/db/query/control/QueryFileManager.java
index ad2cfd2..42c08c0 100644
--- a/server/src/main/java/org/apache/iotdb/db/query/control/QueryFileManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/query/control/QueryFileManager.java
@@ -18,14 +18,11 @@
*/
package org.apache.iotdb.db.query.control;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import org.apache.iotdb.db.engine.storagegroup.TsFileResource;
import org.apache.iotdb.db.engine.querycontext.QueryDataSource;
+import org.apache.iotdb.db.engine.storagegroup.TsFileResource;
+
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
/**
* <p>
@@ -77,8 +74,9 @@ public class QueryFileManager {
// this file may be deleted just before we lock it
if (tsFileResource.isDeleted()) {
Map<Long, Set<TsFileResource>> pathMap = !isClosed ? unsealedFilePathsMap : sealedFilePathsMap;
- pathMap.get(queryId).remove(tsFileResource);
- FileReaderManager.getInstance().decreaseFileReaderReference(tsFileResource, isClosed);
+ if (pathMap.get(queryId).remove(tsFileResource)) {
+ FileReaderManager.getInstance().decreaseFileReaderReference(tsFileResource, isClosed);
+ }
iterator.remove();
}
}