diff --git a/db/db_test.cc b/db/db_test.cc index 90fcd0d4581a4739c97ca642108ec0f1ff6c553e..2aac2d15c076e11226084b3dd3f236a8db260122 100644 --- a/db/db_test.cc +++ b/db/db_test.cc @@ -4383,8 +4383,8 @@ void MinLevelHelper(DBTest* self, Options& options) { std::vector values; // Write 120KB (12 values, each 10K) for (int i = 0; i < 12; i++) { - values.push_back(RandomString(&rnd, 10000)); - ASSERT_OK(self->Put(Key(i), values[i])); + values.push_back(DBTestBase::RandomString(&rnd, 10000)); + ASSERT_OK(self->Put(DBTestBase::Key(i), values[i])); } self->dbfull()->TEST_WaitForFlushMemTable(); ASSERT_EQ(self->NumTableFilesAtLevel(0), num + 1); @@ -4393,8 +4393,8 @@ void MinLevelHelper(DBTest* self, Options& options) { //generate one more file in level-0, and should trigger level-0 compaction std::vector values; for (int i = 0; i < 12; i++) { - values.push_back(RandomString(&rnd, 10000)); - ASSERT_OK(self->Put(Key(i), values[i])); + values.push_back(DBTestBase::RandomString(&rnd, 10000)); + ASSERT_OK(self->Put(DBTestBase::Key(i), values[i])); } self->dbfull()->TEST_WaitForCompact(); @@ -9211,7 +9211,7 @@ static void RandomTimeoutWriter(void* arg) { for (int k = 0; k < num_keys; ++k) { int key = k + thread_id * num_keys; - std::string value = RandomString(&rnd, kValueSize); + std::string value = DBTestBase::RandomString(&rnd, kValueSize); // only the second-half is randomized if (k > num_keys / 2) { switch (rnd.Next() % 5) { @@ -9231,7 +9231,7 @@ static void RandomTimeoutWriter(void* arg) { } uint64_t time_before_put = db->GetEnv()->NowMicros(); - Status s = db->Put(write_opt, Key(key), value); + Status s = db->Put(write_opt, DBTestBase::Key(key), value); uint64_t put_duration = db->GetEnv()->NowMicros() - time_before_put; if (write_opt.timeout_hint_us == 0 || put_duration + kTimerBias < write_opt.timeout_hint_us) { diff --git a/util/db_test_util.h b/util/db_test_util.h index c64c62a4398a74dccb1fb81cc202ca0f9ac5c8c5..440442f6e233e4bb5e3a6e1f977c645116f4ab91 100644 --- a/util/db_test_util.h +++ b/util/db_test_util.h @@ -55,12 +55,6 @@ namespace rocksdb { -static std::string RandomString(Random* rnd, int len) { - std::string r; - test::RandomString(rnd, len, &r); - return r; -} - namespace anon { class AtomicCounter { public: @@ -118,12 +112,6 @@ struct OptionsOverride { } // namespace anon -static std::string Key(int i) { - char buf[100]; - snprintf(buf, sizeof(buf), "key%06d", i); - return std::string(buf); -} - // Special Env used to delay background operations class SpecialEnv : public EnvWrapper { public: @@ -456,6 +444,18 @@ class DBTestBase : public testing::Test { ~DBTestBase(); + static std::string RandomString(Random* rnd, int len) { + std::string r; + test::RandomString(rnd, len, &r); + return r; + } + + static std::string Key(int i) { + char buf[100]; + snprintf(buf, sizeof(buf), "key%06d", i); + return std::string(buf); + } + // Switch to a fresh database with the next option configuration to // test. Return false if there are no more configurations to test. bool ChangeOptions(int skip_mask = kNoSkip);