This is an automated email from the ASF dual-hosted git repository.
panxiaolei 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 3d9863f7033 [Chore](log) adjust output order on
PrintInstanceStandardInfo and reduce warning log when rpc finished (#33652)
3d9863f7033 is described below
commit 3d9863f7033fde6dbb57373d51ba78346df08610
Author: Pxl <[email protected]>
AuthorDate: Mon Apr 15 18:44:03 2024 +0800
[Chore](log) adjust output order on PrintInstanceStandardInfo and reduce
warning log when rpc finished (#33652)
adjust output order on PrintInstanceStandardInfo and reduce warning log
when rpc finished
---
be/src/pipeline/pipeline_fragment_context.h | 4 ----
be/src/pipeline/pipeline_x/pipeline_x_fragment_context.h | 5 -----
be/src/util/debug_util.cpp | 2 +-
be/src/vec/runtime/vdata_stream_mgr.cpp | 4 ++--
be/src/vec/sink/vdata_stream_sender.h | 2 +-
5 files changed, 4 insertions(+), 13 deletions(-)
diff --git a/be/src/pipeline/pipeline_fragment_context.h
b/be/src/pipeline/pipeline_fragment_context.h
index c75a95b9088..009a2a2f22d 100644
--- a/be/src/pipeline/pipeline_fragment_context.h
+++ b/be/src/pipeline/pipeline_fragment_context.h
@@ -79,10 +79,6 @@ public:
RuntimeState* get_runtime_state() { return _runtime_state.get(); }
- virtual RuntimeFilterMgr* get_runtime_filter_mgr(UniqueId
/*fragment_instance_id*/) {
- return _runtime_state->local_runtime_filter_mgr();
- }
-
QueryContext* get_query_ctx() { return _query_ctx.get(); }
// should be protected by lock?
[[nodiscard]] bool is_canceled() const { return
_runtime_state->is_cancelled(); }
diff --git a/be/src/pipeline/pipeline_x/pipeline_x_fragment_context.h
b/be/src/pipeline/pipeline_x/pipeline_x_fragment_context.h
index c93799ca037..34d00c07652 100644
--- a/be/src/pipeline/pipeline_x/pipeline_x_fragment_context.h
+++ b/be/src/pipeline/pipeline_x/pipeline_x_fragment_context.h
@@ -104,11 +104,6 @@ public:
Status send_report(bool) override;
- RuntimeFilterMgr* get_runtime_filter_mgr(UniqueId fragment_instance_id)
override {
- DCHECK(_runtime_filter_mgr_map.contains(fragment_instance_id));
- return _runtime_filter_mgr_map[fragment_instance_id].get();
- }
-
[[nodiscard]] int next_operator_id() { return _operator_id--; }
[[nodiscard]] int max_operator_id() const { return _operator_id; }
diff --git a/be/src/util/debug_util.cpp b/be/src/util/debug_util.cpp
index 37243a6935b..1cf03d2c22d 100644
--- a/be/src/util/debug_util.cpp
+++ b/be/src/util/debug_util.cpp
@@ -129,7 +129,7 @@ std::string PrintFrontendInfo(const TFrontendInfo& fe_info)
{
}
std::string PrintInstanceStandardInfo(const TUniqueId& qid, const TUniqueId&
iid) {
- return fmt::format("{}|{}", print_id(iid), print_id(qid));
+ return fmt::format("{}|{}", print_id(qid), print_id(iid));
}
} // namespace doris
diff --git a/be/src/vec/runtime/vdata_stream_mgr.cpp
b/be/src/vec/runtime/vdata_stream_mgr.cpp
index 42e7df4e3cf..75ac55dac50 100644
--- a/be/src/vec/runtime/vdata_stream_mgr.cpp
+++ b/be/src/vec/runtime/vdata_stream_mgr.cpp
@@ -119,7 +119,7 @@ Status VDataStreamMgr::transmit_block(const
PTransmitDataParams* request,
//
// TODO: Rethink the lifecycle of DataStreamRecvr to distinguish
// errors from receiver-initiated teardowns.
- return Status::EndOfFile("data stream receiver closed");
+ return Status::OK(); // local data stream receiver closed
}
// Lock the fragment context to ensure the runtime state and other objects
are not
@@ -129,7 +129,7 @@ Status VDataStreamMgr::transmit_block(const
PTransmitDataParams* request,
// Do not return internal error, because when query finished, the
downstream node
// may finish before upstream node. And the object maybe
deconstructed. If return error
// then the upstream node may report error status to FE, the query is
failed.
- return Status::EndOfFile("data stream receiver is deconstructed");
+ return Status::OK(); // data stream receiver is deconstructed
}
bool eos = request->eos();
diff --git a/be/src/vec/sink/vdata_stream_sender.h
b/be/src/vec/sink/vdata_stream_sender.h
index 8119b5a35f9..726f5b7935b 100644
--- a/be/src/vec/sink/vdata_stream_sender.h
+++ b/be/src/vec/sink/vdata_stream_sender.h
@@ -347,7 +347,7 @@ protected:
if (_local_recvr && !_local_recvr->is_closed()) {
return true;
}
- _receiver_status = Status::EndOfFile("local data stream receiver
closed");
+ _receiver_status = Status::OK(); // local data stream receiver closed
return false;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
