This is an automated email from the ASF dual-hosted git repository. hui pushed a commit to branch lmh/aggrOpRefactor in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 62e37551104881cd591c5be4846d3e9326a4f21b Author: Minghui Liu <[email protected]> AuthorDate: Thu Jul 7 17:35:51 2022 +0800 set maxTsBlockLineNumber = 3 in ITs --- docs/UserGuide/Reference/DataNode-Config-Manual.md | 2 +- docs/zh/UserGuide/Reference/DataNode-Config-Manual.md | 2 +- .../src/main/java/org/apache/iotdb/it/env/MppConfig.java | 6 ++++++ .../src/main/java/org/apache/iotdb/itbase/env/BaseConfig.java | 8 ++++++++ .../iotdb/db/it/aligned/IoTDBAggregationWithDeletion2IT.java | 3 +++ .../iotdb/db/it/aligned/IoTDBAggregationWithDeletionIT.java | 4 ++++ .../iotdb/db/it/aligned/IoTDBAlignedSeriesQuery2IT.java | 3 +++ .../iotdb/db/it/aligned/IoTDBAlignedSeriesQuery3IT.java | 4 +++- .../apache/iotdb/db/it/aligned/IoTDBAlignedSeriesQueryIT.java | 4 ++++ .../apache/iotdb/db/it/aligned/IoTDBGroupByLevelQueryIT.java | 5 +++++ .../IoTDBGroupByQueryWithValueFilterWithDeletion2IT.java | 3 +++ .../IoTDBGroupByQueryWithValueFilterWithDeletionIT.java | 4 ++++ .../IoTDBGroupByQueryWithoutValueFilterWithDeletion2IT.java | 3 +++ .../IoTDBGroupByQueryWithoutValueFilterWithDeletionIT.java | 4 ++++ .../java/org/apache/iotdb/db/it/env/StandaloneEnvConfig.java | 11 +++++++++++ .../org/apache/iotdb/tsfile/common/conf/TSFileConfig.java | 2 +- 16 files changed, 64 insertions(+), 4 deletions(-) diff --git a/docs/UserGuide/Reference/DataNode-Config-Manual.md b/docs/UserGuide/Reference/DataNode-Config-Manual.md index 55bb5bf3d4..3199ede743 100644 --- a/docs/UserGuide/Reference/DataNode-Config-Manual.md +++ b/docs/UserGuide/Reference/DataNode-Config-Manual.md @@ -232,7 +232,7 @@ The permission definitions are in ${IOTDB\_CONF}/conf/jmx.access. |:---:|:---| |Description| Maximum number of lines in a single TsBlock | |Type| int | -|Default| 1024 | +|Default| 1000 | |Effective|After restarting system| ### DataNode Internal Service diff --git a/docs/zh/UserGuide/Reference/DataNode-Config-Manual.md b/docs/zh/UserGuide/Reference/DataNode-Config-Manual.md index de10f78867..7b03b9ef36 100644 --- a/docs/zh/UserGuide/Reference/DataNode-Config-Manual.md +++ b/docs/zh/UserGuide/Reference/DataNode-Config-Manual.md @@ -214,7 +214,7 @@ IoTDB DataNode 与 Standalone 模式共用一套配置文件，均位于 IoTDB |:---:|:---| |描述| 单个 TsBlock 的最大行数 | |类型| int | -|默认值| 1024 | +|默认值| 1000 | |改后生效方式|重启服务生效| ### DataNode 内部服务参数 diff --git a/integration-test/src/main/java/org/apache/iotdb/it/env/MppConfig.java b/integration-test/src/main/java/org/apache/iotdb/it/env/MppConfig.java index 18b5dd942e..89a2611fcc 100644 --- a/integration-test/src/main/java/org/apache/iotdb/it/env/MppConfig.java +++ b/integration-test/src/main/java/org/apache/iotdb/it/env/MppConfig.java @@ -198,4 +198,10 @@ public class MppConfig implements BaseConfig { "avg_series_point_number_threshold", String.valueOf(avgSeriesPointNumberThreshold)); return this; } + + @Override + public BaseConfig setMaxTsBlockLineNumber(int maxTsBlockLineNumber) { + engineProperties.setProperty("max_tsblock_line_number", String.valueOf(maxTsBlockLineNumber)); + return this; + } } diff --git a/integration-test/src/main/java/org/apache/iotdb/itbase/env/BaseConfig.java b/integration-test/src/main/java/org/apache/iotdb/itbase/env/BaseConfig.java index e538c319a4..8066de123d 100644 --- a/integration-test/src/main/java/org/apache/iotdb/itbase/env/BaseConfig.java +++ b/integration-test/src/main/java/org/apache/iotdb/itbase/env/BaseConfig.java @@ -185,4 +185,12 @@ public interface BaseConfig { default BaseConfig setAvgSeriesPointNumberThreshold(int avgSeriesPointNumberThreshold) { return this; } + + default int getMaxTsBlockLineNumber() { + return 1000; + } + + default BaseConfig setMaxTsBlockLineNumber(int maxTsBlockLineNumber) { + return this; + } } diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBAggregationWithDeletion2IT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBAggregationWithDeletion2IT.java index 5a7b861fcf..e1b26f92e4 100644 --- a/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBAggregationWithDeletion2IT.java +++ b/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBAggregationWithDeletion2IT.java @@ -47,11 +47,13 @@ public class IoTDBAggregationWithDeletion2IT extends IoTDBAggregationWithDeletio enableUnseqSpaceCompaction = ConfigFactory.getConfig().isEnableUnseqSpaceCompaction(); enableCrossSpaceCompaction = ConfigFactory.getConfig().isEnableCrossSpaceCompaction(); numOfPointsPerPage = ConfigFactory.getConfig().getMaxNumberOfPointsInPage(); + maxTsBlockLineNumber = ConfigFactory.getConfig().getMaxTsBlockLineNumber(); ConfigFactory.getConfig().setEnableSeqSpaceCompaction(false); ConfigFactory.getConfig().setEnableUnseqSpaceCompaction(false); ConfigFactory.getConfig().setEnableCrossSpaceCompaction(false); ConfigFactory.getConfig().setMaxNumberOfPointsInPage(3); + ConfigFactory.getConfig().setMaxTsBlockLineNumber(3); EnvFactory.getEnv().initBeforeClass(); AlignedWriteUtil.insertData(); @@ -74,5 +76,6 @@ public class IoTDBAggregationWithDeletion2IT extends IoTDBAggregationWithDeletio ConfigFactory.getConfig().setEnableUnseqSpaceCompaction(enableUnseqSpaceCompaction); ConfigFactory.getConfig().setEnableCrossSpaceCompaction(enableCrossSpaceCompaction); ConfigFactory.getConfig().setMaxNumberOfPointsInPage(numOfPointsPerPage); + ConfigFactory.getConfig().setMaxTsBlockLineNumber(maxTsBlockLineNumber); } } diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBAggregationWithDeletionIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBAggregationWithDeletionIT.java index 9c201c2a49..c43293ea81 100644 --- a/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBAggregationWithDeletionIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBAggregationWithDeletionIT.java @@ -50,15 +50,18 @@ public class IoTDBAggregationWithDeletionIT { protected static boolean enableSeqSpaceCompaction; protected static boolean enableUnseqSpaceCompaction; protected static boolean enableCrossSpaceCompaction; + protected static int maxTsBlockLineNumber; @BeforeClass public static void setUp() throws Exception { enableSeqSpaceCompaction = ConfigFactory.getConfig().isEnableSeqSpaceCompaction(); enableUnseqSpaceCompaction = ConfigFactory.getConfig().isEnableUnseqSpaceCompaction(); enableCrossSpaceCompaction = ConfigFactory.getConfig().isEnableCrossSpaceCompaction(); + maxTsBlockLineNumber = ConfigFactory.getConfig().getMaxTsBlockLineNumber(); ConfigFactory.getConfig().setEnableSeqSpaceCompaction(false); ConfigFactory.getConfig().setEnableUnseqSpaceCompaction(false); ConfigFactory.getConfig().setEnableCrossSpaceCompaction(false); + ConfigFactory.getConfig().setMaxTsBlockLineNumber(3); EnvFactory.getEnv().initBeforeClass(); AlignedWriteUtil.insertData(); @@ -80,6 +83,7 @@ public class IoTDBAggregationWithDeletionIT { ConfigFactory.getConfig().setEnableSeqSpaceCompaction(enableSeqSpaceCompaction); ConfigFactory.getConfig().setEnableUnseqSpaceCompaction(enableUnseqSpaceCompaction); ConfigFactory.getConfig().setEnableCrossSpaceCompaction(enableCrossSpaceCompaction); + ConfigFactory.getConfig().setMaxTsBlockLineNumber(maxTsBlockLineNumber); } @Test diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBAlignedSeriesQuery2IT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBAlignedSeriesQuery2IT.java index 5d22310bcc..cb8799d96b 100644 --- a/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBAlignedSeriesQuery2IT.java +++ b/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBAlignedSeriesQuery2IT.java @@ -41,11 +41,13 @@ public class IoTDBAlignedSeriesQuery2IT extends IoTDBAlignedSeriesQueryIT { enableUnseqSpaceCompaction = ConfigFactory.getConfig().isEnableUnseqSpaceCompaction(); enableCrossSpaceCompaction = ConfigFactory.getConfig().isEnableCrossSpaceCompaction(); numOfPointsPerPage = ConfigFactory.getConfig().getMaxNumberOfPointsInPage(); + maxTsBlockLineNumber = ConfigFactory.getConfig().getMaxTsBlockLineNumber(); ConfigFactory.getConfig().setEnableSeqSpaceCompaction(false); ConfigFactory.getConfig().setEnableUnseqSpaceCompaction(false); ConfigFactory.getConfig().setEnableCrossSpaceCompaction(false); ConfigFactory.getConfig().setMaxNumberOfPointsInPage(2); + ConfigFactory.getConfig().setMaxTsBlockLineNumber(3); EnvFactory.getEnv().initBeforeClass(); AlignedWriteUtil.insertData(); } @@ -57,5 +59,6 @@ public class IoTDBAlignedSeriesQuery2IT extends IoTDBAlignedSeriesQueryIT { ConfigFactory.getConfig().setEnableUnseqSpaceCompaction(enableUnseqSpaceCompaction); ConfigFactory.getConfig().setEnableCrossSpaceCompaction(enableCrossSpaceCompaction); ConfigFactory.getConfig().setMaxNumberOfPointsInPage(numOfPointsPerPage); + ConfigFactory.getConfig().setMaxTsBlockLineNumber(maxTsBlockLineNumber); } } diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBAlignedSeriesQuery3IT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBAlignedSeriesQuery3IT.java index d663893231..1fc38f7693 100644 --- a/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBAlignedSeriesQuery3IT.java +++ b/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBAlignedSeriesQuery3IT.java @@ -41,11 +41,12 @@ public class IoTDBAlignedSeriesQuery3IT extends IoTDBAlignedSeriesQueryIT { enableUnseqSpaceCompaction = ConfigFactory.getConfig().isEnableUnseqSpaceCompaction(); enableCrossSpaceCompaction = ConfigFactory.getConfig().isEnableCrossSpaceCompaction(); numOfPointsPerPage = ConfigFactory.getConfig().getMaxNumberOfPointsInPage(); - + maxTsBlockLineNumber = ConfigFactory.getConfig().getMaxTsBlockLineNumber(); ConfigFactory.getConfig().setEnableSeqSpaceCompaction(false); ConfigFactory.getConfig().setEnableUnseqSpaceCompaction(false); ConfigFactory.getConfig().setEnableCrossSpaceCompaction(false); ConfigFactory.getConfig().setMaxNumberOfPointsInPage(3); + ConfigFactory.getConfig().setMaxTsBlockLineNumber(3); EnvFactory.getEnv().initBeforeClass(); AlignedWriteUtil.insertData(); } @@ -57,5 +58,6 @@ public class IoTDBAlignedSeriesQuery3IT extends IoTDBAlignedSeriesQueryIT { ConfigFactory.getConfig().setEnableUnseqSpaceCompaction(enableUnseqSpaceCompaction); ConfigFactory.getConfig().setEnableCrossSpaceCompaction(enableCrossSpaceCompaction); ConfigFactory.getConfig().setMaxNumberOfPointsInPage(numOfPointsPerPage); + ConfigFactory.getConfig().setMaxTsBlockLineNumber(maxTsBlockLineNumber); } } diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBAlignedSeriesQueryIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBAlignedSeriesQueryIT.java index fe12704faf..660d2dcfe3 100644 --- a/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBAlignedSeriesQueryIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBAlignedSeriesQueryIT.java @@ -70,15 +70,18 @@ public class IoTDBAlignedSeriesQueryIT { protected static boolean enableSeqSpaceCompaction; protected static boolean enableUnseqSpaceCompaction; protected static boolean enableCrossSpaceCompaction; + protected static int maxTsBlockLineNumber; @BeforeClass public static void setUp() throws Exception { enableSeqSpaceCompaction = ConfigFactory.getConfig().isEnableSeqSpaceCompaction(); enableUnseqSpaceCompaction = ConfigFactory.getConfig().isEnableUnseqSpaceCompaction(); enableCrossSpaceCompaction = ConfigFactory.getConfig().isEnableCrossSpaceCompaction(); + maxTsBlockLineNumber = ConfigFactory.getConfig().getMaxTsBlockLineNumber(); ConfigFactory.getConfig().setEnableSeqSpaceCompaction(false); ConfigFactory.getConfig().setEnableUnseqSpaceCompaction(false); ConfigFactory.getConfig().setEnableCrossSpaceCompaction(false); + ConfigFactory.getConfig().setMaxTsBlockLineNumber(3); EnvFactory.getEnv().initBeforeClass(); AlignedWriteUtil.insertData(); } @@ -89,6 +92,7 @@ public class IoTDBAlignedSeriesQueryIT { ConfigFactory.getConfig().setEnableSeqSpaceCompaction(enableSeqSpaceCompaction); ConfigFactory.getConfig().setEnableUnseqSpaceCompaction(enableUnseqSpaceCompaction); ConfigFactory.getConfig().setEnableCrossSpaceCompaction(enableCrossSpaceCompaction); + ConfigFactory.getConfig().setMaxTsBlockLineNumber(maxTsBlockLineNumber); } // ----------------------------------------Last Query----------------------------------------- diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBGroupByLevelQueryIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBGroupByLevelQueryIT.java index c267f81fc3..c6d0d93dba 100644 --- a/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBGroupByLevelQueryIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBGroupByLevelQueryIT.java @@ -43,15 +43,19 @@ public class IoTDBGroupByLevelQueryIT { protected static boolean enableSeqSpaceCompaction; protected static boolean enableUnseqSpaceCompaction; protected static boolean enableCrossSpaceCompaction; + protected static int maxTsBlockLineNumber; @BeforeClass public static void setUp() throws Exception { enableSeqSpaceCompaction = ConfigFactory.getConfig().isEnableSeqSpaceCompaction(); enableUnseqSpaceCompaction = ConfigFactory.getConfig().isEnableUnseqSpaceCompaction(); enableCrossSpaceCompaction = ConfigFactory.getConfig().isEnableCrossSpaceCompaction(); + maxTsBlockLineNumber = ConfigFactory.getConfig().getMaxTsBlockLineNumber(); + ConfigFactory.getConfig().setEnableSeqSpaceCompaction(false); ConfigFactory.getConfig().setEnableUnseqSpaceCompaction(false); ConfigFactory.getConfig().setEnableCrossSpaceCompaction(false); + ConfigFactory.getConfig().setMaxTsBlockLineNumber(3); EnvFactory.getEnv().initBeforeClass(); AlignedWriteUtil.insertData(); @@ -90,6 +94,7 @@ public class IoTDBGroupByLevelQueryIT { ConfigFactory.getConfig().setEnableSeqSpaceCompaction(enableSeqSpaceCompaction); ConfigFactory.getConfig().setEnableUnseqSpaceCompaction(enableUnseqSpaceCompaction); ConfigFactory.getConfig().setEnableCrossSpaceCompaction(enableCrossSpaceCompaction); + ConfigFactory.getConfig().setMaxTsBlockLineNumber(maxTsBlockLineNumber); } @Test diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBGroupByQueryWithValueFilterWithDeletion2IT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBGroupByQueryWithValueFilterWithDeletion2IT.java index c2b686420a..e88168ac5b 100644 --- a/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBGroupByQueryWithValueFilterWithDeletion2IT.java +++ b/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBGroupByQueryWithValueFilterWithDeletion2IT.java @@ -45,10 +45,12 @@ public class IoTDBGroupByQueryWithValueFilterWithDeletion2IT enableUnseqSpaceCompaction = ConfigFactory.getConfig().isEnableUnseqSpaceCompaction(); enableCrossSpaceCompaction = ConfigFactory.getConfig().isEnableCrossSpaceCompaction(); numOfPointsPerPage = ConfigFactory.getConfig().getMaxNumberOfPointsInPage(); + maxTsBlockLineNumber = ConfigFactory.getConfig().getMaxTsBlockLineNumber(); ConfigFactory.getConfig().setEnableSeqSpaceCompaction(false); ConfigFactory.getConfig().setEnableUnseqSpaceCompaction(false); ConfigFactory.getConfig().setEnableCrossSpaceCompaction(false); ConfigFactory.getConfig().setMaxNumberOfPointsInPage(3); + ConfigFactory.getConfig().setMaxTsBlockLineNumber(3); EnvFactory.getEnv().initBeforeClass(); @@ -70,6 +72,7 @@ public class IoTDBGroupByQueryWithValueFilterWithDeletion2IT ConfigFactory.getConfig().setEnableUnseqSpaceCompaction(enableUnseqSpaceCompaction); ConfigFactory.getConfig().setEnableCrossSpaceCompaction(enableCrossSpaceCompaction); ConfigFactory.getConfig().setMaxNumberOfPointsInPage(numOfPointsPerPage); + ConfigFactory.getConfig().setMaxTsBlockLineNumber(maxTsBlockLineNumber); EnvFactory.getEnv().cleanAfterClass(); } } diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBGroupByQueryWithValueFilterWithDeletionIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBGroupByQueryWithValueFilterWithDeletionIT.java index 09066e5952..3fb9f7d630 100644 --- a/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBGroupByQueryWithValueFilterWithDeletionIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBGroupByQueryWithValueFilterWithDeletionIT.java @@ -52,15 +52,18 @@ public class IoTDBGroupByQueryWithValueFilterWithDeletionIT { protected static boolean enableSeqSpaceCompaction; protected static boolean enableUnseqSpaceCompaction; protected static boolean enableCrossSpaceCompaction; + protected static int maxTsBlockLineNumber; @BeforeClass public static void setUp() throws Exception { enableSeqSpaceCompaction = ConfigFactory.getConfig().isEnableSeqSpaceCompaction(); enableUnseqSpaceCompaction = ConfigFactory.getConfig().isEnableUnseqSpaceCompaction(); enableCrossSpaceCompaction = ConfigFactory.getConfig().isEnableCrossSpaceCompaction(); + maxTsBlockLineNumber = ConfigFactory.getConfig().getMaxTsBlockLineNumber(); ConfigFactory.getConfig().setEnableSeqSpaceCompaction(false); ConfigFactory.getConfig().setEnableUnseqSpaceCompaction(false); ConfigFactory.getConfig().setEnableCrossSpaceCompaction(false); + ConfigFactory.getConfig().setMaxTsBlockLineNumber(3); EnvFactory.getEnv().initBeforeClass(); @@ -81,6 +84,7 @@ public class IoTDBGroupByQueryWithValueFilterWithDeletionIT { ConfigFactory.getConfig().setEnableSeqSpaceCompaction(enableSeqSpaceCompaction); ConfigFactory.getConfig().setEnableUnseqSpaceCompaction(enableUnseqSpaceCompaction); ConfigFactory.getConfig().setEnableCrossSpaceCompaction(enableCrossSpaceCompaction); + ConfigFactory.getConfig().setMaxTsBlockLineNumber(maxTsBlockLineNumber); EnvFactory.getEnv().cleanAfterClass(); } diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBGroupByQueryWithoutValueFilterWithDeletion2IT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBGroupByQueryWithoutValueFilterWithDeletion2IT.java index fa18a810e8..601653d092 100644 --- a/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBGroupByQueryWithoutValueFilterWithDeletion2IT.java +++ b/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBGroupByQueryWithoutValueFilterWithDeletion2IT.java @@ -45,11 +45,13 @@ public class IoTDBGroupByQueryWithoutValueFilterWithDeletion2IT enableUnseqSpaceCompaction = ConfigFactory.getConfig().isEnableUnseqSpaceCompaction(); enableCrossSpaceCompaction = ConfigFactory.getConfig().isEnableCrossSpaceCompaction(); numOfPointsPerPage = ConfigFactory.getConfig().getMaxNumberOfPointsInPage(); + maxTsBlockLineNumber = ConfigFactory.getConfig().getMaxTsBlockLineNumber(); ConfigFactory.getConfig().setEnableSeqSpaceCompaction(false); ConfigFactory.getConfig().setEnableUnseqSpaceCompaction(false); ConfigFactory.getConfig().setEnableCrossSpaceCompaction(false); ConfigFactory.getConfig().setMaxNumberOfPointsInPage(3); + ConfigFactory.getConfig().setMaxTsBlockLineNumber(3); EnvFactory.getEnv().initBeforeClass(); AlignedWriteUtil.insertData(); @@ -72,5 +74,6 @@ public class IoTDBGroupByQueryWithoutValueFilterWithDeletion2IT ConfigFactory.getConfig().setEnableUnseqSpaceCompaction(enableUnseqSpaceCompaction); ConfigFactory.getConfig().setEnableCrossSpaceCompaction(enableCrossSpaceCompaction); ConfigFactory.getConfig().setMaxNumberOfPointsInPage(numOfPointsPerPage); + ConfigFactory.getConfig().setMaxTsBlockLineNumber(maxTsBlockLineNumber); } } diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBGroupByQueryWithoutValueFilterWithDeletionIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBGroupByQueryWithoutValueFilterWithDeletionIT.java index f894d07810..2a4448ef90 100644 --- a/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBGroupByQueryWithoutValueFilterWithDeletionIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/db/it/aligned/IoTDBGroupByQueryWithoutValueFilterWithDeletionIT.java @@ -52,6 +52,7 @@ public class IoTDBGroupByQueryWithoutValueFilterWithDeletionIT { protected static boolean enableUnseqSpaceCompaction; protected static boolean enableCrossSpaceCompaction; protected static long prevPartitionInterval; + protected static int maxTsBlockLineNumber; private static final String TIMESTAMP_STR = "Time"; @@ -60,9 +61,11 @@ public class IoTDBGroupByQueryWithoutValueFilterWithDeletionIT { enableSeqSpaceCompaction = ConfigFactory.getConfig().isEnableSeqSpaceCompaction(); enableUnseqSpaceCompaction = ConfigFactory.getConfig().isEnableUnseqSpaceCompaction(); enableCrossSpaceCompaction = ConfigFactory.getConfig().isEnableCrossSpaceCompaction(); + maxTsBlockLineNumber = ConfigFactory.getConfig().getMaxTsBlockLineNumber(); ConfigFactory.getConfig().setEnableSeqSpaceCompaction(false); ConfigFactory.getConfig().setEnableUnseqSpaceCompaction(false); ConfigFactory.getConfig().setEnableCrossSpaceCompaction(false); + ConfigFactory.getConfig().setMaxTsBlockLineNumber(3); EnvFactory.getEnv().initBeforeClass(); AlignedWriteUtil.insertData(); @@ -84,6 +87,7 @@ public class IoTDBGroupByQueryWithoutValueFilterWithDeletionIT { ConfigFactory.getConfig().setEnableUnseqSpaceCompaction(enableUnseqSpaceCompaction); ConfigFactory.getConfig().setEnableCrossSpaceCompaction(enableCrossSpaceCompaction); ConfigFactory.getConfig().setPartitionInterval(prevPartitionInterval); + ConfigFactory.getConfig().setMaxTsBlockLineNumber(maxTsBlockLineNumber); EnvFactory.getEnv().cleanAfterClass(); } diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/env/StandaloneEnvConfig.java b/integration-test/src/test/java/org/apache/iotdb/db/it/env/StandaloneEnvConfig.java index 55e65be26d..30d21973a5 100644 --- a/integration-test/src/test/java/org/apache/iotdb/db/it/env/StandaloneEnvConfig.java +++ b/integration-test/src/test/java/org/apache/iotdb/db/it/env/StandaloneEnvConfig.java @@ -231,4 +231,15 @@ public class StandaloneEnvConfig implements BaseConfig { .setAvgSeriesPointNumberThreshold(avgSeriesPointNumberThreshold); return this; } + + @Override + public int getMaxTsBlockLineNumber() { + return TSFileDescriptor.getInstance().getConfig().getMaxTsBlockLineNumber(); + } + + @Override + public BaseConfig setMaxTsBlockLineNumber(int maxTsBlockLineNumber) { + TSFileDescriptor.getInstance().getConfig().setMaxTsBlockLineNumber(maxTsBlockLineNumber); + return this; + } } diff --git a/tsfile/src/main/java/org/apache/iotdb/tsfile/common/conf/TSFileConfig.java b/tsfile/src/main/java/org/apache/iotdb/tsfile/common/conf/TSFileConfig.java index 0b991aed74..a157d57058 100644 --- a/tsfile/src/main/java/org/apache/iotdb/tsfile/common/conf/TSFileConfig.java +++ b/tsfile/src/main/java/org/apache/iotdb/tsfile/common/conf/TSFileConfig.java @@ -154,7 +154,7 @@ public class TSFileConfig implements Serializable { private int maxTsBlockSizeInBytes = 1024 * 1024; /** Maximum number of lines in a single TsBlock */ - private int maxTsBlockLineNumber = 1024; + private int maxTsBlockLineNumber = 1000; public TSFileConfig() {}
