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 baed26acc6 [fix](merge-on-write) fix publish timeout (#20891)
baed26acc6 is described below
commit baed26acc6ddd5041c23ca813c76d62bd8f3cad2
Author: zhannngchen <[email protected]>
AuthorDate: Fri Jun 16 18:11:41 2023 +0800
[fix](merge-on-write) fix publish timeout (#20891)
---
be/src/olap/delta_writer.cpp | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/be/src/olap/delta_writer.cpp b/be/src/olap/delta_writer.cpp
index 9e86c7fd85..6789e12e19 100644
--- a/be/src/olap/delta_writer.cpp
+++ b/be/src/olap/delta_writer.cpp
@@ -453,9 +453,11 @@ Status DeltaWriter::close_wait(const PSlaveTabletNodes&
slave_tablet_nodes,
RETURN_IF_ERROR(_tablet->calc_delete_bitmap_between_segments(_cur_rowset,
segments,
_delete_bitmap));
}
- RETURN_IF_ERROR(_tablet->commit_phase_update_delete_bitmap(
- _cur_rowset, _rowset_ids, _delete_bitmap,
_tablet->max_version().second, segments,
- _rowset_writer.get()));
+ int64_t cur_max_version = _tablet->max_version().second;
+
RETURN_IF_ERROR(_tablet->commit_phase_update_delete_bitmap(_cur_rowset,
_rowset_ids,
+
_delete_bitmap, cur_max_version,
+ segments,
_rowset_writer.get()));
+ _rowset_ids = _tablet->all_rs_id(cur_max_version);
}
Status res = _storage_engine->txn_manager()->commit_txn(_req.partition_id,
_tablet, _req.txn_id,
_req.load_id,
_cur_rowset, false);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
