You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by mo...@apache.org on 2022/04/18 11:57:43 UTC
[incubator-doris] 04/17: [Refactor] remove some useless code (#8976)
This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch dev-1.0.1
in repository https://gitbox.apache.org/repos/asf/incubator-doris.git
commit 5390861756fdbd30ecf3a639155b2e45186dab72
Author: dataroaring <98...@users.noreply.github.com>
AuthorDate: Mon Apr 18 09:55:54 2022 +0800
[Refactor] remove some useless code (#8976)
---
be/src/exec/tablet_sink.cpp | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/be/src/exec/tablet_sink.cpp b/be/src/exec/tablet_sink.cpp
index 5604483012..998ae0336f 100644
--- a/be/src/exec/tablet_sink.cpp
+++ b/be/src/exec/tablet_sink.cpp
@@ -63,7 +63,6 @@ NodeChannel::~NodeChannel() noexcept {
delete _add_batch_closure;
_add_batch_closure = nullptr;
}
- _cur_add_batch_request.release_id();
}
// if "_cancelled" is set to true,
@@ -140,8 +139,6 @@ void NodeChannel::open() {
}
_stub->tablet_writer_open(&_open_closure->cntl, &request, &_open_closure->result,
_open_closure);
- request.release_id();
- request.release_schema();
}
void NodeChannel::_cancel_with_msg(const std::string& msg) {
@@ -434,16 +431,13 @@ void NodeChannel::cancel(const std::string& cancel_msg) {
auto closure = new RefCountClosure<PTabletWriterCancelResult>();
closure->ref();
- int remain_ms = _rpc_timeout_ms - _timeout_watch.elapsed_time() / NANOS_PER_MILLIS;
- if (UNLIKELY(remain_ms < config::min_load_rpc_timeout_ms)) {
- remain_ms = config::min_load_rpc_timeout_ms;
- }
+ int remain_ms = std::max(_rpc_timeout_ms - _timeout_watch.elapsed_time() / NANOS_PER_MILLIS,
+ (unsigned long long)config::min_load_rpc_timeout_ms);
closure->cntl.set_timeout_ms(remain_ms);
if (config::tablet_writer_ignore_eovercrowded) {
closure->cntl.ignore_eovercrowded();
}
_stub->tablet_writer_cancel(&closure->cntl, &request, &closure->result, closure);
- request.release_id();
}
int NodeChannel::try_send_and_fetch_status(std::unique_ptr<ThreadPoolToken>& thread_pool_token) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org