bahman/scylla
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

token_metadata: make local_dc_filter a lambda, not a std::function

Browse Source 
This std::function causes allocations, both on construction
and in other operations. This costs ~2200 instructions
for a DC-local query. Fix that.

Closes #11494
This commit is contained in:
Michał Chojnowski
2022-09-07 19:46:54 +02:00
committed by Kamil Braun
parent af7ace3926
commit 47844689d8
3 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
locator/token_metadata.cc
View File

@@ -1313,12 +1313,6 @@ sstring topology::get_datacenter(inet_address ep) const {
return i_endpoint_snitch::get_local_snitch_ptr()->get_datacenter(ep);
}
std::function<bool(inet_address)> topology::get_local_dc_filter() const noexcept {
return [ this, local_dc = get_datacenter() ] (inet_address ep) {
return get_datacenter(ep) == local_dc;
};
}
void topology::sort_by_proximity(inet_address address, inet_address_vector_replica_set& addresses) const {
if (_sort_by_proximity) {
std::sort(addresses.begin(), addresses.end(), [this, &address](inet_address& a1, inet_address& a2) {

9
locator/token_metadata.hh
View File

@@ -84,12 +84,15 @@ public:
sstring get_datacenter() const;
sstring get_datacenter(inet_address ep) const;
std::function<bool(inet_address)> get_local_dc_filter() const noexcept;
auto get_local_dc_filter() const noexcept {
return [ this, local_dc = get_datacenter() ] (inet_address ep) {
return get_datacenter(ep) == local_dc;
};
};
template <std::ranges::range Range>
inline size_t count_local_endpoints(const Range& endpoints) const {
auto filter = get_local_dc_filter();
return std::count_if(endpoints.begin(), endpoints.end(), filter);
return std::count_if(endpoints.begin(), endpoints.end(), get_local_dc_filter());
}
/**

2
service/storage_service.cc
View File

@@ -778,7 +778,7 @@ storage_service::get_range_to_address_map_in_local_dc(
for (auto entry : orig_map) {
auto& addresses = filtered_map[entry.first];
addresses.reserve(entry.second.size());
std::copy_if(entry.second.begin(), entry.second.end(), std::back_inserter(addresses), local_dc_filter);
std::copy_if(entry.second.begin(), entry.second.end(), std::back_inserter(addresses), std::cref(local_dc_filter));
co_await coroutine::maybe_yield();
}