[iotdb] branch master updated: Throw exception when device to be queried is not in TsFileMetaData (#2944)

[hx...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

hxd pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git


The following commit(s) were added to refs/heads/master by this push:
     new 70e451e  Throw exception when device to be queried is not in TsFileMetaData (#2944)
70e451e is described below

commit 70e451eb010cc23665a5eea7e37ff43df20917a6
Author: Zesong Sun <sz...@mails.tsinghua.edu.cn>
AuthorDate: Thu Apr 1 14:43:45 2021 +0800

    Throw exception when device to be queried is not in TsFileMetaData (#2944)
---
 .../src/main/java/org/apache/iotdb/tsfile/TsFileSequenceRead.java    | 3 +--
 .../main/java/org/apache/iotdb/tsfile/read/TsFileSequenceReader.java | 2 +-
 .../java/org/apache/iotdb/tsfile/write/writer/TsFileIOWriter.java    | 4 ++--
 .../iotdb/tsfile/write/writer/RestorableTsFileIOWriterTest.java      | 5 +++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/example/tsfile/src/main/java/org/apache/iotdb/tsfile/TsFileSequenceRead.java b/example/tsfile/src/main/java/org/apache/iotdb/tsfile/TsFileSequenceRead.java
index 8f8ef99..2755777 100644
--- a/example/tsfile/src/main/java/org/apache/iotdb/tsfile/TsFileSequenceRead.java
+++ b/example/tsfile/src/main/java/org/apache/iotdb/tsfile/TsFileSequenceRead.java
@@ -59,8 +59,7 @@ public class TsFileSequenceRead {
       // Sequential reading of one ChunkGroup now follows this order:
       // first the CHUNK_GROUP_HEADER, then SeriesChunks (headers and data) in one ChunkGroup
       // Because we do not know how many chunks a ChunkGroup may have, we should read one byte (the
-      // marker) ahead and
-      // judge accordingly.
+      // marker) ahead and judge accordingly.
       reader.position((long) TSFileConfig.MAGIC_STRING.getBytes().length + 1);
       System.out.println("[Chunk Group]");
       System.out.println("position: " + reader.position());
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 bb4a8f01..bc63d93 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
@@ -329,7 +329,7 @@ public class TsFileSequenceReader implements AutoCloseable {
     Pair<MetadataIndexEntry, Long> metadataIndexPair =
         getMetadataAndEndOffset(deviceMetadataIndexNode, path.getDevice(), true, true);
     if (metadataIndexPair == null) {
-      return null;
+      throw new IOException("Device {" + path.getDevice() + "} is not in tsFileMetaData");
     }
     ByteBuffer buffer = readData(metadataIndexPair.left.getOffset(), metadataIndexPair.right);
     MetadataIndexNode metadataIndexNode = deviceMetadataIndexNode;
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 6dfeec8..3df2eb9 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
@@ -371,8 +371,8 @@ public class TsFileIOWriter {
     out.write(new byte[] {MetaMarker.SEPARATOR});
   }
 
-  void writeChunkMaskForTest() throws IOException {
-    out.write(new byte[] {MetaMarker.CHUNK_HEADER});
+  void writeChunkGroupMarkerForTest() throws IOException {
+    out.write(new byte[] {MetaMarker.CHUNK_GROUP_HEADER});
   }
 
   public File getFile() {
diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/RestorableTsFileIOWriterTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/RestorableTsFileIOWriterTest.java
index 64db027..b9ea78f 100644
--- a/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/RestorableTsFileIOWriterTest.java
+++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/write/writer/RestorableTsFileIOWriterTest.java
@@ -229,7 +229,7 @@ public class RestorableTsFileIOWriterTest {
   }
 
   @Test
-  public void testOnlyOneChunkGroupAndOneMask() throws Exception {
+  public void testOnlyOneChunkGroupAndOneMarker() throws Exception {
     File file = fsFactory.getFile(FILE_NAME);
     TsFileWriter writer = new TsFileWriter(file);
     writer.registerTimeseries(
@@ -245,7 +245,7 @@ public class RestorableTsFileIOWriterTest {
             .addTuple(new FloatDataPoint("s1", 5))
             .addTuple(new FloatDataPoint("s2", 4)));
     writer.flushAllChunkGroups();
-    writer.getIOWriter().writeChunkMaskForTest();
+    writer.getIOWriter().writeChunkGroupMarkerForTest();
     writer.getIOWriter().close();
     RestorableTsFileIOWriter rWriter = new RestorableTsFileIOWriter(file);
     writer = new TsFileWriter(rWriter);
@@ -290,6 +290,7 @@ public class RestorableTsFileIOWriterTest {
             .addTuple(new FloatDataPoint("s1", 6))
             .addTuple(new FloatDataPoint("s2", 4)));
     writer.flushAllChunkGroups();
+    writer.getIOWriter().writeChunkGroupMarkerForTest();
     writer.getIOWriter().close();
     RestorableTsFileIOWriter rWriter = new RestorableTsFileIOWriter(file);
     writer = new TsFileWriter(rWriter);