This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-doris.git
The following commit(s) were added to refs/heads/master by this push:
new 2682712 [Bug] Fix be ut compile failed and core in delta_writer_test
when ulimit < 60000. (#4941)
2682712 is described below
commit 2682712349f14067c9423b50f8a2d854c6628d5f
Author: HappenLee <[email protected]>
AuthorDate: Tue Nov 24 22:21:19 2020 +0800
[Bug] Fix be ut compile failed and core in delta_writer_test when ulimit <
60000. (#4941)
---
be/src/olap/storage_engine.cpp | 1 -
be/test/olap/delta_writer_test.cpp | 8 +++++---
be/test/runtime/fragment_mgr_test.cpp | 2 +-
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/be/src/olap/storage_engine.cpp b/be/src/olap/storage_engine.cpp
index 221754a..be3fbf1 100644
--- a/be/src/olap/storage_engine.cpp
+++ b/be/src/olap/storage_engine.cpp
@@ -139,7 +139,6 @@ StorageEngine::~StorageEngine() {
DEREGISTER_HOOK_METRIC(unused_rowsets_count);
DEREGISTER_HOOK_METRIC(compaction_mem_current_consumption);
_clear();
- _compaction_thread_pool->shutdown();
}
void StorageEngine::load_data_dirs(const std::vector<DataDir*>& data_dirs) {
diff --git a/be/test/olap/delta_writer_test.cpp
b/be/test/olap/delta_writer_test.cpp
index 7e5750c..336fb11 100644
--- a/be/test/olap/delta_writer_test.cpp
+++ b/be/test/olap/delta_writer_test.cpp
@@ -70,9 +70,11 @@ void set_up() {
}
void tear_down() {
- k_engine->stop();
- delete k_engine;
- k_engine = nullptr;
+ if (k_engine != nullptr) {
+ k_engine->stop();
+ delete k_engine;
+ k_engine = nullptr;
+ }
system("rm -rf ./data_test");
FileUtils::remove_all(std::string(getenv("DORIS_HOME")) + UNUSED_PREFIX);
}
diff --git a/be/test/runtime/fragment_mgr_test.cpp
b/be/test/runtime/fragment_mgr_test.cpp
index eb23dd9..f3d8689 100644
--- a/be/test/runtime/fragment_mgr_test.cpp
+++ b/be/test/runtime/fragment_mgr_test.cpp
@@ -39,7 +39,7 @@ PlanFragmentExecutor::~PlanFragmentExecutor() {}
Status PlanFragmentExecutor::prepare(
const TExecPlanFragmentParams& request,
- const BatchFragmentsCtx* batch_ctx) {
+ const QueryFragmentsCtx* batch_ctx) {
return s_prepare_status;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
