Skip to content

Commit e12d382

Browse files
committed
When updating query info, return existing final info if already set
1 parent 40258f7 commit e12d382

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

core/trino-main/src/main/java/io/trino/execution/QueryStateMachine.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1387,7 +1387,10 @@ public QueryInfo updateQueryInfo(Optional<StageInfo> stageInfo)
13871387
{
13881388
QueryInfo queryInfo = getQueryInfo(stageInfo);
13891389
if (queryInfo.isFinalQueryInfo()) {
1390-
finalQueryInfo.compareAndSet(Optional.empty(), Optional.of(queryInfo));
1390+
if (!finalQueryInfo.compareAndSet(Optional.empty(), Optional.of(queryInfo))) {
1391+
// use the final query info if it is already set
1392+
queryInfo = finalQueryInfo.get().orElseThrow();
1393+
}
13911394
}
13921395
return queryInfo;
13931396
}

0 commit comments

Comments
 (0)