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 2021/01/08 06:19:48 UTC
[iotdb] branch PrintErrorFile created (now 077303c)
This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a change to branch PrintErrorFile
in repository https://gitbox.apache.org/repos/asf/iotdb.git.
at 077303c add error log to print file name while error happened
This branch includes the following new commits:
new 077303c add error log to print file name while error happened
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[iotdb] 01/01: add error log to print file name while error happened
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a commit to branch PrintErrorFile
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 077303ce1a2b62206c80a827e63c1665e5ad4354
Author: JackieTien97 <Ja...@foxmail.com>
AuthorDate: Fri Jan 8 14:14:32 2021 +0800
add error log to print file name while error happened
---
.../iotdb/tsfile/read/TsFileSequenceReader.java | 168 ++++++++++++++-------
1 file changed, 114 insertions(+), 54 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 2abb60c..8dcadb4 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
@@ -20,6 +20,7 @@ package org.apache.iotdb.tsfile.read;
import java.io.File;
import java.io.IOException;
+import java.nio.BufferOverflowException;
import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.Collections;
@@ -242,8 +243,14 @@ public class TsFileSequenceReader implements AutoCloseable {
* @throws IOException io error
*/
public TsFileMetadata readFileMetadata() throws IOException {
- if (tsFileMetaData == null) {
- tsFileMetaData = TsFileMetadata.deserializeFrom(readData(fileMetadataPos, fileMetadataSize));
+ try {
+ if (tsFileMetaData == null) {
+ tsFileMetaData = TsFileMetadata
+ .deserializeFrom(readData(fileMetadataPos, fileMetadataSize));
+ }
+ } catch (BufferOverflowException e) {
+ logger.error("Something error happened while reading file metadata of file {}", file, e);
+ throw e;
}
return tsFileMetaData;
}
@@ -315,7 +322,13 @@ public class TsFileSequenceReader implements AutoCloseable {
ByteBuffer buffer = readData(metadataIndexPair.left.getOffset(), metadataIndexPair.right);
MetadataIndexNode metadataIndexNode = deviceMetadataIndexNode;
if (!metadataIndexNode.getNodeType().equals(MetadataIndexNodeType.LEAF_MEASUREMENT)) {
- metadataIndexNode = MetadataIndexNode.deserializeFrom(buffer);
+ try {
+ metadataIndexNode = MetadataIndexNode.deserializeFrom(buffer);
+ } catch (BufferOverflowException e) {
+ logger.error("Something error happened while deserializing MetadataIndexNode of file {}",
+ file, e);
+ throw e;
+ }
metadataIndexPair = getMetadataAndEndOffset(metadataIndexNode,
path.getMeasurement(), MetadataIndexNodeType.INTERNAL_MEASUREMENT, false);
}
@@ -325,7 +338,13 @@ public class TsFileSequenceReader implements AutoCloseable {
List<TimeseriesMetadata> timeseriesMetadataList = new ArrayList<>();
buffer = readData(metadataIndexPair.left.getOffset(), metadataIndexPair.right);
while (buffer.hasRemaining()) {
- timeseriesMetadataList.add(TimeseriesMetadata.deserializeFrom(buffer));
+ try {
+ timeseriesMetadataList.add(TimeseriesMetadata.deserializeFrom(buffer));
+ } catch (BufferOverflowException e) {
+ logger.error("Something error happened while deserializing TimeseriesMetadata of file {}",
+ file, e);
+ throw e;
+ }
}
// return null if path does not exist in the TsFile
int searchResult = binarySearchInTimeseriesMetadataList(timeseriesMetadataList,
@@ -349,7 +368,13 @@ public class TsFileSequenceReader implements AutoCloseable {
ByteBuffer buffer = readData(metadataIndexPair.left.getOffset(), metadataIndexPair.right);
MetadataIndexNode metadataIndexNode = deviceMetadataIndexNode;
if (!metadataIndexNode.getNodeType().equals(MetadataIndexNodeType.LEAF_MEASUREMENT)) {
- metadataIndexNode = MetadataIndexNode.deserializeFrom(buffer);
+ try {
+ metadataIndexNode = MetadataIndexNode.deserializeFrom(buffer);
+ } catch (BufferOverflowException e) {
+ logger.error("Something error happened while deserializing MetadataIndexNode of file {}",
+ file, e);
+ throw e;
+ }
metadataIndexPair = getMetadataAndEndOffset(metadataIndexNode,
path.getMeasurement(), MetadataIndexNodeType.INTERNAL_MEASUREMENT, false);
}
@@ -359,7 +384,14 @@ public class TsFileSequenceReader implements AutoCloseable {
List<TimeseriesMetadata> timeseriesMetadataList = new ArrayList<>();
buffer = readData(metadataIndexPair.left.getOffset(), metadataIndexPair.right);
while (buffer.hasRemaining()) {
- TimeseriesMetadata timeseriesMetadata = TimeseriesMetadata.deserializeFrom(buffer);
+ TimeseriesMetadata timeseriesMetadata;
+ try {
+ timeseriesMetadata = TimeseriesMetadata.deserializeFrom(buffer);
+ } catch (BufferOverflowException e) {
+ logger.error("Something error happened while deserializing TimeseriesMetadata of file {}",
+ file, e);
+ throw e;
+ }
if (allSensors.contains(timeseriesMetadata.getMeasurementId())) {
timeseriesMetadataList.add(timeseriesMetadata);
}
@@ -388,7 +420,13 @@ public class TsFileSequenceReader implements AutoCloseable {
List<TimeseriesMetadata> timeseriesMetadataList = new ArrayList<>();
MetadataIndexNode metadataIndexNode = deviceMetadataIndexNode;
if (!metadataIndexNode.getNodeType().equals(MetadataIndexNodeType.LEAF_MEASUREMENT)) {
- metadataIndexNode = MetadataIndexNode.deserializeFrom(buffer);
+ try {
+ metadataIndexNode = MetadataIndexNode.deserializeFrom(buffer);
+ } catch (BufferOverflowException e) {
+ logger.error("Something error happened while deserializing MetadataIndexNode of file {}",
+ file, e);
+ throw e;
+ }
measurementMetadataIndexPair = getMetadataAndEndOffset(metadataIndexNode,
measurementList.get(i), MetadataIndexNodeType.INTERNAL_MEASUREMENT, false);
}
@@ -398,7 +436,13 @@ public class TsFileSequenceReader implements AutoCloseable {
buffer = readData(measurementMetadataIndexPair.left.getOffset(),
measurementMetadataIndexPair.right);
while (buffer.hasRemaining()) {
- timeseriesMetadataList.add(TimeseriesMetadata.deserializeFrom(buffer));
+ try {
+ timeseriesMetadataList.add(TimeseriesMetadata.deserializeFrom(buffer));
+ } catch (BufferOverflowException e) {
+ logger.error("Something error happened while deserializing TimeseriesMetadata of file {}",
+ file, e);
+ throw e;
+ }
}
for (int j = i; j < measurementList.size(); j++) {
String current = measurementList.get(j);
@@ -585,32 +629,37 @@ public class TsFileSequenceReader implements AutoCloseable {
private void generateMetadataIndex(MetadataIndexEntry metadataIndex, ByteBuffer buffer,
String deviceId, MetadataIndexNodeType type,
Map<String, List<TimeseriesMetadata>> timeseriesMetadataMap) throws IOException {
- switch (type) {
- case INTERNAL_DEVICE:
- case LEAF_DEVICE:
- case INTERNAL_MEASUREMENT:
- deviceId = metadataIndex.getName();
- MetadataIndexNode metadataIndexNode = MetadataIndexNode.deserializeFrom(buffer);
- int metadataIndexListSize = metadataIndexNode.getChildren().size();
- for (int i = 0; i < metadataIndexListSize; i++) {
- long endOffset = metadataIndexNode.getEndOffset();
- if (i != metadataIndexListSize - 1) {
- endOffset = metadataIndexNode.getChildren().get(i + 1).getOffset();
+ try {
+ switch (type) {
+ case INTERNAL_DEVICE:
+ case LEAF_DEVICE:
+ case INTERNAL_MEASUREMENT:
+ deviceId = metadataIndex.getName();
+ MetadataIndexNode metadataIndexNode = MetadataIndexNode.deserializeFrom(buffer);
+ int metadataIndexListSize = metadataIndexNode.getChildren().size();
+ for (int i = 0; i < metadataIndexListSize; i++) {
+ long endOffset = metadataIndexNode.getEndOffset();
+ if (i != metadataIndexListSize - 1) {
+ endOffset = metadataIndexNode.getChildren().get(i + 1).getOffset();
+ }
+ ByteBuffer nextBuffer = readData(metadataIndexNode.getChildren().get(i).getOffset(),
+ endOffset);
+ generateMetadataIndex(metadataIndexNode.getChildren().get(i), nextBuffer, deviceId,
+ metadataIndexNode.getNodeType(), timeseriesMetadataMap);
}
- ByteBuffer nextBuffer = readData(metadataIndexNode.getChildren().get(i).getOffset(),
- endOffset);
- generateMetadataIndex(metadataIndexNode.getChildren().get(i), nextBuffer, deviceId,
- metadataIndexNode.getNodeType(), timeseriesMetadataMap);
- }
- break;
- case LEAF_MEASUREMENT:
- List<TimeseriesMetadata> timeseriesMetadataList = new ArrayList<>();
- while (buffer.hasRemaining()) {
- timeseriesMetadataList.add(TimeseriesMetadata.deserializeFrom(buffer));
- }
- timeseriesMetadataMap.computeIfAbsent(deviceId, k -> new ArrayList<>())
- .addAll(timeseriesMetadataList);
- break;
+ break;
+ case LEAF_MEASUREMENT:
+ List<TimeseriesMetadata> timeseriesMetadataList = new ArrayList<>();
+ while (buffer.hasRemaining()) {
+ timeseriesMetadataList.add(TimeseriesMetadata.deserializeFrom(buffer));
+ }
+ timeseriesMetadataMap.computeIfAbsent(deviceId, k -> new ArrayList<>())
+ .addAll(timeseriesMetadataList);
+ break;
+ }
+ } catch (BufferOverflowException e) {
+ logger.error("Something error happened while generating MetadataIndex of file {}", file, e);
+ throw e;
}
}
@@ -670,14 +719,20 @@ public class TsFileSequenceReader implements AutoCloseable {
*/
private Pair<MetadataIndexEntry, Long> getMetadataAndEndOffset(MetadataIndexNode metadataIndex,
String name, MetadataIndexNodeType type, boolean exactSearch) throws IOException {
- if (!metadataIndex.getNodeType().equals(type)) {
- return metadataIndex.getChildIndexEntry(name, exactSearch);
- } else {
- Pair<MetadataIndexEntry, Long> childIndexEntry = metadataIndex
- .getChildIndexEntry(name, false);
- ByteBuffer buffer = readData(childIndexEntry.left.getOffset(), childIndexEntry.right);
- return getMetadataAndEndOffset(MetadataIndexNode.deserializeFrom(buffer), name, type,
- false);
+ try {
+ if (!metadataIndex.getNodeType().equals(type)) {
+ return metadataIndex.getChildIndexEntry(name, exactSearch);
+ } else {
+ Pair<MetadataIndexEntry, Long> childIndexEntry = metadataIndex
+ .getChildIndexEntry(name, false);
+ ByteBuffer buffer = readData(childIndexEntry.left.getOffset(), childIndexEntry.right);
+ return getMetadataAndEndOffset(MetadataIndexNode.deserializeFrom(buffer), name, type,
+ false);
+ }
+ } catch (BufferOverflowException e) {
+ logger
+ .error("Something error happened while deserializing MetadataIndex of file {}", file, e);
+ throw e;
}
}
@@ -1080,22 +1135,27 @@ public class TsFileSequenceReader implements AutoCloseable {
*/
public List<ChunkMetadata> readChunkMetaDataList(TimeseriesMetadata timeseriesMetaData)
throws IOException {
- readFileMetadata();
- List<Pair<Long, Long>> versionInfo = tsFileMetaData.getVersionInfo();
- ArrayList<ChunkMetadata> chunkMetadataList = new ArrayList<>();
- long startOffsetOfChunkMetadataList = timeseriesMetaData.getOffsetOfChunkMetaDataList();
- int dataSizeOfChunkMetadataList = timeseriesMetaData.getDataSizeOfChunkMetaDataList();
+ try {
+ readFileMetadata();
+ List<Pair<Long, Long>> versionInfo = tsFileMetaData.getVersionInfo();
+ ArrayList<ChunkMetadata> chunkMetadataList = new ArrayList<>();
+ long startOffsetOfChunkMetadataList = timeseriesMetaData.getOffsetOfChunkMetaDataList();
+ int dataSizeOfChunkMetadataList = timeseriesMetaData.getDataSizeOfChunkMetaDataList();
- ByteBuffer buffer = readData(startOffsetOfChunkMetadataList, dataSizeOfChunkMetadataList);
- while (buffer.hasRemaining()) {
- chunkMetadataList.add(ChunkMetadata.deserializeFrom(buffer));
- }
+ ByteBuffer buffer = readData(startOffsetOfChunkMetadataList, dataSizeOfChunkMetadataList);
+ while (buffer.hasRemaining()) {
+ chunkMetadataList.add(ChunkMetadata.deserializeFrom(buffer));
+ }
- VersionUtils.applyVersion(chunkMetadataList, versionInfo);
+ VersionUtils.applyVersion(chunkMetadataList, versionInfo);
- // minimize the storage of an ArrayList instance.
- chunkMetadataList.trimToSize();
- return chunkMetadataList;
+ // minimize the storage of an ArrayList instance.
+ chunkMetadataList.trimToSize();
+ return chunkMetadataList;
+ } catch (BufferOverflowException e) {
+ logger.error("Something error happened while reading ChunkMetaDataList of file {}", file, e);
+ throw e;
+ }
}
/**