wbtiger
/
foundationdb
mirror of https://github.com/apple/foundationdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove a few things and some other small cleanup.

This commit is contained in:
A.J. Beamon 2022-06-23 15:39:53 -07:00
parent 9f3819752f
commit 9260367cac
5 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fdbclient/FDBTypes.h
View File

@ -1344,7 +1344,7 @@ struct TenantMode {
// These enumerated values are stored in the database configuration, so can NEVER be changed. Only add new ones
// just before END.
// Note: OPTIONAL_TENANT is not named OPTIONAL because of a collision with a Windows macro.
enum Mode { DISABLED = 0, OPTIONAL_TENANT = 1, REQUIRED = 2, END = 4 };
enum Mode { DISABLED = 0, OPTIONAL_TENANT = 1, REQUIRED = 2, END = 3 };
TenantMode() : mode(DISABLED) {}
TenantMode(Mode mode) : mode(mode) {

3
fdbclient/MetaclusterManagement.actor.h
View File

@ -58,9 +58,6 @@ struct DataClusterMetadata {
}
Value encode() const { return ObjectWriter::toValue(*this, IncludeVersion(ProtocolVersion::withMetacluster())); }
Value encode(Arena& arena) const {
return ObjectWriter::toValue(*this, IncludeVersion(ProtocolVersion::withMetacluster()), arena);
}
static DataClusterMetadata decode(ValueRef const& value) {
DataClusterMetadata metadata;
ObjectReader reader(value.begin(), IncludeVersion());

2
fdbclient/SpecialKeySpace.actor.cpp
View File

@ -79,7 +79,7 @@ std::unordered_map<SpecialKeySpace::MODULE, KeyRange> SpecialKeySpace::moduleToB
KeyRangeRef(LiteralStringRef("\xff\xff/actor_lineage/"), LiteralStringRef("\xff\xff/actor_lineage0")) },
{ SpecialKeySpace::MODULE::ACTOR_PROFILER_CONF,
KeyRangeRef(LiteralStringRef("\xff\xff/actor_profiler_conf/"),
LiteralStringRef("\xff\xff/actor_profiler_conf0")) },
LiteralStringRef("\xff\xff/actor_profiler_conf0")) }
};
std::unordered_map<std::string, KeyRange> SpecialKeySpace::managementApiCommandToRange = {

4
fdbclient/SpecialKeySpace.actor.h
View File

@ -228,9 +228,6 @@ public:
static KeyRef getActorLineageApiCommandPrefix(const std::string& command) {
return actorLineageApiCommandToRange.at(command).begin;
}
static KeyRangeRef getMetaclusterInternalApiCommandRange(const std::string& command) {
return metaclusterInternalApiCommandToRange.at(command);
}
static Key getManagementApiCommandOptionSpecialKey(const std::string& command, const std::string& option);
static const std::set<std::string>& getManagementApiOptionsSet() { return options; }
static const std::set<std::string>& getTracingOptions() { return tracingOptions; }
@ -263,7 +260,6 @@ private:
// module command to special keys range
static std::unordered_map<std::string, KeyRange> managementApiCommandToRange;
static std::unordered_map<std::string, KeyRange> actorLineageApiCommandToRange;
static std::unordered_map<std::string, KeyRange> metaclusterInternalApiCommandToRange;
// "<command>/<option>"
static std::set<std::string> options;

12
flow/ObjectSerializer.h
View File

@ -247,11 +247,6 @@ public:
return Standalone<StringRef>(toStringRef(), arena);
}
StringRef toString(Arena& arena) const {
ASSERT(!customAllocator);
return StringRef(arena, toStringRef());
}
template <class Item, class VersionOptions>
static Standalone<StringRef> toValue(Item const& item, VersionOptions vo) {
ObjectWriter writer(vo);
@ -259,13 +254,6 @@ public:
return writer.toString();
}
template <class Item, class VersionOptions>
static StringRef toValue(Item const& item, VersionOptions vo, Arena& arena) {
ObjectWriter writer(vo);
writer.serialize(item);
return writer.toString(arena);
}
ProtocolVersion protocolVersion() const { return mProtocolVersion; }
void setProtocolVersion(ProtocolVersion v) {
mProtocolVersion = v;