From e46bcc08b9bf4b130d1c0724d6f72dac9aa96581 Mon Sep 17 00:00:00 2001
From: Igor Canadi <icanadi@fb.com>
Date: Mon, 24 Aug 2015 16:43:18 -0700
Subject: [PATCH] Remove an extra 's' from cur-size-all-mem-tabless

Summary: As title

Test Plan: make check

Reviewers: yhchiang

Reviewed By: yhchiang

Subscribers: dhruba, leveldb

Differential Revision: https://reviews.facebook.net/D45447
---
 db/db_test.cc        | 20 +++++++++-----------
 db/internal_stats.cc |  2 +-
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/db/db_test.cc b/db/db_test.cc
index 1c4c1e08a..75124fa92 100644
--- a/db/db_test.cc
+++ b/db/db_test.cc
@@ -2207,12 +2207,12 @@ TEST_F(DBTest, ApproximateMemoryUsage) {
   // Phase 0.  The verify the initial value of all these properties are
   // the same as we have no mem-tables.
   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);
   ASSERT_EQ(all_mem, active_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"
   for (int r = 0; r < kNumRounds; ++r) {
     for (int f = 0; f < kFlushesPerRound; ++f) {
@@ -2220,8 +2220,7 @@ TEST_F(DBTest, ApproximateMemoryUsage) {
         Put(RandomString(&rnd, kKeySize), RandomString(&rnd, kValueSize));
       }
     }
-    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);
     // in no iterator case, these two number should be the same.
     ASSERT_EQ(unflushed_mem, all_mem);
@@ -2229,7 +2228,7 @@ TEST_F(DBTest, ApproximateMemoryUsage) {
   prev_all_mem = all_mem;
 
   // 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) {
     iters.push_back(db_->NewIterator(ReadOptions()));
     for (int f = 0; f < kFlushesPerRound; ++f) {
@@ -2239,8 +2238,7 @@ TEST_F(DBTest, ApproximateMemoryUsage) {
     }
     // In the second round, add iterators.
     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);
     ASSERT_GT(all_mem, active_mem);
     ASSERT_GT(all_mem, unflushed_mem);
@@ -2260,9 +2258,9 @@ TEST_F(DBTest, ApproximateMemoryUsage) {
     prev_all_mem = all_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);
-  // 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
   // released all iterators.
   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.
   Flush();
   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);
   ASSERT_EQ(active_mem, unflushed_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.
   Reopen(options);
   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);
   ASSERT_EQ(active_mem, unflushed_mem);
   ASSERT_EQ(unflushed_mem, all_mem);
diff --git a/db/internal_stats.cc b/db/internal_stats.cc
index 19ab73659..4fc404e5c 100644
--- a/db/internal_stats.cc
+++ b/db/internal_stats.cc
@@ -102,7 +102,7 @@ static const std::string background_errors = "background-errors";
 static const std::string cur_size_active_mem_table =
                           "cur-size-active-mem-table";
 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 num_entries_active_mem_table =
                           "num-entries-active-mem-table";