This is an automated email from the ASF dual-hosted git repository. yiguolei pushed a commit to branch branch-2.1 in repository https://gitbox.apache.org/repos/asf/doris.git
commit 79a83e9e1a637d66dd2c01dc34fa206b9e8907ee Author: Kaijie Chen <[email protected]> AuthorDate: Fri Feb 2 19:15:04 2024 +0800 [fix](move-memtable) use signed integer when calculating remain ms (#30750) --- be/src/vec/sink/writer/vtablet_writer_v2.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/be/src/vec/sink/writer/vtablet_writer_v2.cpp b/be/src/vec/sink/writer/vtablet_writer_v2.cpp index f2fdbcaece3..e0576ac11da 100644 --- a/be/src/vec/sink/writer/vtablet_writer_v2.cpp +++ b/be/src/vec/sink/writer/vtablet_writer_v2.cpp @@ -551,15 +551,15 @@ Status VTabletWriterV2::close(Status exec_status) { { SCOPED_TIMER(_close_load_timer); - auto remain_ms = _state->execution_timeout() * 1000 - - _timeout_watch.elapsed_time() / 1000 / 1000; - if (remain_ms <= 0) { - LOG(WARNING) << "load timed out before close waiting, load_id=" - << print_id(_load_id); - return Status::TimedOut("load timed out before close waiting"); - } for (const auto& [_, streams] : _streams_for_node) { for (const auto& stream : streams->streams()) { + int64_t remain_ms = static_cast<int64_t>(_state->execution_timeout()) * 1000 - + _timeout_watch.elapsed_time() / 1000 / 1000; + if (remain_ms <= 0) { + LOG(WARNING) << "load timed out before close waiting, load_id=" + << print_id(_load_id); + return Status::TimedOut("load timed out before close waiting"); + } RETURN_IF_ERROR(stream->close_wait(remain_ms)); } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
