This is an automated email from the ASF dual-hosted git repository.
dataroaring 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 33002096491 [fix](move-memtable) use signed integer when calculating
remain ms (#30750)
33002096491 is described below
commit 33002096491bbd704c339b27127b2b673b790c5d
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 119da12c708..af278228eb0 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]
