Skip to content

Commit d166e0e

Browse files
committed
fix CI and add peek in clearTask
Signed-off-by: Weihao Li <[email protected]>
1 parent 587e4bf commit d166e0e

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

integration-test/src/test/java/org/apache/iotdb/relational/it/schema/IoTDBDatabaseIT.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -399,6 +399,7 @@ public void testInformationSchema() throws SQLException {
399399
"config_nodes,INF,",
400400
"configurations,INF,",
401401
"connections,INF,",
402+
"current_queries,INF,",
402403
"data_nodes,INF,",
403404
"databases,INF,",
404405
"functions,INF,",
@@ -408,6 +409,7 @@ public void testInformationSchema() throws SQLException {
408409
"pipe_plugins,INF,",
409410
"pipes,INF,",
410411
"queries,INF,",
412+
"queries_costs_histogram,INF,",
411413
"regions,INF,",
412414
"subscriptions,INF,",
413415
"tables,INF,",

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -831,10 +831,17 @@ private void clearExpiredQueriesInfoTask() {
831831

832832
// the QueryInfo smaller than expired time will be cleared
833833
long expiredTime = System.currentTimeMillis() - queryCostStatWindow * 60 * 1_000;
834-
QueryInfo queryInfo = currentQueriesInfo.poll();
834+
// peek head, the head QueryInfo is in the time window, return directly
835+
QueryInfo queryInfo = currentQueriesInfo.peekFirst();
836+
if (queryInfo.endTime >= expiredTime) {
837+
return;
838+
}
839+
840+
queryInfo = currentQueriesInfo.poll();
835841
while (queryInfo != null) {
836842
if (queryInfo.endTime < expiredTime) {
837843
// out of time window, clear queryInfo
844+
coordinatorMemoryBlock.release(RamUsageEstimator.sizeOfObject(queryInfo));
838845
unrecordInHistogram(queryInfo.costTime);
839846
queryInfo = currentQueriesInfo.poll();
840847
} else {

0 commit comments

Comments
 (0)