Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed typos #5

Merged
merged 1 commit into from
Nov 17, 2013
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion db/db_impl.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
4 changes: 2 additions & 2 deletions doc/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion tools/db_crashtest2.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion tools/ldb_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -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..."
Expand Down
4 changes: 2 additions & 2 deletions tools/shell/ShellState.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion util/build_version.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion utilities/merge_operators/uint64add.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions utilities/redis/redis_lists_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion utilities/ttl/ttl_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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_);
Expand Down