[incubator-iotdb] branch ut_close_socket updated: for debug reader and writer

[hx...@apache.org]

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 0daa791  for debug reader and writer
0daa791 is described below

commit 0daa79145a1e4c3c9cd511730b9569a946e898f1
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Wed Feb 19 00:00:52 2020 +0800

    for debug reader and writer
---
 .../main/java/org/apache/iotdb/tsfile/read/TsFileSequenceReader.java | 2 ++
 .../apache/iotdb/tsfile/write/writer/ForceAppendTsFileWriter.java    | 5 ++++-
 .../apache/iotdb/tsfile/write/writer/RestorableTsFileIOWriter.java   | 1 +
 .../java/org/apache/iotdb/tsfile/write/writer/TsFileIOWriter.java    | 3 ++-
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/TsFileSequenceReader.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/TsFileSequenceReader.java
index 3b18933..8e64a44 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/read/TsFileSequenceReader.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/read/TsFileSequenceReader.java
@@ -92,6 +92,7 @@ public class TsFileSequenceReader implements AutoCloseable {
    * @param loadMetadataSize -whether load meta data size
    */
   public TsFileSequenceReader(String file, boolean loadMetadataSize) throws IOException {
+    logger.error("{} reader is opened.", file);
     this.file = file;
     tsFileInput = FSFactoryProducer.getFileInputFactory().getTsFileInput(file);
     // old version number of TsFile using little endian starts with "v"
@@ -466,6 +467,7 @@ public class TsFileSequenceReader implements AutoCloseable {
   }
 
   public void close() throws IOException {
+    logger.error("{} reader is closed.", file);
     this.tsFileInput.close();
     deviceMetadataMap = null;
   }
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/ForceAppendTsFileWriter.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/ForceAppendTsFileWriter.java
index b42efe7..1d74d7b 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/ForceAppendTsFileWriter.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/ForceAppendTsFileWriter.java
@@ -27,6 +27,8 @@ import org.apache.iotdb.tsfile.file.metadata.TsDeviceMetadataIndex;
 import org.apache.iotdb.tsfile.file.metadata.TsFileMetaData;
 import org.apache.iotdb.tsfile.read.TsFileSequenceReader;
 import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * ForceAppendTsFileWriter opens a COMPLETE TsFile, reads and truncate its metadata to support
@@ -36,8 +38,9 @@ public class ForceAppendTsFileWriter extends TsFileIOWriter{
 
   private Map<String, MeasurementSchema> knownSchemas;
   private long truncatePosition;
-
+  private static Logger logger = LoggerFactory.getLogger(ForceAppendTsFileWriter.class);
   public ForceAppendTsFileWriter(File file) throws IOException {
+    logger.error("{} is opened.", file.getName());
     this.out = new DefaultTsFileOutput(file, true);
     this.file = file;
 
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/RestorableTsFileIOWriter.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/RestorableTsFileIOWriter.java
index 3dc8cb5..091ad7e 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/RestorableTsFileIOWriter.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/RestorableTsFileIOWriter.java
@@ -71,6 +71,7 @@ public class RestorableTsFileIOWriter extends TsFileIOWriter {
    * @throws IOException if write failed, or the file is broken but autoRepair==false.
    */
   public RestorableTsFileIOWriter(File file) throws IOException {
+    logger.error("{} is opened.", file.getName());
     this.file = file;
     this.out = FSFactoryProducer.getFileOutputFactory().getTsFileOutput(file.getPath(), true);
 
diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/TsFileIOWriter.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/TsFileIOWriter.java
index c38be5e..a9f963e 100644
--- a/tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/TsFileIOWriter.java
+++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/write/writer/TsFileIOWriter.java
@@ -94,6 +94,7 @@ public class TsFileIOWriter {
   public TsFileIOWriter(File file) throws IOException {
     this.out = new DefaultTsFileOutput(file);
     this.file = file;
+    logger.error("{} is opened.", file.getName());
     startFile();
   }
 
@@ -253,8 +254,8 @@ public class TsFileIOWriter {
     out.write(magicStringBytes);
 
     // close file
-    logger.error("{} is closed.", file.getName());
     out.close();
+    logger.error("{} is closed.", file.getName());
     canWrite = false;
     logger.info("output stream is closed");
   }