[iotdb] branch rel/0.12 updated: Each tsFile only increases the reference count once in a query process (#4560)

[jackietien]

This is an automated email from the ASF dual-hosted git repository.

jackietien pushed a commit to branch rel/0.12
in repository https://gitbox.apache.org/repos/asf/iotdb.git


The following commit(s) were added to refs/heads/rel/0.12 by this push:
     new d8efdec  Each tsFile only increases the reference count once in a 
query process (#4560)
d8efdec is described below

commit d8efdec4a47f01c02c9d763839904a94f3e3426f
Author: liuminghui233 <36565497+liuminghui...@users.noreply.github.com>
AuthorDate: Mon Dec 13 16:47:55 2021 +0800

    Each tsFile only increases the reference count once in a query process 
(#4560)
---
 .../iotdb/cluster/query/reader/ClusterReaderFactoryTest.java      | 3 +--
 .../org/apache/iotdb/db/query/control/QueryResourceManager.java   | 8 ++++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git 
a/cluster/src/test/java/org/apache/iotdb/cluster/query/reader/ClusterReaderFactoryTest.java
 
b/cluster/src/test/java/org/apache/iotdb/cluster/query/reader/ClusterReaderFactoryTest.java
index dd3ccc4..11d2a31 100644
--- 
a/cluster/src/test/java/org/apache/iotdb/cluster/query/reader/ClusterReaderFactoryTest.java
+++ 
b/cluster/src/test/java/org/apache/iotdb/cluster/query/reader/ClusterReaderFactoryTest.java
@@ -36,7 +36,6 @@ import java.io.IOException;
 import java.util.Collections;
 
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
 
 public class ClusterReaderFactoryTest extends BaseQueryTest {
 
@@ -73,7 +72,7 @@ public class ClusterReaderFactoryTest extends BaseQueryTest {
                   context,
                   dataGroupMemberMap.get(TestUtils.getNode(10)),
                   true);
-      assertNull(seriesReader);
+      assertNotNull(seriesReader);
     } finally {
       QueryResourceManager.getInstance().endQuery(context.getQueryId());
       StorageEngine.getInstance().setTTL(new 
PartialPath(TestUtils.getTestSg(0)), Long.MAX_VALUE);
diff --git 
a/server/src/main/java/org/apache/iotdb/db/query/control/QueryResourceManager.java
 
b/server/src/main/java/org/apache/iotdb/db/query/control/QueryResourceManager.java
index f10b1d0..3ee86f4 100644
--- 
a/server/src/main/java/org/apache/iotdb/db/query/control/QueryResourceManager.java
+++ 
b/server/src/main/java/org/apache/iotdb/db/query/control/QueryResourceManager.java
@@ -134,6 +134,10 @@ public class QueryResourceManager {
       cachedQueryDataSourcesMap
           .computeIfAbsent(queryId, k -> new HashMap<>())
           .put(storageGroupPath, cachedQueryDataSource);
+
+      // used files should be added before mergeLock is unlocked, or they may 
be deleted by running
+      // merge
+      filePathsManager.addUsedFilesForQuery(context.getQueryId(), 
cachedQueryDataSource);
     }
 
     // set query time lower bound according TTL
@@ -191,10 +195,6 @@ public class QueryResourceManager {
       }
     }
 
-    // used files should be added before mergeLock is unlocked, or they may be 
deleted by running
-    // merge
-    filePathsManager.addUsedFilesForQuery(context.getQueryId(), 
queryDataSource);
-
     // calculate the read order of unseqResources
     QueryUtils.fillOrderIndexes(queryDataSource, deviceId, 
context.isAscending());