From efb7c7392bacac07ccb9e1564cc33e28621082f6 Mon Sep 17 00:00:00 2001 From: morningman Date: Mon, 7 Sep 2020 09:54:34 +0800 Subject: [PATCH 1/2] [Bug] Fix bug that task_worker_pool not work The number of thread initialized in task worker pool is not right. This bug is introduced from #4440 --- be/src/agent/task_worker_pool.cpp | 6 ++++-- .../test/java/org/apache/doris/analysis/SelectStmtTest.java | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/be/src/agent/task_worker_pool.cpp b/be/src/agent/task_worker_pool.cpp index dacc123f3d37bb..411e294772c783 100644 --- a/be/src/agent/task_worker_pool.cpp +++ b/be/src/agent/task_worker_pool.cpp @@ -192,8 +192,10 @@ void TaskWorkerPool::start() { .set_max_threads(_worker_count) .build(&_thread_pool); - auto st = _thread_pool->submit_func(cb); - CHECK(st.ok()) << st.to_string(); + for (int i = 0; i < _worker_count; i++) { + auto st = _thread_pool->submit_func(cb); + CHECK(st.ok()) << st.to_string(); + } #endif } diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/SelectStmtTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/SelectStmtTest.java index 9a65be502423b3..e4359ab523a566 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/analysis/SelectStmtTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/SelectStmtTest.java @@ -47,6 +47,7 @@ public static void tearDown() throws Exception { @BeforeClass public static void setUp() throws Exception { + Config.enable_batch_delete_by_default = true; UtFrameUtils.createMinDorisCluster(runningDir); String createTblStmtStr = "create table db1.tbl1(k1 varchar(32), k2 varchar(32), k3 varchar(32), k4 int) " + "AGGREGATE KEY(k1, k2,k3,k4) distributed by hash(k1) buckets 3 properties('replication_num' = '1');"; From 66879827cafa000ff7862b87de87a305a512c2a7 Mon Sep 17 00:00:00 2001 From: morningman Date: Mon, 7 Sep 2020 10:11:19 +0800 Subject: [PATCH 2/2] fix ut --- .../src/test/java/org/apache/doris/analysis/SelectStmtTest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/SelectStmtTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/SelectStmtTest.java index e4359ab523a566..3df31d61dadef3 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/analysis/SelectStmtTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/SelectStmtTest.java @@ -18,6 +18,7 @@ package org.apache.doris.analysis; import org.apache.doris.common.AnalysisException; +import org.apache.doris.common.Config; import org.apache.doris.qe.ConnectContext; import org.apache.doris.planner.Planner; import org.apache.doris.qe.VariableMgr;