[incubator-iotdb] branch FileClosedDebug updated: prove

[jackietien]

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 e1b41e8  prove
e1b41e8 is described below

commit e1b41e8b870203e0982d8b0d42c2f8a9550967e4
Author: JackieTien97 <jackiet...@foxmail.com>
AuthorDate: Wed Feb 26 15:40:05 2020 +0800

    prove
---
 .../iotdb/db/query/control/FileReaderManager.java  | 10 +++++-----
 .../tsfile/read/reader/DefaultTsFileInput.java     | 22 +++++++++++-----------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git 
a/server/src/main/java/org/apache/iotdb/db/query/control/FileReaderManager.java 
b/server/src/main/java/org/apache/iotdb/db/query/control/FileReaderManager.java
index 5a68465..64b9638 100644
--- 
a/server/src/main/java/org/apache/iotdb/db/query/control/FileReaderManager.java
+++ 
b/server/src/main/java/org/apache/iotdb/db/query/control/FileReaderManager.java
@@ -123,11 +123,11 @@ public class FileReaderManager implements IService {
       AtomicInteger refAtom = refMap.get(entry.getKey());
 
       if (refAtom != null && refAtom.get() == 0) {
-        try {
-          reader.close("no reference");
-        } catch (IOException e) {
-          logger.error("Can not close TsFileSequenceReader {} !", 
reader.getFileName(), e);
-        }
+//        try {
+//          reader.close("no reference");
+//        } catch (IOException e) {
+//          logger.error("Can not close TsFileSequenceReader {} !", 
reader.getFileName(), e);
+//        }
         iterator.remove();
         refMap.remove(entry.getKey());
       }
diff --git 
a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/DefaultTsFileInput.java
 
b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/DefaultTsFileInput.java
index b29dcd2..42da61d 100644
--- 
a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/DefaultTsFileInput.java
+++ 
b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/reader/DefaultTsFileInput.java
@@ -66,10 +66,10 @@ public class DefaultTsFileInput implements TsFileInput {
 
   @Override
   public int read(ByteBuffer dst, long position) throws IOException {
-    if (!channel.isOpen()) {
-      LOGGER.error("File is closed while reading {}", path.toString());
-      channel = FileChannel.open(path, StandardOpenOption.READ);
-    }
+//    if (!channel.isOpen()) {
+//      LOGGER.error("File is closed while reading {}", path.toString());
+//      channel = FileChannel.open(path, StandardOpenOption.READ);
+//    }
     return channel.read(dst, position);
   }
 
@@ -96,13 +96,13 @@ public class DefaultTsFileInput implements TsFileInput {
   @Override
   public void close() throws IOException {
     LOGGER.error("{} FileChannel is closed", path);
-    Throwable ex = new Throwable();
-    StackTraceElement[] stackElements = ex.getStackTrace();
-    if (stackElements != null) {
-      for (StackTraceElement stackElement : stackElements) {
-        LOGGER.error("Class Name: {}, Function Name: {}, Line: {}", 
stackElement.getClassName(), stackElement.getMethodName(), 
stackElement.getLineNumber());
-      }
-    }
+//    Throwable ex = new Throwable();
+//    StackTraceElement[] stackElements = ex.getStackTrace();
+//    if (stackElements != null) {
+//      for (StackTraceElement stackElement : stackElements) {
+//        LOGGER.error("Class Name: {}, Function Name: {}, Line: {}", 
stackElement.getClassName(), stackElement.getMethodName(), 
stackElement.getLineNumber());
+//      }
+//    }
     channel.close();
   }