andreacavalli/rocksdb
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove an extra 's' from cur-size-all-mem-tabless

Browse Source 
Summary: As title

Test Plan: make check

Reviewers: yhchiang

Reviewed By: yhchiang

Subscribers: dhruba, leveldb

Differential Revision: https://reviews.facebook.net/D45447
This commit is contained in:
Igor Canadi 2015-08-24 16:43:18 -07:00
parent 4ab26c5ad1
commit e46bcc08b9
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
db/db_test.cc
View File

@ -2207,12 +2207,12 @@ TEST_F(DBTest, ApproximateMemoryUsage) {
// Phase 0. The verify the initial value of all these properties are // Phase 0. The verify the initial value of all these properties are
// the same as we have no mem-tables. // the same as we have no mem-tables.
dbfull()->GetIntProperty("rocksdb.cur-size-active-mem-table", &active_mem); dbfull()->GetIntProperty("rocksdb.cur-size-active-mem-table", &active_mem);
dbfull()->GetIntProperty("rocksdb.cur-size-all-mem-tabless", &unflushed_mem); dbfull()->GetIntProperty("rocksdb.cur-size-all-mem-tables", &unflushed_mem);
dbfull()->GetIntProperty("rocksdb.size-all-mem-tables", &all_mem); dbfull()->GetIntProperty("rocksdb.size-all-mem-tables", &all_mem);
ASSERT_EQ(all_mem, active_mem); ASSERT_EQ(all_mem, active_mem);
ASSERT_EQ(all_mem, unflushed_mem); ASSERT_EQ(all_mem, unflushed_mem);
// Phase 1. Simply issue Put() and expect "cur-size-all-mem-tabless" // Phase 1. Simply issue Put() and expect "cur-size-all-mem-tables"
// equals to "size-all-mem-tables" // equals to "size-all-mem-tables"
for (int r = 0; r < kNumRounds; ++r) { for (int r = 0; r < kNumRounds; ++r) {
for (int f = 0; f < kFlushesPerRound; ++f) { for (int f = 0; f < kFlushesPerRound; ++f) {
@ -2220,8 +2220,7 @@ TEST_F(DBTest, ApproximateMemoryUsage) {
Put(RandomString(&rnd, kKeySize), RandomString(&rnd, kValueSize)); Put(RandomString(&rnd, kKeySize), RandomString(&rnd, kValueSize));
} }
} }
dbfull()->GetIntProperty("rocksdb.cur-size-all-mem-tabless", dbfull()->GetIntProperty("rocksdb.cur-size-all-mem-tables", &unflushed_mem);
&unflushed_mem);
dbfull()->GetIntProperty("rocksdb.size-all-mem-tables", &all_mem); dbfull()->GetIntProperty("rocksdb.size-all-mem-tables", &all_mem);
// in no iterator case, these two number should be the same. // in no iterator case, these two number should be the same.
ASSERT_EQ(unflushed_mem, all_mem); ASSERT_EQ(unflushed_mem, all_mem);
@ -2229,7 +2228,7 @@ TEST_F(DBTest, ApproximateMemoryUsage) {
prev_all_mem = all_mem; prev_all_mem = all_mem;
// Phase 2. Keep issuing Put() but also create new iterator. This time // Phase 2. Keep issuing Put() but also create new iterator. This time
// we expect "size-all-mem-tables" > "cur-size-all-mem-tabless". // we expect "size-all-mem-tables" > "cur-size-all-mem-tables".
for (int r = 0; r < kNumRounds; ++r) { for (int r = 0; r < kNumRounds; ++r) {
iters.push_back(db_->NewIterator(ReadOptions())); iters.push_back(db_->NewIterator(ReadOptions()));
for (int f = 0; f < kFlushesPerRound; ++f) { for (int f = 0; f < kFlushesPerRound; ++f) {
@ -2239,8 +2238,7 @@ TEST_F(DBTest, ApproximateMemoryUsage) {
} }
// In the second round, add iterators. // In the second round, add iterators.
dbfull()->GetIntProperty("rocksdb.cur-size-active-mem-table", &active_mem); dbfull()->GetIntProperty("rocksdb.cur-size-active-mem-table", &active_mem);
dbfull()->GetIntProperty("rocksdb.cur-size-all-mem-tabless", dbfull()->GetIntProperty("rocksdb.cur-size-all-mem-tables", &unflushed_mem);
&unflushed_mem);
dbfull()->GetIntProperty("rocksdb.size-all-mem-tables", &all_mem); dbfull()->GetIntProperty("rocksdb.size-all-mem-tables", &all_mem);
ASSERT_GT(all_mem, active_mem); ASSERT_GT(all_mem, active_mem);
ASSERT_GT(all_mem, unflushed_mem); ASSERT_GT(all_mem, unflushed_mem);
@ -2260,9 +2258,9 @@ TEST_F(DBTest, ApproximateMemoryUsage) {
prev_all_mem = all_mem; prev_all_mem = all_mem;
} }
dbfull()->GetIntProperty("rocksdb.cur-size-active-mem-table", &active_mem); dbfull()->GetIntProperty("rocksdb.cur-size-active-mem-table", &active_mem);
dbfull()->GetIntProperty("rocksdb.cur-size-all-mem-tabless", &unflushed_mem); dbfull()->GetIntProperty("rocksdb.cur-size-all-mem-tables", &unflushed_mem);
dbfull()->GetIntProperty("rocksdb.size-all-mem-tables", &all_mem); dbfull()->GetIntProperty("rocksdb.size-all-mem-tables", &all_mem);
// now we expect "cur-size-all-mem-tabless" and // now we expect "cur-size-all-mem-tables" and
// "size-all-mem-tables" are the same again after we // "size-all-mem-tables" are the same again after we
// released all iterators. // released all iterators.
ASSERT_EQ(all_mem, unflushed_mem); ASSERT_EQ(all_mem, unflushed_mem);
@ -2271,7 +2269,7 @@ TEST_F(DBTest, ApproximateMemoryUsage) {
// Phase 4. Perform flush, and expect all these three counters are the same. // Phase 4. Perform flush, and expect all these three counters are the same.
Flush(); Flush();
dbfull()->GetIntProperty("rocksdb.cur-size-active-mem-table", &active_mem); dbfull()->GetIntProperty("rocksdb.cur-size-active-mem-table", &active_mem);
dbfull()->GetIntProperty("rocksdb.cur-size-all-mem-tabless", &unflushed_mem); dbfull()->GetIntProperty("rocksdb.cur-size-all-mem-tables", &unflushed_mem);
dbfull()->GetIntProperty("rocksdb.size-all-mem-tables", &all_mem); dbfull()->GetIntProperty("rocksdb.size-all-mem-tables", &all_mem);
ASSERT_EQ(active_mem, unflushed_mem); ASSERT_EQ(active_mem, unflushed_mem);
ASSERT_EQ(unflushed_mem, all_mem); ASSERT_EQ(unflushed_mem, all_mem);
@ -2279,7 +2277,7 @@ TEST_F(DBTest, ApproximateMemoryUsage) {
// Phase 5. Reopen, and expect all these three counters are the same again. // Phase 5. Reopen, and expect all these three counters are the same again.
Reopen(options); Reopen(options);
dbfull()->GetIntProperty("rocksdb.cur-size-active-mem-table", &active_mem); dbfull()->GetIntProperty("rocksdb.cur-size-active-mem-table", &active_mem);
dbfull()->GetIntProperty("rocksdb.cur-size-all-mem-tabless", &unflushed_mem); dbfull()->GetIntProperty("rocksdb.cur-size-all-mem-tables", &unflushed_mem);
dbfull()->GetIntProperty("rocksdb.size-all-mem-tables", &all_mem); dbfull()->GetIntProperty("rocksdb.size-all-mem-tables", &all_mem);
ASSERT_EQ(active_mem, unflushed_mem); ASSERT_EQ(active_mem, unflushed_mem);
ASSERT_EQ(unflushed_mem, all_mem); ASSERT_EQ(unflushed_mem, all_mem);

2
db/internal_stats.cc
View File

@ -102,7 +102,7 @@ static const std::string background_errors = "background-errors";
static const std::string cur_size_active_mem_table = static const std::string cur_size_active_mem_table =
"cur-size-active-mem-table"; "cur-size-active-mem-table";
static const std::string cur_size_unflushed_mem_tables = static const std::string cur_size_unflushed_mem_tables =
"cur-size-all-mem-tabless"; "cur-size-all-mem-tables";
static const std::string cur_size_all_mem_tables = "size-all-mem-tables"; static const std::string cur_size_all_mem_tables = "size-all-mem-tables";
static const std::string num_entries_active_mem_table = static const std::string num_entries_active_mem_table =
"num-entries-active-mem-table"; "num-entries-active-mem-table";