[iotdb] branch rel/0.12 updated: [To rel/0.12] [IOTDB-3120] Print the tsfile name when meet IOException (#5835)

[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 eb4be599ec [To rel/0.12] [IOTDB-3120] Print the tsfile name when meet 
IOException (#5835)
eb4be599ec is described below

commit eb4be599ecda841eefd5015446cc0a301a3b8e5b
Author: Jackie Tien <jackietie...@gmail.com>
AuthorDate: Mon May 9 15:17:21 2022 +0800

    [To rel/0.12] [IOTDB-3120] Print the tsfile name when meet IOException 
(#5835)
---
 .../iotdb/tsfile/read/TsFileSequenceReader.java    | 23 +++++++++++-----------
 1 file changed, 11 insertions(+), 12 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 7759d4e307..b7727c3f92 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
@@ -55,7 +55,6 @@ import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.io.IOException;
-import java.nio.BufferOverflowException;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -260,7 +259,7 @@ public class TsFileSequenceReader implements AutoCloseable {
         tsFileMetaData =
             TsFileMetadata.deserializeFrom(readData(fileMetadataPos, 
fileMetadataSize));
       }
-    } catch (BufferOverflowException e) {
+    } catch (Exception e) {
       logger.error("Something error happened while reading file metadata of 
file {}", file);
       throw e;
     }
@@ -341,7 +340,7 @@ public class TsFileSequenceReader implements AutoCloseable {
     if 
(!metadataIndexNode.getNodeType().equals(MetadataIndexNodeType.LEAF_MEASUREMENT))
 {
       try {
         metadataIndexNode = MetadataIndexNode.deserializeFrom(buffer);
-      } catch (BufferOverflowException e) {
+      } catch (Exception e) {
         logger.error(METADATA_INDEX_NODE_DESERIALIZE_ERROR, file);
         throw e;
       }
@@ -356,7 +355,7 @@ public class TsFileSequenceReader implements AutoCloseable {
     while (buffer.hasRemaining()) {
       try {
         timeseriesMetadataList.add(TimeseriesMetadata.deserializeFrom(buffer, 
true));
-      } catch (BufferOverflowException e) {
+      } catch (Exception e) {
         logger.error(
             "Something error happened while deserializing TimeseriesMetadata 
of file {}", file);
         throw e;
@@ -386,7 +385,7 @@ public class TsFileSequenceReader implements AutoCloseable {
     if 
(!metadataIndexNode.getNodeType().equals(MetadataIndexNodeType.LEAF_MEASUREMENT))
 {
       try {
         metadataIndexNode = MetadataIndexNode.deserializeFrom(buffer);
-      } catch (BufferOverflowException e) {
+      } catch (Exception e) {
         logger.error(METADATA_INDEX_NODE_DESERIALIZE_ERROR, file);
         throw e;
       }
@@ -402,7 +401,7 @@ public class TsFileSequenceReader implements AutoCloseable {
       TimeseriesMetadata timeseriesMetadata;
       try {
         timeseriesMetadata = TimeseriesMetadata.deserializeFrom(buffer, true);
-      } catch (BufferOverflowException e) {
+      } catch (Exception e) {
         logger.error(
             "Something error happened while deserializing TimeseriesMetadata 
of file {}", file);
         throw e;
@@ -437,7 +436,7 @@ public class TsFileSequenceReader implements AutoCloseable {
       if 
(!metadataIndexNode.getNodeType().equals(MetadataIndexNodeType.LEAF_MEASUREMENT))
 {
         try {
           metadataIndexNode = MetadataIndexNode.deserializeFrom(buffer);
-        } catch (BufferOverflowException e) {
+        } catch (Exception e) {
           logger.error(METADATA_INDEX_NODE_DESERIALIZE_ERROR, file);
           throw e;
         }
@@ -453,7 +452,7 @@ public class TsFileSequenceReader implements AutoCloseable {
       while (buffer.hasRemaining()) {
         try {
           
timeseriesMetadataList.add(TimeseriesMetadata.deserializeFrom(buffer, true));
-        } catch (BufferOverflowException e) {
+        } catch (Exception e) {
           logger.error(
               "Something error happened while deserializing TimeseriesMetadata 
of file {}", file);
           throw e;
@@ -659,7 +658,7 @@ public class TsFileSequenceReader implements AutoCloseable {
             metadataIndexNode.getNodeType(),
             queue);
       }
-    } catch (BufferOverflowException e) {
+    } catch (Exception e) {
       logger.error("Something error happened while getting all paths of file 
{}", file);
       throw e;
     }
@@ -711,7 +710,7 @@ public class TsFileSequenceReader implements AutoCloseable {
               needChunkMetadata);
         }
       }
-    } catch (BufferOverflowException e) {
+    } catch (Exception e) {
       logger.error("Something error happened while generating MetadataIndex of 
file {}", file);
       throw e;
     }
@@ -823,7 +822,7 @@ public class TsFileSequenceReader implements AutoCloseable {
         return getMetadataAndEndOffset(
             MetadataIndexNode.deserializeFrom(buffer), name, isDeviceLevel, 
exactSearch);
       }
-    } catch (BufferOverflowException e) {
+    } catch (Exception e) {
       logger.error("Something error happened while deserializing MetadataIndex 
of file {}", file);
       throw e;
     }
@@ -1471,7 +1470,7 @@ public class TsFileSequenceReader implements 
AutoCloseable {
         }
         collectEachLeafMeasurementNodeOffsetRange(readData(startOffset, 
endOffset), queue);
       }
-    } catch (BufferOverflowException e) {
+    } catch (Exception e) {
       logger.error(
           "Error occurred while collecting offset ranges of measurement nodes 
of file {}", file);
       throw e;