You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by ga...@apache.org on 2023/11/23 03:53:13 UTC
(doris) branch master updated: [pipelineX](minor) remove unused code (#27446)
This is an automated email from the ASF dual-hosted git repository.
gabriellee pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 75d1594d11b [pipelineX](minor) remove unused code (#27446)
75d1594d11b is described below
commit 75d1594d11bb581416a8e9f56d24fe5d9764766b
Author: Gabriel <ga...@gmail.com>
AuthorDate: Thu Nov 23 11:53:06 2023 +0800
[pipelineX](minor) remove unused code (#27446)
---
be/src/pipeline/pipeline_x/dependency.cpp | 4 ++--
be/src/pipeline/pipeline_x/pipeline_x_task.cpp | 15 +--------------
be/src/pipeline/pipeline_x/pipeline_x_task.h | 3 +--
be/src/runtime/fragment_mgr.cpp | 6 +++---
4 files changed, 7 insertions(+), 21 deletions(-)
diff --git a/be/src/pipeline/pipeline_x/dependency.cpp b/be/src/pipeline/pipeline_x/dependency.cpp
index 00a7d012c98..073bd27d3d5 100644
--- a/be/src/pipeline/pipeline_x/dependency.cpp
+++ b/be/src/pipeline/pipeline_x/dependency.cpp
@@ -49,7 +49,7 @@ void Dependency::set_ready() {
local_block_task.swap(_blocked_task);
}
for (auto* task : local_block_task) {
- task->try_wake_up(this);
+ task->wake_up();
}
}
@@ -225,7 +225,7 @@ void RuntimeFilterDependency::sub_filters() {
local_block_task.swap(_blocked_task);
}
for (auto* task : local_block_task) {
- task->try_wake_up(this);
+ task->wake_up();
}
}
}
diff --git a/be/src/pipeline/pipeline_x/pipeline_x_task.cpp b/be/src/pipeline/pipeline_x/pipeline_x_task.cpp
index 110faba5ca1..24a090c6998 100644
--- a/be/src/pipeline/pipeline_x/pipeline_x_task.cpp
+++ b/be/src/pipeline/pipeline_x/pipeline_x_task.cpp
@@ -380,21 +380,8 @@ std::string PipelineXTask::debug_string() {
return fmt::to_string(debug_string_buffer);
}
-void PipelineXTask::try_wake_up(Dependency* wake_up_dep) {
+void PipelineXTask::wake_up() {
// call by dependency
- VecDateTimeValue now = VecDateTimeValue::local_time();
- // TODO(gabriel): task will never be wake up if canceled / timeout
- if (query_context()->is_cancelled()) {
- _make_run();
- return;
- }
- if (query_context()->is_timeout(now)) {
- query_context()->cancel(true, "", Status::Cancelled(""));
- }
- _make_run();
-}
-
-void PipelineXTask::_make_run() {
static_cast<void>(get_task_queue()->push_back(this));
}
diff --git a/be/src/pipeline/pipeline_x/pipeline_x_task.h b/be/src/pipeline/pipeline_x/pipeline_x_task.h
index 621773b2ac1..3cdc019bec7 100644
--- a/be/src/pipeline/pipeline_x/pipeline_x_task.h
+++ b/be/src/pipeline/pipeline_x/pipeline_x_task.h
@@ -114,7 +114,7 @@ public:
bool is_pipelineX() const override { return true; }
- void try_wake_up(Dependency* wake_up_dep);
+ void wake_up();
DataSinkOperatorXPtr sink() const { return _sink; }
@@ -181,7 +181,6 @@ private:
}
Status _extract_dependencies();
- void _make_run();
void set_close_pipeline_time() override {}
void _init_profile() override;
void _fresh_profile_counter() override;
diff --git a/be/src/runtime/fragment_mgr.cpp b/be/src/runtime/fragment_mgr.cpp
index c0153652d26..c004f34c38b 100644
--- a/be/src/runtime/fragment_mgr.cpp
+++ b/be/src/runtime/fragment_mgr.cpp
@@ -795,9 +795,9 @@ std::string FragmentMgr::dump_pipeline_tasks() {
fmt::format_to(debug_string_buffer, "{} pipeline fragment contexts are still running!\n",
_pipeline_map.size());
for (auto& it : _pipeline_map) {
- fmt::format_to(debug_string_buffer, "No.{} (elapse time = {}, InstanceId = {}) : {}\n",
- i, t - it.second->create_time(), print_id(it.first),
- it.second->debug_string());
+ fmt::format_to(
+ debug_string_buffer, "No.{} (elapse time = {}ns, InstanceId = {}) : {}\n", i,
+ t - it.second->create_time(), print_id(it.first), it.second->debug_string());
i++;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org