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/19 08:43:27 UTC
[iotdb] 01/01: Print file name while meeting error in reading or deserializing
This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a commit to branch PrintFileName
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 6544b055b596d917f90a31f9dc0a10bb40276a67
Author: JackieTien97 <ja...@gmail.com>
AuthorDate: Thu May 19 16:42:39 2022 +0800
Print file name while meeting error in reading or deserializing
---
.../iotdb/tsfile/read/TsFileSequenceReader.java | 52 +++++++++++++++++-----
1 file changed, 41 insertions(+), 11 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 b7727c3f92..4d92146d23 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
@@ -875,7 +875,12 @@ public class TsFileSequenceReader implements AutoCloseable {
* @throws IOException io error
*/
public ChunkHeader readChunkHeader(byte chunkType) throws IOException {
- return ChunkHeader.deserializeFrom(tsFileInput.wrapAsInputStream(), chunkType);
+ try {
+ return ChunkHeader.deserializeFrom(tsFileInput.wrapAsInputStream(), chunkType);
+ } catch (Throwable t) {
+ logger.error("Exception happened while reading chunk header of {}", file, t);
+ throw t;
+ }
}
/**
@@ -885,7 +890,12 @@ public class TsFileSequenceReader implements AutoCloseable {
* @param chunkHeaderSize the size of chunk's header
*/
private ChunkHeader readChunkHeader(long position, int chunkHeaderSize) throws IOException {
- return ChunkHeader.deserializeFrom(tsFileInput, position, chunkHeaderSize);
+ try {
+ return ChunkHeader.deserializeFrom(tsFileInput, position, chunkHeaderSize);
+ } catch (Throwable t) {
+ logger.error("Exception happened while reading chunk header of {}", file, t);
+ throw t;
+ }
}
/**
@@ -896,7 +906,12 @@ public class TsFileSequenceReader implements AutoCloseable {
* @return the pages of this chunk
*/
private ByteBuffer readChunk(long position, int dataSize) throws IOException {
- return readData(position, dataSize);
+ try {
+ return readData(position, dataSize);
+ } catch (Throwable t) {
+ logger.error("Exception happened while reading chunk of {}", file, t);
+ throw t;
+ }
}
/**
@@ -906,12 +921,17 @@ public class TsFileSequenceReader implements AutoCloseable {
* @return -chunk
*/
public Chunk readMemChunk(ChunkMetadata metaData) throws IOException {
- int chunkHeadSize = ChunkHeader.getSerializedSize(metaData.getMeasurementUid());
- ChunkHeader header = readChunkHeader(metaData.getOffsetOfChunkHeader(), chunkHeadSize);
- ByteBuffer buffer =
- readChunk(
- metaData.getOffsetOfChunkHeader() + header.getSerializedSize(), header.getDataSize());
- return new Chunk(header, buffer, metaData.getDeleteIntervalList(), metaData.getStatistics());
+ try {
+ int chunkHeadSize = ChunkHeader.getSerializedSize(metaData.getMeasurementUid());
+ ChunkHeader header = readChunkHeader(metaData.getOffsetOfChunkHeader(), chunkHeadSize);
+ ByteBuffer buffer =
+ readChunk(
+ metaData.getOffsetOfChunkHeader() + header.getSerializedSize(), header.getDataSize());
+ return new Chunk(header, buffer, metaData.getDeleteIntervalList(), metaData.getStatistics());
+ } catch (Throwable t) {
+ logger.error("Exception happened while reading chunk of {}", file, t);
+ throw t;
+ }
}
/**
@@ -920,7 +940,12 @@ public class TsFileSequenceReader implements AutoCloseable {
* @param type given tsfile data type
*/
public PageHeader readPageHeader(TSDataType type, boolean hasStatistic) throws IOException {
- return PageHeader.deserializeFrom(tsFileInput.wrapAsInputStream(), type, hasStatistic);
+ try {
+ return PageHeader.deserializeFrom(tsFileInput.wrapAsInputStream(), type, hasStatistic);
+ } catch (Throwable t) {
+ logger.error("Exception happened while reading page header of {}", file, t);
+ throw t;
+ }
}
public long position() throws IOException {
@@ -1033,7 +1058,12 @@ public class TsFileSequenceReader implements AutoCloseable {
* @return data that been read.
*/
protected ByteBuffer readData(long start, long end) throws IOException {
- return readData(start, (int) (end - start));
+ try {
+ return readData(start, (int) (end - start));
+ } catch (Throwable t) {
+ logger.error("Exception happened while reading data of {}", file, t);
+ throw t;
+ }
}
/** notice, the target bytebuffer are not flipped. */