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

change memory storage engine name from memory-radixtree to memory-radixtree-beta

Browse Source
This commit is contained in:
mengranwo 2020-01-09 13:58:06 -08:00
parent 115ff8bf65
commit 227edd4248
7 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fdbcli/fdbcli.actor.cpp
View File

@ -460,7 +460,7 @@ void initHelp() {
"clear a range of keys from the database", "clear a range of keys from the database",
"All keys between BEGINKEY (inclusive) and ENDKEY (exclusive) are cleared from the database. This command will succeed even if the specified range is empty, but may fail because of conflicts." ESCAPINGK); "All keys between BEGINKEY (inclusive) and ENDKEY (exclusive) are cleared from the database. This command will succeed even if the specified range is empty, but may fail because of conflicts." ESCAPINGK);
helpMap["configure"] = CommandHelp( helpMap["configure"] = CommandHelp(
"configure [new] <single|double|triple|three_data_hall|three_datacenter|ssd|memory|memory-radixtree|proxies=<PROXIES>|logs=<LOGS>|resolvers=<RESOLVERS>>*", "configure [new] <single|double|triple|three_data_hall|three_datacenter|ssd|memory|memory-radixtree-beta|proxies=<PROXIES>|logs=<LOGS>|resolvers=<RESOLVERS>>*",
"change the database configuration", "change the database configuration",
"The `new' option, if present, initializes a new database with the given configuration rather than changing the configuration of an existing one. When used, both a redundancy mode and a storage engine must be specified.\n\nRedundancy mode:\n single - one copy of the data. Not fault tolerant.\n double - two copies of data (survive one failure).\n triple - three copies of data (survive two failures).\n three_data_hall - See the Admin Guide.\n three_datacenter - See the Admin Guide.\n\nStorage engine:\n ssd - B-Tree storage engine optimized for solid state disks.\n memory - Durable in-memory storage engine for small datasets.\n\nproxies=<PROXIES>: Sets the desired number of proxies in the cluster. Must be at least 1, or set to -1 which restores the number of proxies to the default value.\n\nlogs=<LOGS>: Sets the desired number of log servers in the cluster. Must be at least 1, or set to -1 which restores the number of logs to the default value.\n\nresolvers=<RESOLVERS>: Sets the desired number of resolvers in the cluster. Must be at least 1, or set to -1 which restores the number of resolvers to the default value.\n\nSee the FoundationDB Administration Guide for more information."); "The `new' option, if present, initializes a new database with the given configuration rather than changing the configuration of an existing one. When used, both a redundancy mode and a storage engine must be specified.\n\nRedundancy mode:\n single - one copy of the data. Not fault tolerant.\n double - two copies of data (survive one failure).\n triple - three copies of data (survive two failures).\n three_data_hall - See the Admin Guide.\n three_datacenter - See the Admin Guide.\n\nStorage engine:\n ssd - B-Tree storage engine optimized for solid state disks.\n memory - Durable in-memory storage engine for small datasets.\n\nproxies=<PROXIES>: Sets the desired number of proxies in the cluster. Must be at least 1, or set to -1 which restores the number of proxies to the default value.\n\nlogs=<LOGS>: Sets the desired number of log servers in the cluster. Must be at least 1, or set to -1 which restores the number of logs to the default value.\n\nresolvers=<RESOLVERS>: Sets the desired number of resolvers in the cluster. Must be at least 1, or set to -1 which restores the number of resolvers to the default value.\n\nSee the FoundationDB Administration Guide for more information.");
helpMap["fileconfigure"] = CommandHelp( helpMap["fileconfigure"] = CommandHelp(
@ -2377,7 +2377,7 @@ void onoff_generator(const char* text, const char *line, std::vector<std::string
} }
void configure_generator(const char* text, const char *line, std::vector<std::string>& lc) { void configure_generator(const char* text, const char *line, std::vector<std::string>& lc) {
const char* opts[] = {"new", "single", "double", "triple", "three_data_hall", "three_datacenter", "ssd", "ssd-1", "ssd-2", "memory", "memory-1", "memory-2", "memory-radixtree", "proxies=", "logs=", "resolvers=", NULL}; const char* opts[] = {"new", "single", "double", "triple", "three_data_hall", "three_datacenter", "ssd", "ssd-1", "ssd-2", "memory", "memory-1", "memory-2", "memory-radixtree-beta", "proxies=", "logs=", "resolvers=", NULL};
array_generator(text, line, opts, lc); array_generator(text, line, opts, lc);
} }

2
fdbclient/DatabaseConfiguration.cpp
View File

@ -270,7 +270,7 @@ StatusObject DatabaseConfiguration::toJSON(bool noPolicies) const {
} else if( tLogDataStoreType == KeyValueStoreType::MEMORY && storageServerStoreType == KeyValueStoreType::MEMORY ) { } else if( tLogDataStoreType == KeyValueStoreType::MEMORY && storageServerStoreType == KeyValueStoreType::MEMORY ) {
result["storage_engine"] = "memory-1"; result["storage_engine"] = "memory-1";
} else if( tLogDataStoreType == KeyValueStoreType::SSD_BTREE_V2 && storageServerStoreType == KeyValueStoreType::MEMORY_RADIXTREE ) { } else if( tLogDataStoreType == KeyValueStoreType::SSD_BTREE_V2 && storageServerStoreType == KeyValueStoreType::MEMORY_RADIXTREE ) {
result["storage_engine"] = "memory-radixtree"; result["storage_engine"] = "memory-radixtree-beta";
} else if( tLogDataStoreType == KeyValueStoreType::SSD_BTREE_V2 && storageServerStoreType == KeyValueStoreType::MEMORY ) { } else if( tLogDataStoreType == KeyValueStoreType::SSD_BTREE_V2 && storageServerStoreType == KeyValueStoreType::MEMORY ) {
result["storage_engine"] = "memory-2"; result["storage_engine"] = "memory-2";
} else { } else {

2
fdbclient/FDBTypes.h
View File

@ -668,7 +668,7 @@ struct KeyValueStoreType {
case SSD_BTREE_V2: return "ssd-2"; case SSD_BTREE_V2: return "ssd-2";
case SSD_REDWOOD_V1: return "ssd-redwood-experimental"; case SSD_REDWOOD_V1: return "ssd-redwood-experimental";
case MEMORY: return "memory"; case MEMORY: return "memory";
case MEMORY_RADIXTREE: return "memory-radixtree"; case MEMORY_RADIXTREE: return "memory-radixtree-beta";
default: return "unknown"; default: return "unknown";
} }
} }

2
fdbclient/ManagementAPI.actor.cpp
View File

@ -100,7 +100,7 @@ std::map<std::string, std::string> configForToken( std::string const& mode ) {
} else if (mode == "memory-1") { } else if (mode == "memory-1") {
logType = KeyValueStoreType::MEMORY; logType = KeyValueStoreType::MEMORY;
storeType= KeyValueStoreType::MEMORY; storeType= KeyValueStoreType::MEMORY;
} else if (mode == "memory-radixtree") { } else if (mode == "memory-radixtree-beta") {
logType = KeyValueStoreType::SSD_BTREE_V2; logType = KeyValueStoreType::SSD_BTREE_V2;
storeType= KeyValueStoreType::MEMORY_RADIXTREE; storeType= KeyValueStoreType::MEMORY_RADIXTREE;
} }

2
fdbclient/Schemas.cpp
View File

@ -579,7 +579,7 @@ const KeyRef JSONSchemas::statusSchema = LiteralStringRef(R"statusSchema(
"memory", "memory",
"memory-1", "memory-1",
"memory-2", "memory-2",
"memory-radixtree" "memory-radixtree-beta"
]}, ]},
"coordinators_count":1, "coordinators_count":1,
"excluded_servers":[ "excluded_servers":[

2
fdbserver/SimulatedCluster.actor.cpp
View File

@ -810,7 +810,7 @@ void SimulationConfig::generateNormalConfig(int minimumReplication, int minimumR
// set_config("memory"); // set_config("memory");
// } // }
// set_config("memory"); // set_config("memory");
set_config("memory-radixtree"); set_config("memory-radixtree-beta");
if(simple) { if(simple) {
db.desiredTLogCount = 1; db.desiredTLogCount = 1;
db.masterProxyCount = 1; db.masterProxyCount = 1;

2
fdbserver/workloads/KVStoreTest.actor.cpp
View File

@ -375,7 +375,7 @@ ACTOR Future<Void> testKVStore(KVStoreTestWorkload* workload) {
test.store = keyValueStoreRedwoodV1(fn, id); test.store = keyValueStoreRedwoodV1(fn, id);
else if (workload->storeType == "memory") else if (workload->storeType == "memory")
test.store = keyValueStoreMemory(fn, id, 500e6); test.store = keyValueStoreMemory(fn, id, 500e6);
else if (workload->storeType == "memory-radixtree") else if (workload->storeType == "memory-radixtree-beta")
test.store = keyValueStoreMemory(fn, id, 500e6, "fdr", KeyValueStoreType::MEMORY_RADIXTREE); test.store = keyValueStoreMemory(fn, id, 500e6, "fdr", KeyValueStoreType::MEMORY_RADIXTREE);
else else
ASSERT(false); ASSERT(false);