[incubator-iotdb] branch fix_closed_channel_issue updated: test windows file close problem

[caogaofei]

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

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


The following commit(s) were added to refs/heads/fix_closed_channel_issue by 
this push:
     new 03d8cab  test windows file close problem
03d8cab is described below

commit 03d8cab5a6f14a269832cddc8fb6d1eeb769c621
Author: CGF <cgf1...@foxmail.com>
AuthorDate: Sun Mar 24 20:42:32 2019 +0800

    test windows file close problem
---
 .../apache/iotdb/db/engine/filenode/FileNodeProcessor.java   | 12 ++++++------
 .../apache/iotdb/db/query/factory/SeriesReaderFactory.java   |  8 ++++----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git 
a/iotdb/src/main/java/org/apache/iotdb/db/engine/filenode/FileNodeProcessor.java
 
b/iotdb/src/main/java/org/apache/iotdb/db/engine/filenode/FileNodeProcessor.java
index b873d58..78b3696 100644
--- 
a/iotdb/src/main/java/org/apache/iotdb/db/engine/filenode/FileNodeProcessor.java
+++ 
b/iotdb/src/main/java/org/apache/iotdb/db/engine/filenode/FileNodeProcessor.java
@@ -1554,12 +1554,12 @@ public class FileNodeProcessor extends Processor 
implements IStatistic {
         seriesWriterImpl.writeToFileWriter(mergeFileWriter);
       }
     } finally {
-      
FileReaderManager.getInstance().decreaseFileReaderReference(tsFileResource.getFilePath(),
-              true);
-      for (OverflowInsertFile overflowInsertFile : 
overflowSeriesDataSource.getOverflowInsertFileList()) {
-        
FileReaderManager.getInstance().decreaseFileReaderReference(overflowInsertFile.getFilePath(),
-                false);
-      }
+//      
FileReaderManager.getInstance().decreaseFileReaderReference(tsFileResource.getFilePath(),
+//              true);
+//      for (OverflowInsertFile overflowInsertFile : 
overflowSeriesDataSource.getOverflowInsertFileList()) {
+//        
FileReaderManager.getInstance().decreaseFileReaderReference(overflowInsertFile.getFilePath(),
+//                false);
+//      }
     }
     return numOfChunk;
   }
diff --git 
a/iotdb/src/main/java/org/apache/iotdb/db/query/factory/SeriesReaderFactory.java
 
b/iotdb/src/main/java/org/apache/iotdb/db/query/factory/SeriesReaderFactory.java
index 2329540..e22d7ce 100644
--- 
a/iotdb/src/main/java/org/apache/iotdb/db/query/factory/SeriesReaderFactory.java
+++ 
b/iotdb/src/main/java/org/apache/iotdb/db/query/factory/SeriesReaderFactory.java
@@ -81,8 +81,8 @@ public class SeriesReaderFactory {
 
       // add current overflowInsertFile reference to FileReaderManager
       // to avoid that this reader is cleared in fix time
-      
FileReaderManager.getInstance().increaseFileReaderReference(overflowInsertFile.getFilePath(),
-              false);
+//      
FileReaderManager.getInstance().increaseFileReaderReference(overflowInsertFile.getFilePath(),
+//              false);
 
       // store only one opened file stream into manager, to avoid too many 
opened files
       TsFileSequenceReader unClosedTsFileReader = 
FileReaderManager.getInstance()
@@ -168,8 +168,8 @@ public class SeriesReaderFactory {
 
     // add current tsfile reference to FileReaderManager
     // to avoid that this reader is cleared in fix time
-    
FileReaderManager.getInstance().increaseFileReaderReference(fileNode.getFilePath(),
-            true);
+//    
FileReaderManager.getInstance().increaseFileReaderReference(fileNode.getFilePath(),
+//            true);
 
     TsFileSequenceReader tsFileSequenceReader = FileReaderManager.getInstance()
         .get(fileNode.getFilePath(), true);