Skip to content

Commit 706c9c8

Browse files
empiredanempiredan
committed
fix clang-tidy
1 parent 3c44253 commit 706c9c8

File tree

1 file changed

+48
-51
lines changed

1 file changed

+48
-51
lines changed

‎src/meta/test/server_state_test.cpp

Lines changed: 48 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -56,41 +56,10 @@
5656
DSN_DECLARE_string(cluster_root);
5757
DSN_DECLARE_string(meta_state_service_type);
5858

59-
namespace dsn {
60-
namespace replication {
59+
namespace dsn::replication {
6160

6261
namespace {
6362

64-
const std::vector<std::string> keys = {
65-
dsn::replica_envs::MANUAL_COMPACT_ONCE_TRIGGER_TIME,
66-
dsn::replica_envs::MANUAL_COMPACT_ONCE_TARGET_LEVEL,
67-
dsn::replica_envs::MANUAL_COMPACT_ONCE_BOTTOMMOST_LEVEL_COMPACTION,
68-
dsn::replica_envs::MANUAL_COMPACT_PERIODIC_TRIGGER_TIME,
69-
dsn::replica_envs::MANUAL_COMPACT_PERIODIC_TARGET_LEVEL,
70-
dsn::replica_envs::MANUAL_COMPACT_PERIODIC_BOTTOMMOST_LEVEL_COMPACTION,
71-
dsn::replica_envs::ROCKSDB_USAGE_SCENARIO,
72-
dsn::replica_envs::ROCKSDB_CHECKPOINT_RESERVE_MIN_COUNT,
73-
dsn::replica_envs::ROCKSDB_CHECKPOINT_RESERVE_TIME_SECONDS};
74-
const std::vector<std::string> values = {
75-
"1712846598",
76-
"6",
77-
dsn::replica_envs::MANUAL_COMPACT_BOTTOMMOST_LEVEL_COMPACTION_FORCE,
78-
"1712846598",
79-
"-1",
80-
dsn::replica_envs::MANUAL_COMPACT_BOTTOMMOST_LEVEL_COMPACTION_SKIP,
81-
dsn::replica_envs::ROCKSDB_ENV_USAGE_SCENARIO_NORMAL,
82-
"1",
83-
"0"};
84-
85-
const std::vector<std::string> del_keys = {dsn::replica_envs::MANUAL_COMPACT_ONCE_TRIGGER_TIME,
86-
dsn::replica_envs::MANUAL_COMPACT_PERIODIC_TRIGGER_TIME,
87-
dsn::replica_envs::ROCKSDB_USAGE_SCENARIO};
88-
const std::set<std::string> del_keys_set = {dsn::replica_envs::MANUAL_COMPACT_ONCE_TRIGGER_TIME,
89-
dsn::replica_envs::MANUAL_COMPACT_PERIODIC_TRIGGER_TIME,
90-
dsn::replica_envs::ROCKSDB_USAGE_SCENARIO};
91-
92-
const std::string clear_prefix = "rocksdb";
93-
9463
// If `str` is <prefix>.xxx, return <prefix>; otherwise return empty string("").
9564
std::string acquire_prefix(const std::string &str)
9665
{
@@ -258,6 +227,28 @@ class server_state_test
258227

259228
void meta_service_test_app::app_envs_basic_test()
260229
{
230+
static const std::vector<std::string> kValues = {
231+
"1712846598",
232+
"6",
233+
dsn::replica_envs::MANUAL_COMPACT_BOTTOMMOST_LEVEL_COMPACTION_FORCE,
234+
"1712846598",
235+
"-1",
236+
dsn::replica_envs::MANUAL_COMPACT_BOTTOMMOST_LEVEL_COMPACTION_SKIP,
237+
dsn::replica_envs::ROCKSDB_ENV_USAGE_SCENARIO_NORMAL,
238+
"1",
239+
"0"};
240+
241+
static const std::vector<std::string> kKeys = {
242+
dsn::replica_envs::MANUAL_COMPACT_ONCE_TRIGGER_TIME,
243+
dsn::replica_envs::MANUAL_COMPACT_ONCE_TARGET_LEVEL,
244+
dsn::replica_envs::MANUAL_COMPACT_ONCE_BOTTOMMOST_LEVEL_COMPACTION,
245+
dsn::replica_envs::MANUAL_COMPACT_PERIODIC_TRIGGER_TIME,
246+
dsn::replica_envs::MANUAL_COMPACT_PERIODIC_TARGET_LEVEL,
247+
dsn::replica_envs::MANUAL_COMPACT_PERIODIC_BOTTOMMOST_LEVEL_COMPACTION,
248+
dsn::replica_envs::ROCKSDB_USAGE_SCENARIO,
249+
dsn::replica_envs::ROCKSDB_CHECKPOINT_RESERVE_MIN_COUNT,
250+
dsn::replica_envs::ROCKSDB_CHECKPOINT_RESERVE_TIME_SECONDS};
251+
261252
server_state_test test;
262253
test.load_apps({"test_app1",
263254
"test_set_app_envs_not_found",
@@ -299,17 +290,17 @@ void meta_service_test_app::app_envs_basic_test()
299290
// Normal case for setting envs.
300291
std::cout << "test server_state::set_app_envs(success)..." << std::endl;
301292
{
302-
test.test_set_app_envs("test_app1", keys, values, ERR_OK);
293+
test.test_set_app_envs("test_app1", kKeys, kValues, ERR_OK);
303294

304295
const auto &app = test.get_app("test_app1");
305296
ASSERT_TRUE(app);
306297

307-
for (size_t idx = 0; idx < keys.size(); ++idx) {
308-
const auto &key = keys[idx];
298+
for (size_t idx = 0; idx < kKeys.size(); ++idx) {
299+
const auto &key = kKeys[idx];
309300

310301
// Every env should be inserted.
311302
ASSERT_EQ(1, app->envs.count(key));
312-
ASSERT_EQ(values[idx], app->envs.at(key));
303+
ASSERT_EQ(kValues[idx], app->envs.at(key));
313304
}
314305
}
315306

@@ -342,25 +333,31 @@ void meta_service_test_app::app_envs_basic_test()
342333

343334
#undef TEST_DEL_APP_ENVS_FAILED
344335

336+
static const std::vector<std::string> kDelKeyList = {
337+
dsn::replica_envs::MANUAL_COMPACT_ONCE_TRIGGER_TIME,
338+
dsn::replica_envs::MANUAL_COMPACT_PERIODIC_TRIGGER_TIME,
339+
dsn::replica_envs::ROCKSDB_USAGE_SCENARIO};
340+
static const std::set<std::string> kDelKeySet(kDelKeyList.begin(), kDelKeyList.end());
341+
345342
// Normal case for deleting envs.
346343
std::cout << "test server_state::del_app_envs(success)..." << std::endl;
347344
{
348-
test.test_del_app_envs("test_app1", del_keys, ERR_OK);
345+
test.test_del_app_envs("test_app1", kDelKeyList, ERR_OK);
349346

350347
const auto &app = test.get_app("test_app1");
351348
ASSERT_TRUE(app);
352349

353-
for (size_t idx = 0; idx < keys.size(); ++idx) {
354-
const std::string &key = keys[idx];
355-
if (del_keys_set.count(key) > 0) {
356-
// The env in `del_keys_set` should be deleted.
350+
for (size_t idx = 0; idx < kKeys.size(); ++idx) {
351+
const std::string &key = kKeys[idx];
352+
if (kDelKeySet.count(key) > 0) {
353+
// The env in `kDelKeySet` should be deleted.
357354
ASSERT_EQ(0, app->envs.count(key));
358355
continue;
359356
}
360357

361-
// The env should still exist if it is not in `del_keys_set`.
358+
// The env should still exist if it is not in `kDelKeySet`.
362359
ASSERT_EQ(1, app->envs.count(key));
363-
ASSERT_EQ(values[idx], app->envs.at(key));
360+
ASSERT_EQ(kValues[idx], app->envs.at(key));
364361
}
365362
}
366363

@@ -396,28 +393,29 @@ void meta_service_test_app::app_envs_basic_test()
396393
{
397394
// Test specifying prefix.
398395
{
399-
test.test_clear_app_envs("test_app1", clear_prefix, ERR_OK);
396+
static const std::string kClearPrefix = "rocksdb";
397+
test.test_clear_app_envs("test_app1", kClearPrefix, ERR_OK);
400398

401399
const auto &app = test.get_app("test_app1");
402400
ASSERT_TRUE(app);
403401

404-
for (size_t idx = 0; idx < keys.size(); ++idx) {
405-
const std::string &key = keys[idx];
406-
if (del_keys_set.count(key) > 0) {
402+
for (size_t idx = 0; idx < kKeys.size(); ++idx) {
403+
const std::string &key = kKeys[idx];
404+
if (kDelKeySet.count(key) > 0) {
407405
// The env should have been deleted during test for `del_app_envs`.
408406
ASSERT_EQ(0, app->envs.count(key));
409407
continue;
410408
}
411409

412-
if (acquire_prefix(key) == clear_prefix) {
410+
if (acquire_prefix(key) == kClearPrefix) {
413411
// The env with specified prefix should be deleted.
414412
ASSERT_EQ(0, app->envs.count(key));
415413
continue;
416414
}
417415

418416
// Otherwise, the env should still exist.
419417
ASSERT_EQ(1, app->envs.count(key));
420-
ASSERT_EQ(values[idx], app->envs.at(key));
418+
ASSERT_EQ(kValues[idx], app->envs.at(key));
421419
}
422420
}
423421

@@ -434,5 +432,4 @@ void meta_service_test_app::app_envs_basic_test()
434432
}
435433
}
436434

437-
} // namespace replication
438-
} // namespace dsn
435+
} // namespace dsn::replication

0 commit comments

Comments
 (0)