This is an automated email from the ASF dual-hosted git repository. hui pushed a commit to branch lmh/FixIntoOperator1.0 in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 03b5a5de5cdd26962618e796932502dcea1df652 Author: liuminghui233 <[email protected]> AuthorDate: Fri Nov 25 12:34:17 2022 +0800 add queryThreadCount config in IoTDBSelectIntoIT --- .../src/main/java/org/apache/iotdb/it/env/MppConfig.java | 9 +++++++++ .../main/java/org/apache/iotdb/itbase/env/BaseConfig.java | 8 ++++++++ .../org/apache/iotdb/db/it/env/StandaloneEnvConfig.java | 14 ++++++++++++++ .../apache/iotdb/db/it/selectinto/IoTDBSelectInto2IT.java | 3 +++ .../apache/iotdb/db/it/selectinto/IoTDBSelectInto3IT.java | 3 +++ .../apache/iotdb/db/it/selectinto/IoTDBSelectIntoIT.java | 5 +++++ 6 files changed, 42 insertions(+) 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 a50d828dfb..df5535bdf8 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 @@ -379,4 +379,13 @@ public class MppConfig implements BaseConfig { "least_data_region_group_num", String.valueOf(leastDataRegionGroupNum)); return this; } + + @Override + public BaseConfig setQueryThreadCount(int queryThreadCount) { + if (queryThreadCount <= 0) { + queryThreadCount = Runtime.getRuntime().availableProcessors(); + } + confignodeProperties.setProperty("query_thread_count", String.valueOf(queryThreadCount)); + 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 741e2f2d5c..31def0bc8b 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 @@ -404,4 +404,12 @@ public interface BaseConfig { default int getLeastDataRegionGroupNum() { return 5; } + + default BaseConfig setQueryThreadCount(int queryThreadCount) { + return this; + } + + default int getQueryThreadCount() { + return Runtime.getRuntime().availableProcessors(); + } } 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 32291cb01c..bb6aff4fb0 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 @@ -337,4 +337,18 @@ public class StandaloneEnvConfig implements BaseConfig { public int getSelectIntoInsertTabletPlanRowLimit() { return IoTDBDescriptor.getInstance().getConfig().getSelectIntoInsertTabletPlanRowLimit(); } + + @Override + public BaseConfig setQueryThreadCount(int queryThreadCount) { + if (queryThreadCount <= 0) { + queryThreadCount = Runtime.getRuntime().availableProcessors(); + } + IoTDBDescriptor.getInstance().getConfig().setQueryThreadCount(queryThreadCount); + return this; + } + + @Override + public int getQueryThreadCount() { + return IoTDBDescriptor.getInstance().getConfig().getQueryThreadCount(); + } } diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/selectinto/IoTDBSelectInto2IT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/selectinto/IoTDBSelectInto2IT.java index 33db4ce761..e6b3057a2e 100644 --- a/integration-test/src/test/java/org/apache/iotdb/db/it/selectinto/IoTDBSelectInto2IT.java +++ b/integration-test/src/test/java/org/apache/iotdb/db/it/selectinto/IoTDBSelectInto2IT.java @@ -41,8 +41,10 @@ public class IoTDBSelectInto2IT extends IoTDBSelectIntoIT { selectIntoInsertTabletPlanRowLimit = ConfigFactory.getConfig().getSelectIntoInsertTabletPlanRowLimit(); numOfPointsPerPage = ConfigFactory.getConfig().getMaxNumberOfPointsInPage(); + queryThreadCount = ConfigFactory.getConfig().getQueryThreadCount(); ConfigFactory.getConfig().setSelectIntoInsertTabletPlanRowLimit(8); ConfigFactory.getConfig().setMaxNumberOfPointsInPage(5); + ConfigFactory.getConfig().setQueryThreadCount(2); EnvFactory.getEnv().initBeforeClass(); prepareData(SQLs); } @@ -53,5 +55,6 @@ public class IoTDBSelectInto2IT extends IoTDBSelectIntoIT { ConfigFactory.getConfig() .setSelectIntoInsertTabletPlanRowLimit(selectIntoInsertTabletPlanRowLimit); ConfigFactory.getConfig().setMaxNumberOfPointsInPage(numOfPointsPerPage); + ConfigFactory.getConfig().setQueryThreadCount(queryThreadCount); } } diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/selectinto/IoTDBSelectInto3IT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/selectinto/IoTDBSelectInto3IT.java index 12b8425f9d..23796e317c 100644 --- a/integration-test/src/test/java/org/apache/iotdb/db/it/selectinto/IoTDBSelectInto3IT.java +++ b/integration-test/src/test/java/org/apache/iotdb/db/it/selectinto/IoTDBSelectInto3IT.java @@ -40,7 +40,9 @@ public class IoTDBSelectInto3IT extends IoTDBSelectIntoIT { public static void setUp() throws Exception { selectIntoInsertTabletPlanRowLimit = ConfigFactory.getConfig().getSelectIntoInsertTabletPlanRowLimit(); + queryThreadCount = ConfigFactory.getConfig().getQueryThreadCount(); ConfigFactory.getConfig().setSelectIntoInsertTabletPlanRowLimit(5); + ConfigFactory.getConfig().setQueryThreadCount(2); EnvFactory.getEnv().initBeforeClass(); prepareData(SQLs); } @@ -50,5 +52,6 @@ public class IoTDBSelectInto3IT extends IoTDBSelectIntoIT { EnvFactory.getEnv().cleanAfterClass(); ConfigFactory.getConfig() .setSelectIntoInsertTabletPlanRowLimit(selectIntoInsertTabletPlanRowLimit); + ConfigFactory.getConfig().setQueryThreadCount(queryThreadCount); } } diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/selectinto/IoTDBSelectIntoIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/selectinto/IoTDBSelectIntoIT.java index 6236fcd7cf..bbbaf1e330 100644 --- a/integration-test/src/test/java/org/apache/iotdb/db/it/selectinto/IoTDBSelectIntoIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/db/it/selectinto/IoTDBSelectIntoIT.java @@ -19,6 +19,7 @@ package org.apache.iotdb.db.it.selectinto; +import org.apache.iotdb.it.env.ConfigFactory; import org.apache.iotdb.it.env.EnvFactory; import org.apache.iotdb.it.framework.IoTDBTestRunner; import org.apache.iotdb.itbase.category.ClusterIT; @@ -47,6 +48,7 @@ public class IoTDBSelectIntoIT { protected static int selectIntoInsertTabletPlanRowLimit; protected static int numOfPointsPerPage; + protected static int queryThreadCount; protected static final String[] SQLs = new String[] { @@ -106,6 +108,8 @@ public class IoTDBSelectIntoIT { @BeforeClass public static void setUp() throws Exception { + queryThreadCount = ConfigFactory.getConfig().getQueryThreadCount(); + ConfigFactory.getConfig().setQueryThreadCount(2); EnvFactory.getEnv().initBeforeClass(); prepareData(SQLs); } @@ -113,6 +117,7 @@ public class IoTDBSelectIntoIT { @AfterClass public static void tearDown() throws Exception { EnvFactory.getEnv().cleanAfterClass(); + ConfigFactory.getConfig().setQueryThreadCount(queryThreadCount); } // -------------------------------------- ALIGN BY TIME ---------------------------------------
