From 443e04e62dd09578759876c560d2a4a1f8bfaad5 Mon Sep 17 00:00:00 2001
From: Pascal Borreli <pascal@borreli.com>
Date: Sat, 16 Nov 2013 11:21:34 +0000
Subject: [PATCH] Fixed typos

---
 db/db_impl.cc                                                | 2 +-
 doc/index.html                                               | 4 ++--
 tools/db_crashtest2.py                                       | 2 +-
 tools/ldb_test.py                                            | 2 +-
 tools/shell/ShellState.h                                     | 4 ++--
 util/build_version.h                                         | 2 +-
 utilities/merge_operators/string_append/stringappend_test.cc | 2 +-
 utilities/merge_operators/uint64add.cc                       | 2 +-
 utilities/redis/redis_lists_test.cc                          | 4 ++--
 utilities/ttl/ttl_test.cc                                    | 2 +-
 10 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/db/db_impl.cc b/db/db_impl.cc
index 6ce7a743985..1241f774302 100644
--- a/db/db_impl.cc
+++ b/db/db_impl.cc
@@ -2423,7 +2423,7 @@ Status DBImpl::DoCompactionWork(CompactionState* compact,
 
   int num_output_files = compact->outputs.size();
   if (compact->builder != nullptr) {
-    // An error occured so ignore the last output.
+    // An error occurred so ignore the last output.
     assert(num_output_files > 0);
     --num_output_files;
   }
diff --git a/doc/index.html b/doc/index.html
index 088a7372255..8c0c9de5a6f 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -407,7 +407,7 @@ <h2>Write buffer</h2>
 to the other write buffer.
 <code>Options::min_write_buffer_number_to_merge</code> is the minimum number
 of write buffers that will be merged together before writing to storage.
-If set to 1, then all write buffers are fushed to L0 as individual files and
+If set to 1, then all write buffers are flushed to L0 as individual files and
 this increases read amplification because a get request has to check in all
 of these files. Also, an in-memory merge may result in writing lesser
 data to storage if there are duplicate records in each of these
@@ -661,7 +661,7 @@ <h2> Universal style compaction specific settings</h2>
 Here we give short overview of options in <code>CompactionOptionsUniversal</code>:
 <ul>
 <p>
-<li> <code>CompactionOptionsUniversal::size_ratio</code> - Percentage flexibilty while comparing file size. If the candidate file(s)
+<li> <code>CompactionOptionsUniversal::size_ratio</code> - Percentage flexibility while comparing file size. If the candidate file(s)
    size is 1% smaller than the next file's size, then include next file into
    this candidate set.  Default: 1
 <p>
diff --git a/tools/db_crashtest2.py b/tools/db_crashtest2.py
index a5c66498daf..dbb7059fe03 100644
--- a/tools/db_crashtest2.py
+++ b/tools/db_crashtest2.py
@@ -146,7 +146,7 @@ def main(argv):
         stdoutdata = stdoutdata.lower()
         errorcount = (stdoutdata.count('error') -
                       stdoutdata.count('got errors 0 times'))
-        print "#times error occured in output is " + str(errorcount) + "\n"
+        print "#times error occurred in output is " + str(errorcount) + "\n"
 
         if (errorcount > 0):
             print "TEST FAILED. Output has 'error'!!!\n"
diff --git a/tools/ldb_test.py b/tools/ldb_test.py
index a549b89c3da..fe9a6c60aea 100644
--- a/tools/ldb_test.py
+++ b/tools/ldb_test.py
@@ -314,7 +314,7 @@ def testDumpLoad(self):
         # Dump command fails because of typo in params
         dumpFilePath = os.path.join(self.TMP_DIR, "dump8")
         self.assertFalse(self.dumpDb(
-            "--db=%s --create_if_missin" % origDbPath, dumpFilePath))
+            "--db=%s --create_if_missing" % origDbPath, dumpFilePath))
 
     def testMiscAdminTask(self):
         print "Running testMiscAdminTask..."
diff --git a/tools/shell/ShellState.h b/tools/shell/ShellState.h
index ce3f6769ce9..4027af2026f 100644
--- a/tools/shell/ShellState.h
+++ b/tools/shell/ShellState.h
@@ -7,11 +7,11 @@ class ShellContext;
 /*
  * Currently, there are four types of state in total
  * 1. start state: the first state the program enters
- * 2. connecting state: the program try to connnect to a rocksdb server, whose
+ * 2. connecting state: the program try to connect to a rocksdb server, whose
  *    previous states could be "start" or "connected" states
  * 3. connected states: the program has already connected to a server, and is
  *    processing user commands
- * 4. stop state: the last state the program enters, do some cleanning up things
+ * 4. stop state: the last state the program enters, do some cleaning up things
  */
 
 class ShellState {
diff --git a/util/build_version.h b/util/build_version.h
index 266aad39c05..3d2ed291619 100644
--- a/util/build_version.h
+++ b/util/build_version.h
@@ -7,7 +7,7 @@
 // these variables tell us about the git config and time
 extern const char* rocksdb_build_git_sha;
 
-// these variables tell us when the compilation occured
+// these variables tell us when the compilation occurred
 extern const char* rocksdb_build_compile_time;
 extern const char* rocksdb_build_compile_date;
 
diff --git a/utilities/merge_operators/string_append/stringappend_test.cc b/utilities/merge_operators/string_append/stringappend_test.cc
index 57386da0f96..216dbe84e7f 100644
--- a/utilities/merge_operators/string_append/stringappend_test.cc
+++ b/utilities/merge_operators/string_append/stringappend_test.cc
@@ -83,7 +83,7 @@ class StringLists {
     }
 
     // Either key does not exist, or there is some error.
-    *result = "";       // Always return empty string (just for convenvtion)
+    *result = "";       // Always return empty string (just for convention)
 
     //NotFound is okay; just return empty (similar to std::map)
     //But network or db errors, etc, should fail the test (or at least yell)
diff --git a/utilities/merge_operators/uint64add.cc b/utilities/merge_operators/uint64add.cc
index bd96e19283c..9d78651ec8f 100644
--- a/utilities/merge_operators/uint64add.cc
+++ b/utilities/merge_operators/uint64add.cc
@@ -10,7 +10,7 @@ using namespace rocksdb;
 namespace { // anonymous namespace
 
 // A 'model' merge operator with uint64 addition semantics
-// Implemented as an AssociativeMergeOperator for simplicty and example.
+// Implemented as an AssociativeMergeOperator for simplicity and example.
 class UInt64AddOperator : public AssociativeMergeOperator {
  public:
   virtual bool Merge(const Slice& key,
diff --git a/utilities/redis/redis_lists_test.cc b/utilities/redis/redis_lists_test.cc
index 7a28ad8ed6f..0600e0e541d 100644
--- a/utilities/redis/redis_lists_test.cc
+++ b/utilities/redis/redis_lists_test.cc
@@ -485,7 +485,7 @@ TEST(RedisListsTest, InsertPushSetTest) {
   // redis.Print("k1");   // manually check
 
   // Test Inserting before/after non-existent values
-  lengthCheck = redis.Length("k1"); // Ensure that the length doesnt change
+  lengthCheck = redis.Length("k1"); // Ensure that the length doesn't change
   ASSERT_EQ(lengthCheck, 10);
   ASSERT_EQ(redis.InsertBefore("k1", "non-exist", "randval"), lengthCheck);
   ASSERT_EQ(redis.InsertAfter("k1", "nothing", "a"), lengthCheck);
@@ -723,7 +723,7 @@ TEST(RedisListsTest, PersistenceMultiKeyTest) {
 
   // Block three: Verify the changes from block 2
   {
-    RedisLists redis(kDefaultDbName, options, false); // Presistent, non-destructive
+    RedisLists redis(kDefaultDbName, options, false); // Persistent, non-destructive
 
     // Check
     ASSERT_EQ(redis.Length("k1"), 7);
diff --git a/utilities/ttl/ttl_test.cc b/utilities/ttl/ttl_test.cc
index b5241f76678..8804d893c55 100644
--- a/utilities/ttl/ttl_test.cc
+++ b/utilities/ttl/ttl_test.cc
@@ -315,7 +315,7 @@ class TtlTest {
 
 // If TTL is non positive or not provided, the behaviour is TTL = infinity
 // This test opens the db 3 times with such default behavior and inserts a
-// bunch of kvs each time. All kvs should accummulate in the db till the end
+// bunch of kvs each time. All kvs should accumulate in the db till the end
 // Partitions the sample-size provided into 3 sets over boundary1 and boundary2
 TEST(TtlTest, NoEffect) {
   MakeKVMap(kSampleSize_);