aboutsummaryrefslogtreecommitdiffstats
path: root/storage
diff options
context:
space:
mode:
authorTor Brede Vekterli <vekterli@vespa.ai>2023-11-02 14:18:34 +0000
committerTor Brede Vekterli <vekterli@vespa.ai>2023-11-02 14:18:34 +0000
commitf2983f6f300630f6aec7538d75eed6356fe12da6 (patch)
tree2db9d4bb7d00c10a7c5894593f26b3cf862d7022 /storage
parent10abf9db2a47091e151ca903e3675fae29c4ed09 (diff)
Less confusing naming
Diffstat (limited to 'storage')
-rw-r--r--storage/src/vespa/storage/distributor/operations/idealstate/mergeoperation.cpp4
-rw-r--r--storage/src/vespa/storage/distributor/operations/idealstate/mergeoperation.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/storage/src/vespa/storage/distributor/operations/idealstate/mergeoperation.cpp b/storage/src/vespa/storage/distributor/operations/idealstate/mergeoperation.cpp
index e40a79b06df..68f305fe94e 100644
--- a/storage/src/vespa/storage/distributor/operations/idealstate/mergeoperation.cpp
+++ b/storage/src/vespa/storage/distributor/operations/idealstate/mergeoperation.cpp
@@ -140,7 +140,7 @@ MergeOperation::onStart(DistributorStripeMessageSender& sender)
_mnodes.emplace_back(node._nodeIndex, node._sourceOnly);
}
- const auto estimated_memory_footprint = estimate_merge_memory_footprint_ubound(nodes);
+ const auto estimated_memory_footprint = estimate_merge_memory_footprint_upper_bound(nodes);
if (_mnodes.size() > 1) {
auto msg = std::make_shared<api::MergeBucketCommand>(getBucket(), _mnodes,
@@ -371,7 +371,7 @@ bool MergeOperation::all_involved_nodes_support_unordered_merge_chaining() const
return true;
}
-uint32_t MergeOperation::estimate_merge_memory_footprint_ubound(const std::vector<MergeMetaData>& nodes) const noexcept {
+uint32_t MergeOperation::estimate_merge_memory_footprint_upper_bound(const std::vector<MergeMetaData>& nodes) const noexcept {
vespalib::hash_set<uint32_t> seen_checksums;
uint32_t worst_case_footprint_across_nodes = 0;
uint32_t largest_single_doc_contribution = 0;
diff --git a/storage/src/vespa/storage/distributor/operations/idealstate/mergeoperation.h b/storage/src/vespa/storage/distributor/operations/idealstate/mergeoperation.h
index 8833ae9a1ad..8f54aea33be 100644
--- a/storage/src/vespa/storage/distributor/operations/idealstate/mergeoperation.h
+++ b/storage/src/vespa/storage/distributor/operations/idealstate/mergeoperation.h
@@ -65,7 +65,7 @@ private:
DistributorStripeMessageSender& sender);
[[nodiscard]] bool is_global_bucket_merge() const noexcept;
[[nodiscard]] bool all_involved_nodes_support_unordered_merge_chaining() const noexcept;
- [[nodiscard]] uint32_t estimate_merge_memory_footprint_ubound(const std::vector<MergeMetaData>& nodes) const noexcept;
+ [[nodiscard]] uint32_t estimate_merge_memory_footprint_upper_bound(const std::vector<MergeMetaData>& nodes) const noexcept;
MergeBucketMetricSet* get_merge_metrics();
};