Skip to content

Reduce address comparisons for network topology replica calculation #532

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
mpenick wants to merge 8 commits into from
Closed

Reduce address comparisons for network topology replica calculation #532

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
257c9a9
Test with large replication factor and large number of vnodes
Aug 8, 2022
928ff70
Reduce address comparisons for network topology replica calculation
Aug 15, 2022
74eb1b9
Remove debugging
Aug 15, 2022
5b35f2d
Use address set
Aug 16, 2022
2501425
fix the missing OS_DISTRO env variable as a result of moving from Ope…
weideng1 May 19, 2023
f38c0a0
Merge branch 'fix_cpp_aws' into v2.15.2-large-rf
weideng1 May 19, 2023
a78cc90
specifically use local variable for os distro
weideng1 May 19, 2023
402119e
embed get_os_distro call in script block
weideng1 May 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Use address set
  • Loading branch information
Michael Penick committed Aug 16, 2022
commit 5b35f2dbaa622ea43c31893ce7cb01b40ac5938b
19 changes: 0 additions & 19 deletions src/host.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,23 +305,4 @@ bool remove_host(CopyOnWriteHostVec& hosts, const Address& address);
}}} // namespace datastax::internal::core


namespace std {

#if defined(HASH_IN_TR1) && !defined(_WIN32)
namespace tr1 {
#endif

template <>
struct hash<datastax::internal::core::Host*> {
size_t operator()(const datastax::internal::core::Host* host) const {
return host->address().hash_code();
}
};

#if defined(HASH_IN_TR1) && !defined(_WIN32)
} // namespace tr1
#endif

} // namespace std

#endif
16 changes: 4 additions & 12 deletions src/token_map_impl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,14 +388,6 @@ inline bool add_replica(CopyOnWriteHostVec& hosts, const Host::Ptr& host) {
return true;
}

class RawPtrHostSet : public DenseHashSet<Host*> {
public:
RawPtrHostSet() {
set_empty_key(0x0);
set_deleted_key(reinterpret_cast<Host*>(0x1));
}
};

template <class Partitioner>
void ReplicationStrategy<Partitioner>::build_replicas_network_topology(
const TokenHostVec& tokens, const DatacenterMap& datacenters, TokenReplicasVec& result) const {
Expand Down Expand Up @@ -443,7 +435,7 @@ void ReplicationStrategy<Partitioner>::build_replicas_network_topology(
CopyOnWriteHostVec replicas(new HostVec());
replicas->reserve(num_replicas);

RawPtrHostSet replicas_set;
AddressSet replicas_set;
replicas_set.resize(num_replicas);

// Clear datacenter and rack information for the next token
Expand Down Expand Up @@ -487,7 +479,7 @@ void ReplicationStrategy<Partitioner>::build_replicas_network_topology(
// datacenter only then consider hosts in the same rack

if (rack == 0 || racks_observed_this_dc.size() == rack_count_this_dc) {
if (replicas_set.insert(host).second) {
if (replicas_set.insert(host->address()).second) {
replicas->push_back(Host::Ptr(host));
++replica_count_this_dc;
}
Expand All @@ -496,7 +488,7 @@ void ReplicationStrategy<Partitioner>::build_replicas_network_topology(
if (racks_observed_this_dc.count(rack) > 0) {
skipped_endpoints_this_dc.push_back(curr_token_it);
} else {
if (replicas_set.insert(host).second) {
if (replicas_set.insert(host->address()).second) {
replicas->push_back(Host::Ptr(host));
++replica_count_this_dc;
racks_observed_this_dc.insert(rack);
Expand All @@ -507,7 +499,7 @@ void ReplicationStrategy<Partitioner>::build_replicas_network_topology(
if (racks_observed_this_dc.size() == rack_count_this_dc) {
while (!skipped_endpoints_this_dc.empty() &&
replica_count_this_dc < replication_factor) {
if (replicas_set.insert(skipped_endpoints_this_dc.front()->second).second) {
if (replicas_set.insert(skipped_endpoints_this_dc.front()->second->address()).second) {
replicas->push_back(Host::Ptr(skipped_endpoints_this_dc.front()->second));
++replica_count_this_dc;
}
Expand Down