fix

Signed-off-by: Weihao Li <[email protected]>

Author: Wei-hao-Li

integration-test/src/test/java/org/apache/iotdb/relational/it/query/recent/informationschema/IoTDBCurrentQueriesIT.java

@@ -162,6 +162,9 @@ public void testCurrentQueries() {
 
     // 5. test privilege
     testPrivilege();
+
+    // 6. test more configurations
+    testMoreConfigurations();
   }
 
   private void testPrivilege() {
@@ -203,4 +206,53 @@ private void testPrivilege() {
           e.getMessage());
     }
   }
+
+  @Test
+  public void testMoreConfigurations() {
+    try {
+      Connection connection =
+              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\"='0'");
+      // query_cost_stat_window = 0, history queries are cleared
+      String sql = "SELECT * FROM current_queries WHERE state='FINISHED'";
+      ResultSet resultSet = statement.executeQuery(sql);
+      ResultSetMetaData metaData = resultSet.getMetaData();
+      Assert.assertEquals(CURRENT_QUERIES_COLUMN_NUM, metaData.getColumnCount());
+      int rowNum = 0;
+      while (resultSet.next()) {
+        rowNum++;
+      }
+      Assert.assertEquals(0, rowNum);
+      resultSet.close();
+
+      statement.execute("set configuration \"query_cost_stat_window\"='1040000000'");
+      // make query_cost_stat_window very large but not overflow
+      resultSet = statement.executeQuery(sql);
+      while (resultSet.next()) {
+        rowNum++;
+      }
+      resultSet.close();
+
+      resultSet = statement.executeQuery(sql);
+      rowNum = 0;
+      while (resultSet.next()) {
+        rowNum++;
+      }
+      // the history SQL is recorded
+      Assert.assertEquals(1, rowNum);
+      resultSet.close();
+
+      // make query_cost_stat_window overflow
+      try {
+        statement.execute("set configuration \"query_cost_stat_window\"='10400000000'");
+      } catch (Exception e) {
+        Assert.assertTrue(e.getMessage().contains("query_cost_stat_window"));
+      }
+    }  catch (Exception e) {
+      fail(e.getMessage().concat("java.lang.NumberFormatException: For input string: \"10400000000\""));
+    }
+  }
 }

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/Coordinator.java

@@ -837,12 +837,12 @@ private void unrecordInHistogram(float costTimeInSeconds) {
 
   private void clearExpiredQueriesInfoTask() {
     int queryCostStatWindow = CONFIG.getQueryCostStatWindow();
-    if (queryCostStatWindow <= 0) {
+    if (queryCostStatWindow <= 0 && currentQueriesInfo.isEmpty()) {
       return;
     }
 
     // the QueryInfo smaller than expired time will be cleared
-    long expiredTime = System.currentTimeMillis() - queryCostStatWindow * 60 * 1_000L;
+    long expiredTime = System.currentTimeMillis() - 1_000L * 60 * queryCostStatWindow;
     // peek head, the head QueryInfo is in the time window, return directly
     QueryInfo queryInfo = currentQueriesInfo.peekFirst();
     if (queryInfo == null || queryInfo.endTime >= expiredTime) {
@@ -886,7 +886,7 @@ public List<StatedQueriesInfo> getFinishedQueriesInfos() {
     long currentTime = System.currentTimeMillis();
     List<StatedQueriesInfo> result = new ArrayList<>();
     Iterator<QueryInfo> historyQueriesIterator = currentQueriesInfo.iterator();
-    long needRecordTime = currentTime - CONFIG.getQueryCostStatWindow() * 60 * 1_000L;
+    long needRecordTime = currentTime - 1_000L * 60 * CONFIG.getQueryCostStatWindow();
     while (historyQueriesIterator.hasNext()) {
       QueryInfo queryInfo = historyQueriesIterator.next();
       if (queryInfo.endTime < needRecordTime) {
@@ -908,7 +908,7 @@ public List<StatedQueriesInfo> getCurrentQueriesInfo() {
     Iterator<QueryInfo> historyQueriesIterator = currentQueriesInfo.iterator();
     Set<String> repetitionQueryIdSet = new HashSet<>();
     long currentTime = System.currentTimeMillis();
-    long needRecordTime = currentTime - CONFIG.getQueryCostStatWindow() * 60 * 1_000L;
+    long needRecordTime = currentTime - 1_000L * 60 * CONFIG.getQueryCostStatWindow();
     while (historyQueriesIterator.hasNext()) {
       QueryInfo queryInfo = historyQueriesIterator.next();
       if (queryInfo.endTime < needRecordTime) {