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 8f67af66497 [fix](merge-cloud) Fix gcc compile failed (#31961)
8f67af66497 is described below
commit 8f67af664977adaf8849a43bcb3547280cf9c09b
Author: Xin Liao <liaoxin...@126.com>
AuthorDate: Thu Mar 7 23:23:15 2024 +0800
[fix](merge-cloud) Fix gcc compile failed (#31961)
---
be/src/cloud/cloud_base_compaction.cpp | 8 ++++----
be/src/cloud/cloud_cumulative_compaction.cpp | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/be/src/cloud/cloud_base_compaction.cpp
b/be/src/cloud/cloud_base_compaction.cpp
index bc7c92ae27c..819ce24f6b4 100644
--- a/be/src/cloud/cloud_base_compaction.cpp
+++ b/be/src/cloud/cloud_base_compaction.cpp
@@ -281,8 +281,8 @@ Status CloudBaseCompaction::modify_rowsets() {
DeleteBitmapPtr output_rowset_delete_bitmap = nullptr;
if (_tablet->keys_type() == KeysType::UNIQUE_KEYS &&
_tablet->enable_unique_key_merge_on_write()) {
- int64_t initiator =
- boost::hash_range(_uuid.begin(), _uuid.end()) &
std::numeric_limits<int64_t>::max();
+ int64_t initiator = HashUtil::hash64(_uuid.data(), _uuid.size(), 0) &
+ std::numeric_limits<int64_t>::max();
RETURN_IF_ERROR(cloud_tablet()->calc_delete_bitmap_for_compaciton(
_input_rowsets, _output_rowset, _rowid_conversion,
compaction_type(),
_stats.merged_rows, initiator, output_rowset_delete_bitmap));
@@ -344,8 +344,8 @@ void CloudBaseCompaction::garbage_collection() {
compaction_job->set_type(cloud::TabletCompactionJobPB::BASE);
if (_tablet->keys_type() == KeysType::UNIQUE_KEYS &&
_tablet->enable_unique_key_merge_on_write()) {
- int64_t initiator =
- boost::hash_range(_uuid.begin(), _uuid.end()) &
std::numeric_limits<int64_t>::max();
+ int64_t initiator = HashUtil::hash64(_uuid.data(), _uuid.size(), 0) &
+ std::numeric_limits<int64_t>::max();
compaction_job->set_delete_bitmap_lock_initiator(initiator);
}
auto st = _engine.meta_mgr().abort_tablet_job(job);
diff --git a/be/src/cloud/cloud_cumulative_compaction.cpp
b/be/src/cloud/cloud_cumulative_compaction.cpp
index 17a00095d81..8ed7a57e934 100644
--- a/be/src/cloud/cloud_cumulative_compaction.cpp
+++ b/be/src/cloud/cloud_cumulative_compaction.cpp
@@ -230,8 +230,8 @@ Status CloudCumulativeCompaction::modify_rowsets() {
DeleteBitmapPtr output_rowset_delete_bitmap = nullptr;
if (_tablet->keys_type() == KeysType::UNIQUE_KEYS &&
_tablet->enable_unique_key_merge_on_write()) {
- int64_t initiator =
- boost::hash_range(_uuid.begin(), _uuid.end()) &
std::numeric_limits<int64_t>::max();
+ int64_t initiator = HashUtil::hash64(_uuid.data(), _uuid.size(), 0) &
+ std::numeric_limits<int64_t>::max();
RETURN_IF_ERROR(cloud_tablet()->calc_delete_bitmap_for_compaciton(
_input_rowsets, _output_rowset, _rowid_conversion,
compaction_type(),
_stats.merged_rows, initiator, output_rowset_delete_bitmap));
@@ -308,8 +308,8 @@ void CloudCumulativeCompaction::garbage_collection() {
compaction_job->set_type(cloud::TabletCompactionJobPB::CUMULATIVE);
if (_tablet->keys_type() == KeysType::UNIQUE_KEYS &&
_tablet->enable_unique_key_merge_on_write()) {
- int64_t initiator =
- boost::hash_range(_uuid.begin(), _uuid.end()) &
std::numeric_limits<int64_t>::max();
+ int64_t initiator = HashUtil::hash64(_uuid.data(), _uuid.size(), 0) &
+ std::numeric_limits<int64_t>::max();
compaction_job->set_delete_bitmap_lock_initiator(initiator);
}
auto st = _engine.meta_mgr().abort_tablet_job(job);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
