diff --git a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/recent/informationschema/IoTDBCurrentQueriesIT.java b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/recent/informationschema/IoTDBCurrentQueriesIT.java index 66941ec784f8..a68bd92b50b4 100644 --- a/integration-test/src/test/java/org/apache/iotdb/relational/it/query/recent/informationschema/IoTDBCurrentQueriesIT.java +++ b/integration-test/src/test/java/org/apache/iotdb/relational/it/query/recent/informationschema/IoTDBCurrentQueriesIT.java @@ -64,7 +64,6 @@ public class IoTDBCurrentQueriesIT { @BeforeClass public static void setUp() throws Exception { - EnvFactory.getEnv().getConfig().getDataNodeConfig().setQueryCostStatWindow(1); EnvFactory.getEnv().initClusterEnvironment(); createUser("test", "test123123456"); } @@ -81,6 +80,7 @@ public void testCurrentQueries() { EnvFactory.getEnv().getConnection(ADMIN_NAME, ADMIN_PWD, BaseEnv.TABLE_SQL_DIALECT); Statement statement = connection.createStatement(); statement.execute("USE information_schema"); + statement.execute("set configuration \"query_cost_stat_window\"='1'"); // 1. query current_queries table String sql = "SELECT * FROM current_queries"; diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java index cfdb4c141b41..2fb7f7efdf0a 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java @@ -2034,6 +2034,12 @@ public synchronized void loadHotModifiedProps(TrimProperties properties) properties.getProperty( "slow_query_threshold", ConfigurationFileUtils.getConfigurationDefaultValue("slow_query_threshold")))); + // update query_cost_stat_window + conf.setQueryCostStatWindow( + Integer.parseInt( + properties.getProperty( + "query_cost_stat_window", + ConfigurationFileUtils.getConfigurationDefaultValue("query_cost_stat_window")))); // update select into operation max buffer size conf.setIntoOperationBufferSizeInByte( Long.parseLong( diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/ConfigExecution.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/ConfigExecution.java index 823a620820fd..7868460f3870 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/ConfigExecution.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/execution/config/ConfigExecution.java @@ -354,6 +354,7 @@ public String getUser() { return context.getSession().getUserName(); } + @Override public String getClientHostname() { return context.getCliHostname(); }