You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ja...@apache.org on 2022/05/09 07:16:56 UTC
[iotdb] branch rel/0.13 updated: [To rel/0.13] [IOTDB-3120] Print the tsfile name when meet IOException (#5834)
This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a commit to branch rel/0.13
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/rel/0.13 by this push:
new 18822e70eb [To rel/0.13] [IOTDB-3120] Print the tsfile name when meet IOException (#5834)
18822e70eb is described below
commit 18822e70ebe3c9b00ded1324188f9730fa50da24
Author: Jackie Tien <ja...@gmail.com>
AuthorDate: Mon May 9 15:16:51 2022 +0800
[To rel/0.13] [IOTDB-3120] Print the tsfile name when meet IOException (#5834)
---
.../iotdb/tsfile/read/TsFileSequenceReader.java | 31 +++++++++++-----------
1 file changed, 15 insertions(+), 16 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 584d398215..265196ad30 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
@@ -67,7 +67,6 @@ import org.slf4j.LoggerFactory;
import java.io.File;
import java.io.IOException;
import java.io.Serializable;
-import java.nio.BufferOverflowException;
import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.Collections;
@@ -273,7 +272,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;
}
@@ -354,7 +353,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;
}
@@ -369,7 +368,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;
@@ -400,7 +399,7 @@ public class TsFileSequenceReader implements AutoCloseable {
try {
// next layer MeasurementNode of the specific DeviceNode
metadataIndexNode = MetadataIndexNode.deserializeFrom(buffer);
- } catch (BufferOverflowException e) {
+ } catch (Exception e) {
logger.error(METADATA_INDEX_NODE_DESERIALIZE_ERROR, file);
throw e;
}
@@ -416,7 +415,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;
@@ -452,7 +451,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;
@@ -478,7 +477,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;
}
@@ -510,7 +509,7 @@ public class TsFileSequenceReader implements AutoCloseable {
MetadataIndexNode measurementMetadataIndexNode;
try {
measurementMetadataIndexNode = MetadataIndexNode.deserializeFrom(buffer);
- } catch (BufferOverflowException e) {
+ } catch (Exception e) {
logger.error(METADATA_INDEX_NODE_DESERIALIZE_ERROR, file);
throw e;
}
@@ -537,7 +536,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;
@@ -654,7 +653,7 @@ public class TsFileSequenceReader implements AutoCloseable {
ByteBuffer nextBuffer = readData(startOffset, endOffset);
getAllDevicesWithIsAligned(MetadataIndexNode.deserializeFrom(nextBuffer), queue);
}
- } catch (BufferOverflowException e) {
+ } catch (Exception e) {
logger.error("Something error happened while getting all devices of file {}", file);
throw e;
}
@@ -784,7 +783,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;
}
@@ -871,7 +870,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;
}
@@ -980,7 +979,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;
}
@@ -1682,7 +1681,7 @@ public class TsFileSequenceReader implements AutoCloseable {
try {
// next layer MeasurementNode of the specific DeviceNode
metadataIndexNode = MetadataIndexNode.deserializeFrom(buffer);
- } catch (BufferOverflowException e) {
+ } catch (Exception e) {
logger.error(METADATA_INDEX_NODE_DESERIALIZE_ERROR, file);
throw e;
}
@@ -1957,7 +1956,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;