Skip to content

[fix](statistics)Fix AnalysisTaskExecutor unit test timeout. (#36456) #36948

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Jibing-Li merged 1 commit into from
Jun 28, 2024
Merged

[fix](statistics)Fix AnalysisTaskExecutor unit test timeout. (#36456) #36948

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions fe/fe-core/src/main/java/org/apache/doris/statistics/AnalysisTaskExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,4 +105,9 @@ public void clear() {
executors.getQueue().clear();
taskQueue.clear();
}

// For unit test only.
public BlockingQueue<AnalysisTaskWrapper> getTaskQueue() {
return taskQueue;
}
}
7 changes: 2 additions & 5 deletions fe/fe-core/src/test/java/org/apache/doris/statistics/AnalysisTaskExecutorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.atomic.AtomicBoolean;

public class AnalysisTaskExecutorTest extends TestWithFeService {
Expand Down Expand Up @@ -104,14 +103,12 @@ public boolean cancel(String msg) {
OlapAnalysisTask analysisJob = new OlapAnalysisTask(analysisJobInfo);

AnalysisTaskExecutor analysisTaskExecutor = new AnalysisTaskExecutor(1);
BlockingQueue<AnalysisTaskWrapper> b = Deencapsulation.getField(analysisTaskExecutor, "taskQueue");
AnalysisTaskWrapper analysisTaskWrapper = new AnalysisTaskWrapper(analysisTaskExecutor, analysisJob);
Deencapsulation.setField(analysisTaskWrapper, "startTime", 5);
b.put(analysisTaskWrapper);
analysisTaskExecutor.putJob(analysisTaskWrapper);
analysisTaskExecutor.tryToCancel();
Assertions.assertTrue(cancelled.get());
Assertions.assertTrue(b.isEmpty());

Assertions.assertEquals(0, analysisTaskExecutor.getTaskQueue().size());
}

@Test
Expand Down