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 401be166bbc [compile](minor) Fix unsafe type conversion (#41534)
401be166bbc is described below
commit 401be166bbcab6dbda9044852000d5f0714f3bc5
Author: Gabriel <gabrielleeb...@gmail.com>
AuthorDate: Tue Oct 8 20:40:21 2024 +0800
[compile](minor) Fix unsafe type conversion (#41534)
---
be/src/pipeline/pipeline.h | 2 +-
be/src/pipeline/pipeline_fragment_context.cpp | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/be/src/pipeline/pipeline.h b/be/src/pipeline/pipeline.h
index 8d28b43550f..8a20ccb631c 100644
--- a/be/src/pipeline/pipeline.h
+++ b/be/src/pipeline/pipeline.h
@@ -105,7 +105,7 @@ public:
void set_children(std::shared_ptr<Pipeline> child) {
_children.push_back(child); }
void set_children(std::vector<std::shared_ptr<Pipeline>> children) {
_children = children; }
- void incr_created_tasks(size_t i, PipelineTask* task) {
+ void incr_created_tasks(int i, PipelineTask* task) {
_num_tasks_created++;
_num_tasks_running++;
DCHECK_LT(i, _tasks.size());
diff --git a/be/src/pipeline/pipeline_fragment_context.cpp
b/be/src/pipeline/pipeline_fragment_context.cpp
index 54c49321389..32492c317ad 100644
--- a/be/src/pipeline/pipeline_fragment_context.cpp
+++ b/be/src/pipeline/pipeline_fragment_context.cpp
@@ -371,7 +371,7 @@ Status PipelineFragmentContext::_build_pipeline_tasks(const
doris::TPipelineFrag
}
auto pipeline_id_to_profile =
_runtime_state->build_pipeline_profile(_pipelines.size());
- auto pre_and_submit = [&](int64_t i, PipelineFragmentContext* ctx) {
+ auto pre_and_submit = [&](int i, PipelineFragmentContext* ctx) {
const auto& local_params = request.local_params[i];
auto fragment_instance_id = local_params.fragment_instance_id;
_fragment_instance_ids[i] = fragment_instance_id;
@@ -540,7 +540,7 @@ Status PipelineFragmentContext::_build_pipeline_tasks(const
doris::TPipelineFrag
std::mutex m;
std::condition_variable cv;
int prepare_done = 0;
- for (size_t i = 0; i < target_size; i++) {
+ for (int i = 0; i < target_size; i++) {
RETURN_IF_ERROR(thread_pool->submit_func([&, i]() {
SCOPED_ATTACH_TASK(_query_ctx.get());
prepare_status[i] = pre_and_submit(i, this);
@@ -554,14 +554,14 @@ Status
PipelineFragmentContext::_build_pipeline_tasks(const doris::TPipelineFrag
std::unique_lock<std::mutex> lock(m);
if (prepare_done != target_size) {
cv.wait(lock);
- for (size_t i = 0; i < target_size; i++) {
+ for (int i = 0; i < target_size; i++) {
if (!prepare_status[i].ok()) {
return prepare_status[i];
}
}
}
} else {
- for (size_t i = 0; i < target_size; i++) {
+ for (int i = 0; i < target_size; i++) {
RETURN_IF_ERROR(pre_and_submit(i, this));
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
