[incubator-iotdb] branch ut_close_socket updated: fix a reader not closed before delete data in UT

[hxd]

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

hxd pushed a commit to branch ut_close_socket
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git


The following commit(s) were added to refs/heads/ut_close_socket by this push:
     new f9da016  fix a reader not closed before delete data in UT
f9da016 is described below

commit f9da016369a6c94d19c7be142bea243618c4c803
Author: xiangdong huang <saint...@gmail.com>
AuthorDate: Thu Feb 20 07:21:12 2020 +0800

    fix a reader not closed before delete data in UT
---
 .../test/java/org/apache/iotdb/db/query/reader/ReaderTestHelper.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git 
a/server/src/test/java/org/apache/iotdb/db/query/reader/ReaderTestHelper.java 
b/server/src/test/java/org/apache/iotdb/db/query/reader/ReaderTestHelper.java
index 09a265c..44245d7 100644
--- 
a/server/src/test/java/org/apache/iotdb/db/query/reader/ReaderTestHelper.java
+++ 
b/server/src/test/java/org/apache/iotdb/db/query/reader/ReaderTestHelper.java
@@ -28,6 +28,7 @@ import 
org.apache.iotdb.db.engine.storagegroup.StorageGroupProcessor;
 import org.apache.iotdb.db.exception.query.QueryProcessException;
 import org.apache.iotdb.db.metadata.MManager;
 import org.apache.iotdb.db.qp.physical.crud.InsertPlan;
+import org.apache.iotdb.db.query.control.FileReaderManager;
 import org.apache.iotdb.db.utils.EnvironmentUtils;
 import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
 import org.apache.iotdb.tsfile.write.record.TSRecord;
@@ -59,8 +60,9 @@ public abstract class ReaderTestHelper {
 
   @After
   public void tearDown() throws Exception {
-    EnvironmentUtils.cleanEnv();
+    FileReaderManager.getInstance().closeAndRemoveAllOpenedReaders();
     storageGroupProcessor.syncDeleteDataFiles();
+    EnvironmentUtils.cleanEnv();
     EnvironmentUtils.cleanDir(systemDir);
   }