Remove beta status from RadixTree storage engine

This commit is contained in:
William Dowling 2023-07-05 17:54:54 +02:00
parent 032f49bc1a
commit 3ea1ba1648
7 changed files with 16 additions and 16 deletions

View File

@ -172,7 +172,7 @@
"memory", "memory",
"memory-1", "memory-1",
"memory-2", "memory-2",
"memory-radixtree-beta", "memory-radixtree",
"unknown" "unknown"
]} ]}
}, },
@ -810,7 +810,7 @@
"memory", "memory",
"memory-1", "memory-1",
"memory-2", "memory-2",
"memory-radixtree-beta" "memory-radixtree"
]}, ]},
"log_spill":1, "log_spill":1,
"storage_engine":{ "storage_engine":{
@ -824,7 +824,7 @@
"memory", "memory",
"memory-1", "memory-1",
"memory-2", "memory-2",
"memory-radixtree-beta" "memory-radixtree"
]}, ]},
"tss_count":1, "tss_count":1,
"tss_storage_engine":{ "tss_storage_engine":{
@ -838,7 +838,7 @@
"memory", "memory",
"memory-1", "memory-1",
"memory-2", "memory-2",
"memory-radixtree-beta" "memory-radixtree"
]}, ]},
"coordinators_count":1, "coordinators_count":1,
"excluded_servers":[ "excluded_servers":[

View File

@ -302,7 +302,7 @@ void configureGenerator(const char* text,
"memory", "memory",
"memory-1", "memory-1",
"memory-2", "memory-2",
"memory-radixtree-beta", "memory-radixtree",
"commit_proxies=", "commit_proxies=",
"grv_proxies=", "grv_proxies=",
"logs=", "logs=",
@ -321,7 +321,7 @@ CommandFactory configureFactory(
"configure", "configure",
CommandHelp( CommandHelp(
"configure [new|tss]" "configure [new|tss]"
"<single|double|triple|three_data_hall|three_datacenter|ssd|memory|memory-radixtree-beta|proxies=<PROXIES>|" "<single|double|triple|three_data_hall|three_datacenter|ssd|memory|memory-radixtree|proxies=<PROXIES>|"
"commit_proxies=<COMMIT_PROXIES>|grv_proxies=<GRV_PROXIES>|logs=<LOGS>|resolvers=<RESOLVERS>>*|" "commit_proxies=<COMMIT_PROXIES>|grv_proxies=<GRV_PROXIES>|logs=<LOGS>|resolvers=<RESOLVERS>>*|"
"count=<TSS_COUNT>|perpetual_storage_wiggle=<WIGGLE_SPEED>|perpetual_storage_wiggle_locality=" "count=<TSS_COUNT>|perpetual_storage_wiggle=<WIGGLE_SPEED>|perpetual_storage_wiggle_locality="
"<<LOCALITY_KEY>:<LOCALITY_VALUE>|0>|storage_migration_type={disabled|gradual|aggressive}" "<<LOCALITY_KEY>:<LOCALITY_VALUE>|0>|storage_migration_type={disabled|gradual|aggressive}"

View File

@ -226,7 +226,7 @@ std::string KeyValueStoreType::getStoreTypeStr(const StoreType& storeType) {
case MEMORY: case MEMORY:
return "memory"; return "memory";
case MEMORY_RADIXTREE: case MEMORY_RADIXTREE:
return "memory-radixtree-beta"; return "memory-radixtree";
default: default:
return "unknown"; return "unknown";
} }
@ -242,7 +242,7 @@ KeyValueStoreType KeyValueStoreType::fromString(const std::string& str) {
{ "ssd-rocksdb-v1", SSD_ROCKSDB_V1 }, { "ssd-rocksdb-v1", SSD_ROCKSDB_V1 },
{ "ssd-sharded-rocksdb", SSD_SHARDED_ROCKSDB }, { "ssd-sharded-rocksdb", SSD_SHARDED_ROCKSDB },
{ "memory", MEMORY }, { "memory", MEMORY },
{ "memory-radixtree-beta", MEMORY_RADIXTREE } }; { "memory-radixtree", MEMORY_RADIXTREE } };
auto it = names.find(str); auto it = names.find(str);
if (it == names.end()) { if (it == names.end()) {
throw unknown_storage_engine(); throw unknown_storage_engine();

View File

@ -284,7 +284,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-beta") { } else if (mode == "memory-radixtree") {
logType = KeyValueStoreType::SSD_BTREE_V2; logType = KeyValueStoreType::SSD_BTREE_V2;
storeType = KeyValueStoreType::MEMORY_RADIXTREE; storeType = KeyValueStoreType::MEMORY_RADIXTREE;
} }

View File

@ -158,7 +158,7 @@ const KeyRef JSONSchemas::statusSchema = R"statusSchema(
"memory", "memory",
"memory-1", "memory-1",
"memory-2", "memory-2",
"memory-radixtree-beta", "memory-radixtree",
"unknown" "unknown"
]} ]}
}, },
@ -804,7 +804,7 @@ const KeyRef JSONSchemas::statusSchema = R"statusSchema(
"memory", "memory",
"memory-1", "memory-1",
"memory-2", "memory-2",
"memory-radixtree-beta" "memory-radixtree"
]}, ]},
"log_spill":1, "log_spill":1,
"storage_engine":{ "storage_engine":{
@ -818,7 +818,7 @@ const KeyRef JSONSchemas::statusSchema = R"statusSchema(
"memory", "memory",
"memory-1", "memory-1",
"memory-2", "memory-2",
"memory-radixtree-beta" "memory-radixtree"
]}, ]},
"tss_count":1, "tss_count":1,
"tss_storage_engine":{ "tss_storage_engine":{
@ -832,7 +832,7 @@ const KeyRef JSONSchemas::statusSchema = R"statusSchema(
"memory", "memory",
"memory-1", "memory-1",
"memory-2", "memory-2",
"memory-radixtree-beta" "memory-radixtree"
]}, ]},
"coordinators_count":1, "coordinators_count":1,
"excluded_servers":[ "excluded_servers":[

View File

@ -420,7 +420,7 @@ public:
// Storage Engine Types: Verify match with SimulationConfig::generateNormalConfig // Storage Engine Types: Verify match with SimulationConfig::generateNormalConfig
// 0 = "ssd" // 0 = "ssd"
// 1 = "memory" // 1 = "memory"
// 2 = "memory-radixtree-beta" // 2 = "memory-radixtree"
// 3 = "ssd-redwood-1" // 3 = "ssd-redwood-1"
// 4 = "ssd-rocksdb-v1" // 4 = "ssd-rocksdb-v1"
// 5 = "ssd-sharded-rocksdb" // 5 = "ssd-sharded-rocksdb"
@ -1725,7 +1725,7 @@ void SimulationConfig::setStorageEngine(const TestConfig& testConfig) {
} }
case 2: { case 2: {
CODE_PROBE(true, "Simulated cluster using radix-tree storage engine"); CODE_PROBE(true, "Simulated cluster using radix-tree storage engine");
set_config("memory-radixtree-beta"); set_config("memory-radixtree");
break; break;
} }
case 3: { case 3: {

View File

@ -445,7 +445,7 @@ struct ConfigureDatabaseWorkload : TestWorkload {
storeTypeStr = memoryTypes[deterministicRandom()->randomInt(0, 3)]; storeTypeStr = memoryTypes[deterministicRandom()->randomInt(0, 3)];
break; break;
case 2: case 2:
storeTypeStr = "memory-radixtree-beta"; storeTypeStr = "memory-radixtree";
break; break;
case 3: case 3:
// Experimental suffix is still supported so test it // Experimental suffix is still supported so test it