This is an automated email from the ASF dual-hosted git repository.
lijibing pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.0 by this push:
new 2a99862c6b6 [fix](statistics)Fix AnalysisTaskExecutor unit test
timeout. (#36456) (#36943)
2a99862c6b6 is described below
commit 2a99862c6b650721cd7a01228709501df74c2a7a
Author: Jibing-Li <[email protected]>
AuthorDate: Fri Jun 28 11:00:19 2024 +0800
[fix](statistics)Fix AnalysisTaskExecutor unit test timeout. (#36456)
(#36943)
Deencapsulation.getField sometime doesn't work as expected, which may
cause FE unit test timeout. Add get function in source code to make it
easier.
backport: https://github.com/apache/doris/pull/36456
---
.../java/org/apache/doris/statistics/AnalysisTaskExecutor.java | 5 +++++
.../java/org/apache/doris/statistics/AnalysisTaskExecutorTest.java | 7 ++-----
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/statistics/AnalysisTaskExecutor.java
b/fe/fe-core/src/main/java/org/apache/doris/statistics/AnalysisTaskExecutor.java
index 3bdccaca047..5277d8025fc 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/statistics/AnalysisTaskExecutor.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/statistics/AnalysisTaskExecutor.java
@@ -105,4 +105,9 @@ public class AnalysisTaskExecutor {
executors.getQueue().clear();
taskQueue.clear();
}
+
+ // For unit test only.
+ public BlockingQueue<AnalysisTaskWrapper> getTaskQueue() {
+ return taskQueue;
+ }
}
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/statistics/AnalysisTaskExecutorTest.java
b/fe/fe-core/src/test/java/org/apache/doris/statistics/AnalysisTaskExecutorTest.java
index 8cfcfeabd28..d73dc45509a 100644
---
a/fe/fe-core/src/test/java/org/apache/doris/statistics/AnalysisTaskExecutorTest.java
+++
b/fe/fe-core/src/test/java/org/apache/doris/statistics/AnalysisTaskExecutorTest.java
@@ -45,7 +45,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.concurrent.BlockingQueue;
import java.util.concurrent.atomic.AtomicBoolean;
public class AnalysisTaskExecutorTest extends TestWithFeService {
@@ -105,14 +104,12 @@ public class AnalysisTaskExecutorTest extends
TestWithFeService {
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
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
