You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ha...@apache.org on 2022/04/06 14:15:59 UTC

[iotdb] branch master updated: [IOTDB-2851]ChunkReaderTest failed in CI (#5429)

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

haonan 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 4e154bb57e [IOTDB-2851]ChunkReaderTest failed in CI (#5429)
4e154bb57e is described below

commit 4e154bb57ed64692aa701aa89b963198594fcb05
Author: 周沛辰 <45...@users.noreply.github.com>
AuthorDate: Wed Apr 6 22:15:53 2022 +0800

    [IOTDB-2851]ChunkReaderTest failed in CI (#5429)
---
 .../java/org/apache/iotdb/tsfile/read/TsFileReaderTest.java  |  4 ++++
 .../apache/iotdb/tsfile/utils/TsFileGeneratorForTest.java    | 12 ++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/TsFileReaderTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/read/TsFileReaderTest.java
index 5c9a85af8f..92ec1c00f5 100644
--- a/tsfile/src/test/java/org/apache/iotdb/tsfile/read/TsFileReaderTest.java
+++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/read/TsFileReaderTest.java
@@ -71,6 +71,8 @@ public class TsFileReaderTest {
 
     TSFileConfig tsFileConfig = TSFileDescriptor.getInstance().getConfig();
     // make multi pages in one group
+    int oldPointNumInPage = tsFileConfig.getMaxNumberOfPointsInPage();
+    int oldGroupSizeInByte = tsFileConfig.getGroupSizeInByte();
     tsFileConfig.setMaxNumberOfPointsInPage(100);
     tsFileConfig.setGroupSizeInByte(100 * 1024 * 1024);
     TsFileWriter tsFileWriter = new TsFileWriter(file, new Schema(), tsFileConfig);
@@ -120,6 +122,8 @@ public class TsFileReaderTest {
 
     tsFileReader.close();
     file.delete();
+    tsFileConfig.setGroupSizeInByte(oldGroupSizeInByte);
+    tsFileConfig.setMaxNumberOfPointsInPage(oldPointNumInPage);
   }
 
   @Test
diff --git a/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/TsFileGeneratorForTest.java b/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/TsFileGeneratorForTest.java
index 486131ffad..52195ab823 100755
--- a/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/TsFileGeneratorForTest.java
+++ b/tsfile/src/test/java/org/apache/iotdb/tsfile/utils/TsFileGeneratorForTest.java
@@ -176,6 +176,9 @@ public class TsFileGeneratorForTest {
 
     Schema schema = generateTestSchema();
 
+    int oldGroupSizeInByte = TSFileDescriptor.getInstance().getConfig().getGroupSizeInByte();
+    int oldMaxPointNumInPage =
+        TSFileDescriptor.getInstance().getConfig().getMaxNumberOfPointsInPage();
     TSFileDescriptor.getInstance().getConfig().setGroupSizeInByte(chunkGroupSize);
     TSFileDescriptor.getInstance().getConfig().setMaxNumberOfPointsInPage(pageSize);
 
@@ -190,6 +193,9 @@ public class TsFileGeneratorForTest {
       }
     } catch (WriteProcessException e) {
       e.printStackTrace();
+    } finally {
+      TSFileDescriptor.getInstance().getConfig().setMaxNumberOfPointsInPage(oldMaxPointNumInPage);
+      TSFileDescriptor.getInstance().getConfig().setGroupSizeInByte(oldGroupSizeInByte);
     }
   }
 
@@ -281,6 +287,9 @@ public class TsFileGeneratorForTest {
       Assert.assertTrue(file.delete());
     }
     file.getParentFile().mkdirs();
+    int oldGroupSizeInByte = TSFileDescriptor.getInstance().getConfig().getGroupSizeInByte();
+    int oldMaxPointNumInPage =
+        TSFileDescriptor.getInstance().getConfig().getMaxNumberOfPointsInPage();
     TSFileDescriptor.getInstance().getConfig().setGroupSizeInByte(chunkGroupSize);
     TSFileDescriptor.getInstance().getConfig().setMaxNumberOfPointsInPage(pageSize);
     try (TsFileWriter tsFileWriter = new TsFileWriter(file)) {
@@ -309,6 +318,9 @@ public class TsFileGeneratorForTest {
 
     } catch (IOException | WriteProcessException e) {
       e.printStackTrace();
+    } finally {
+      TSFileDescriptor.getInstance().getConfig().setMaxNumberOfPointsInPage(oldMaxPointNumInPage);
+      TSFileDescriptor.getInstance().getConfig().setGroupSizeInByte(oldGroupSizeInByte);
     }
   }