[incubator-doris] branch master updated: [Refactor] remove some useless code (#8976)

[yi...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

yiguolei 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 de7dce4df8 [Refactor] remove some useless code (#8976)
de7dce4df8 is described below

commit de7dce4df84fcbfbbaf715cbac151e802321f80f
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 e8b35c16d1..dcd17dcb0a 100644
--- a/be/src/exec/tablet_sink.cpp
+++ b/be/src/exec/tablet_sink.cpp
@@ -65,7 +65,6 @@ NodeChannel::~NodeChannel() noexcept {
         delete _add_batch_closure;
         _add_batch_closure = nullptr;
     }
-    _cur_add_batch_request.release_id();
 }
 
 // if "_cancelled" is set to true,
@@ -144,8 +143,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) {
@@ -446,16 +443,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(RuntimeState* state,


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org