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

treewide: get rid of now unused fb_utilities

Browse Source 
Signed-off-by: Benny Halevy <bhalevy@scylladb.com>
This commit is contained in:
Benny Halevy
2023-12-01 13:06:41 +02:00
parent f8a957898b
commit 0bcce35abd
6 changed files with 0 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
compaction/compaction_manager.cc
View File

@@ -23,7 +23,6 @@
#include "sstables/sstable_directory.hh"
#include "locator/abstract_replication_strategy.hh"
#include "utils/error_injection.hh"
#include "utils/fb_utilities.hh"
#include "utils/UUID_gen.hh"
#include "db/system_keyspace.hh"
#include <cmath>

1
gms/gossiper.hh
View File

@@ -19,7 +19,6 @@
#include <seastar/util/source_location-compat.hh>
#include "utils/atomic_vector.hh"
#include "utils/UUID.hh"
#include "utils/fb_utilities.hh"
#include "gms/generation-number.hh"
#include "gms/versioned_value.hh"
#include "gms/application_state.hh"

4
main.cc
View File

@@ -814,9 +814,7 @@ To start the scylla server proper, simply invoke as: scylla server (or just scyl
auto family = cfg->enable_ipv6_dns_lookup() || preferred ? std::nullopt : std::make_optional(net::inet_address::family::INET);
auto broadcast_addr = utils::resolve(cfg->broadcast_address || cfg->listen_address, family, preferred).get0();
utils::fb_utilities::set_broadcast_address(broadcast_addr);
auto broadcast_rpc_addr = utils::resolve(cfg->broadcast_rpc_address || cfg->rpc_address, family, preferred).get0();
utils::fb_utilities::set_broadcast_rpc_address(broadcast_rpc_addr);
ctx.api_dir = cfg->api_ui_dir();
if (!ctx.api_dir.empty() && ctx.api_dir.back() != '/') {
@@ -894,10 +892,8 @@ To start the scylla server proper, simply invoke as: scylla server (or just scyl
// value to a public address in cassandra.yaml.
//
broadcast_addr = *opt_public_address;
utils::fb_utilities::set_broadcast_address(*opt_public_address);
if (cfg->broadcast_rpc_address().empty()) {
broadcast_rpc_addr = *opt_public_address;
utils::fb_utilities::set_broadcast_rpc_address(*opt_public_address);
}
}

4
test/lib/cql_test_env.cc
View File

@@ -68,7 +68,6 @@
#include "service/raft/raft_group0.hh"
#include "sstables/sstables_manager.hh"
#include "init.hh"
#include "utils/fb_utilities.hh"
#include <sys/time.h>
#include <sys/resource.h>
@@ -413,9 +412,6 @@ public:
}).get();
});
utils::fb_utilities::set_broadcast_address(gms::inet_address("localhost"));
utils::fb_utilities::set_broadcast_rpc_address(gms::inet_address("localhost"));
single_node_cql_env env;
env.run_in_thread(std::move(func), std::move(cfg_in), std::move(init_configurables));
});

1
utils/bloom_filter.cc
View File

@@ -9,7 +9,6 @@
*/
#include "i_filter.hh"
#include "fb_utilities.hh"
#include "bytes.hh"
#include "utils/murmur_hash.hh"
#include <seastar/core/shared_ptr.hh>

58
utils/fb_utilities.hh
View File

@@ -1,58 +0,0 @@
/*
* Modified by ScyllaDB
* Copyright (C) 2015-present ScyllaDB
*/
/*
* SPDX-License-Identifier: (AGPL-3.0-or-later and Apache-2.0)
*/
#pragma once
#include <cstdint>
#include <optional>
#include "gms/inet_address.hh"
namespace utils {
using inet_address = gms::inet_address;
class fb_utilities {
private:
static std::optional<inet_address>& broadcast_address() noexcept {
static std::optional<inet_address> _broadcast_address;
return _broadcast_address;
}
static std::optional<inet_address>& broadcast_rpc_address() noexcept {
static std::optional<inet_address> _broadcast_rpc_address;
return _broadcast_rpc_address;
}
public:
static constexpr int32_t MAX_UNSIGNED_SHORT = 0xFFFF;
static void set_broadcast_address(inet_address addr) noexcept {
broadcast_address() = addr;
}
static void set_broadcast_rpc_address(inet_address addr) noexcept {
broadcast_rpc_address() = addr;
}
static const inet_address get_broadcast_address() noexcept {
assert(broadcast_address());
return *broadcast_address();
}
static const inet_address get_broadcast_rpc_address() noexcept {
assert(broadcast_rpc_address());
return *broadcast_rpc_address();
}
static bool is_me(gms::inet_address addr) noexcept {
return addr == get_broadcast_address();
}
};
}