apple/foundationdb
1
0
Fork 0
mirror of https://github.com/apple/foundationdb.git synced 2025-05-18 03:42:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Naming fixes

Browse Source
This commit is contained in:
Lukas Joswiak 2021-02-20 00:43:54 -08:00
parent 9587318696
commit 80c6048a01
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fdbclient/GlobalConfig.actor.cpp
View File

@ -103,7 +103,7 @@ ACTOR Future<Void> GlobalConfig::refresh(GlobalConfig* self) {
Transaction tr(self->cx); Transaction tr(self->cx);
Standalone<RangeResultRef> result = wait(tr.getRange(globalConfigDataKeys, CLIENT_KNOBS->TOO_MANY)); Standalone<RangeResultRef> result = wait(tr.getRange(globalConfigDataKeys, CLIENT_KNOBS->TOO_MANY));
for (const auto& kv : result) { for (const auto& kv : result) {
KeyRef systemKey = kv.key.removePrefix(globalConfigDataPrefix); KeyRef systemKey = kv.key.removePrefix(globalConfigKeysPrefix);
self->insert(systemKey, kv.value); self->insert(systemKey, kv.value);
} }
return Void(); return Void();

4
fdbclient/SpecialKeySpace.actor.cpp
View File

@ -1449,7 +1449,7 @@ ACTOR Future<Optional<std::string>> globalConfigCommitActor(GlobalConfigImpl* gl
state RangeMap<Key, std::pair<bool, Optional<Value>>, KeyRangeRef>::iterator iter = ranges.begin(); state RangeMap<Key, std::pair<bool, Optional<Value>>, KeyRangeRef>::iterator iter = ranges.begin();
while (iter != ranges.end()) { while (iter != ranges.end()) {
Key bareKey = iter->begin().removePrefix(globalConfig->getKeyRange().begin); Key bareKey = iter->begin().removePrefix(globalConfig->getKeyRange().begin);
Key systemKey = bareKey.withPrefix(globalConfigDataPrefix); Key systemKey = bareKey.withPrefix(globalConfigKeysPrefix);
std::pair<bool, Optional<Value>> entry = iter->value(); std::pair<bool, Optional<Value>> entry = iter->value();
if (entry.first) { if (entry.first) {
if (entry.second.present()) { if (entry.second.present()) {
@ -1498,6 +1498,8 @@ void GlobalConfigImpl::clear(ReadYourWritesTransaction* ryw, const KeyRef& key)
ryw->getSpecialKeySpaceWriteMap().insert(key, std::make_pair(true, Optional<Value>())); ryw->getSpecialKeySpaceWriteMap().insert(key, std::make_pair(true, Optional<Value>()));
} }
TracingOptionsImpl::TracingOptionsImpl(KeyRangeRef kr) : SpecialKeyRangeRWImpl(kr) {}
Future<Standalone<RangeResultRef>> TracingOptionsImpl::getRange(ReadYourWritesTransaction* ryw, Future<Standalone<RangeResultRef>> TracingOptionsImpl::getRange(ReadYourWritesTransaction* ryw,
KeyRangeRef kr) const { KeyRangeRef kr) const {
Standalone<RangeResultRef> result; Standalone<RangeResultRef> result;

6
fdbclient/SystemData.cpp
View File

@ -632,11 +632,11 @@ std::string encodeFailedServersKey(AddressExclusion const& addr) {
return failedServersPrefix.toString() + addr.toString(); return failedServersPrefix.toString() + addr.toString();
} }
const KeyRangeRef globalConfigKeys( LiteralStringRef("\xff/globalConfig/"), LiteralStringRef("\xff/globalConfig0") ); // const KeyRangeRef globalConfigKeys( LiteralStringRef("\xff/globalConfig/"), LiteralStringRef("\xff/globalConfig0") );
const KeyRef globalConfigPrefix = globalConfigKeys.begin; // const KeyRef globalConfigPrefix = globalConfigKeys.begin;
const KeyRangeRef globalConfigDataKeys( LiteralStringRef("\xff/globalConfig/k/"), LiteralStringRef("\xff/globalConfig/k0") ); const KeyRangeRef globalConfigDataKeys( LiteralStringRef("\xff/globalConfig/k/"), LiteralStringRef("\xff/globalConfig/k0") );
const KeyRef globalConfigDataPrefix = globalConfigDataKeys.begin; const KeyRef globalConfigKeysPrefix = globalConfigDataKeys.begin;
const KeyRangeRef globalConfigHistoryKeys( LiteralStringRef("\xff/globalConfig/h/"), LiteralStringRef("\xff/globalConfig/h0") ); const KeyRangeRef globalConfigHistoryKeys( LiteralStringRef("\xff/globalConfig/h/"), LiteralStringRef("\xff/globalConfig/h0") );
const KeyRef globalConfigHistoryPrefix = globalConfigHistoryKeys.begin; const KeyRef globalConfigHistoryPrefix = globalConfigHistoryKeys.begin;

6
fdbclient/SystemData.h
View File

@ -232,14 +232,14 @@ std::string encodeFailedServersKey(AddressExclusion const&);
// "\xff/globalConfig/[[option]]" := "value" // "\xff/globalConfig/[[option]]" := "value"
// An umbrella prefix for global configuration data synchronized to all nodes. // An umbrella prefix for global configuration data synchronized to all nodes.
extern const KeyRangeRef globalConfigData; // extern const KeyRangeRef globalConfigData;
extern const KeyRef globalConfigDataPrefix; // extern const KeyRef globalConfigDataPrefix;
// "\xff/globalConfig/k/[[key]]" := "value" // "\xff/globalConfig/k/[[key]]" := "value"
// Key-value pairs that have been set. The range this keyspace represents // Key-value pairs that have been set. The range this keyspace represents
// contains all globally configured options. // contains all globally configured options.
extern const KeyRangeRef globalConfigDataKeys; extern const KeyRangeRef globalConfigDataKeys;
extern const KeyRef globalConfigDataPrefix; extern const KeyRef globalConfigKeysPrefix;
// "\xff/globalConfig/h/[[version]]" := "value" // "\xff/globalConfig/h/[[version]]" := "value"
// Maps a commit version to a list of mutations made to the global // Maps a commit version to a list of mutations made to the global