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

Add support for the global tenant prefix to tenant map entries

This commit is contained in:
A.J. Beamon 2022-02-19 21:10:07 -08:00
parent ea273291c7
commit b8192828d9
2 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
fdbclient/Tenant.h
View File

@ -32,24 +32,46 @@ typedef Standalone<TenantNameRef> TenantName;
struct TenantMapEntry {
constexpr static FileIdentifier file_identifier = 12247338;
private:
static Key idToPrefix(int64_t id) {
int64_t swapped = bigEndian64(id);
return StringRef(reinterpret_cast<const uint8_t*>(&swapped), 8);
}
public:
static int64_t prefixToId(KeyRef prefix) {
ASSERT(prefix.size() == 8);
int64_t id = *reinterpret_cast<const int64_t*>(prefix.begin());
id = bigEndian64(id);
ASSERT(id >= 0);
return id;
}
int64_t id;
Key prefix;
private:
void initPrefix(KeyRef subspace) {
ASSERT(id >= 0);
prefix = makeString(8 + subspace.size());
uint8_t* data = mutateString(prefix);
memcpy(data, subspace.begin(), subspace.size());
int64_t swapped = bigEndian64(id);
memcpy(data + subspace.size(), &swapped, 8);
}
public:
TenantMapEntry() : id(-1) {}
TenantMapEntry(int64_t id) : id(id), prefix(idToPrefix(id)) { ASSERT(id >= 0); }
TenantMapEntry(int64_t id, KeyRef subspace) : id(id) { initPrefix(subspace); }
template <class Ar>
void serialize(Ar& ar) {
serializer(ar, id);
if (ar.isDeserializing) {
prefix = idToPrefix(id);
KeyRef subspace;
serializer(ar, subspace);
initPrefix(subspace);
} else {
KeyRef subspace = prefix.substr(0, prefix.size() - 8);
serializer(ar, subspace);
}
}
};

4
fdbserver/storageserver.actor.cpp
View File

@ -2926,7 +2926,7 @@ TEST_CASE("/fdbserver/storageserver/constructMappedKey") {
.append("{...}"_sr);
bool isRangeQuery = false;
Key mappedKey = constructMappedKey(&kvr, mapperTuple, isRangeQuery, TenantMapEntry(1));
Key mappedKey = constructMappedKey(&kvr, mapperTuple, isRangeQuery, TenantMapEntry(1, "foo"_sr));
Key expectedMappedKey = Tuple()
.append("normal"_sr)
@ -2934,7 +2934,7 @@ TEST_CASE("/fdbserver/storageserver/constructMappedKey") {
.append("key-2"_sr)
.append("value-0"_sr)
.getDataAsStandalone()
.withPrefix("\x00\x00\x00\x00\x00\x00\x00\x01"_sr);
.withPrefix("foo\x00\x00\x00\x00\x00\x00\x00\x01"_sr);
// std::cout << printable(mappedKey) << " == " << printable(expectedMappedKey) << std::endl;
ASSERT(mappedKey.compare(expectedMappedKey) == 0);
ASSERT(isRangeQuery == true);