From c7662a44a46a5b8f2a78872c8f48d75e25db9f88 Mon Sep 17 00:00:00 2001 From: hyunwoo Date: Mon, 5 Jun 2017 11:23:31 -0700 Subject: [PATCH] fixed typo Summary: fixed typo Closes https://github.com/facebook/rocksdb/pull/2376 Differential Revision: D5183630 Pulled By: ajkr fbshipit-source-id: 133cfd0445959e70aa2cd1a12151bf3c0c5c3ac5 --- build_tools/run_ci_db_test.ps1 | 2 +- db/column_family.cc | 2 +- db/compaction_picker_universal.cc | 2 +- db/db_impl.cc | 2 +- db/external_sst_file_ingestion_job.h | 2 +- include/rocksdb/options.h | 2 +- java/rocksjni/portal.h | 10 +++++----- java/rocksjni/rocksjni.cc | 4 ++-- java/rocksjni/ttl.cc | 2 +- .../java/org/rocksdb/CompactionOptionsUniversal.java | 4 ++-- options/options_test.cc | 4 ++-- tools/rdb/API.md | 2 +- tools/rdb/README.md | 2 +- util/build_version.h | 2 +- util/xxhash.cc | 2 +- utilities/document/document_db.cc | 2 +- 16 files changed, 23 insertions(+), 23 deletions(-) diff --git a/build_tools/run_ci_db_test.ps1 b/build_tools/run_ci_db_test.ps1 index 2e3c35ed0..c8167ed95 100644 --- a/build_tools/run_ci_db_test.ps1 +++ b/build_tools/run_ci_db_test.ps1 @@ -333,7 +333,7 @@ function RunJobs($Suites, $TestCmds, [int]$ConcurrencyVal) $Cases = @{} if($Suites.Count -gt 0) { - # Will teh first one + # Will the first one ForEach($e in $Suites.Keys) { $exe_name = $e $Cases = $Suites[$e] diff --git a/db/column_family.cc b/db/column_family.cc index 8cfcdac18..bf4d8a72d 100644 --- a/db/column_family.cc +++ b/db/column_family.cc @@ -551,7 +551,7 @@ std::unique_ptr SetupDelay( // If DB just falled into the stop condition, we need to further reduce // the write rate to avoid the stop condition. if (penalize_stop) { - // Penalize the near stop or stop condition by more agressive slowdown. + // Penalize the near stop or stop condition by more aggressive slowdown. // This is to provide the long term slowdown increase signal. // The penalty is more than the reward of recovering to the normal // condition. diff --git a/db/compaction_picker_universal.cc b/db/compaction_picker_universal.cc index f34f2cdd0..91ed40586 100644 --- a/db/compaction_picker_universal.cc +++ b/db/compaction_picker_universal.cc @@ -621,7 +621,7 @@ Compaction* UniversalCompactionPicker::PickCompactionToReduceSizeAmp( const std::string& cf_name, const MutableCFOptions& mutable_cf_options, VersionStorageInfo* vstorage, double score, const std::vector& sorted_runs, LogBuffer* log_buffer) { - // percentage flexibilty while reducing size amplification + // percentage flexibility while reducing size amplification uint64_t ratio = ioptions_.compaction_options_universal.max_size_amplification_percent; diff --git a/db/db_impl.cc b/db/db_impl.cc index e660c1c93..37eb0f203 100644 --- a/db/db_impl.cc +++ b/db/db_impl.cc @@ -2448,7 +2448,7 @@ void DBImpl::EraseThreadStatusDbInfo() const { // A global method that can dump out the build version void DumpRocksDBBuildVersion(Logger * log) { #if !defined(IOS_CROSS_COMPILE) - // if we compile with Xcode, we don't run build_detect_vesion, so we don't + // if we compile with Xcode, we don't run build_detect_version, so we don't // generate util/build_version.cc ROCKS_LOG_HEADER(log, "RocksDB version: %d.%d.%d\n", ROCKSDB_MAJOR, ROCKSDB_MINOR, ROCKSDB_PATCH); diff --git a/db/external_sst_file_ingestion_job.h b/db/external_sst_file_ingestion_job.h index 10963852f..0215f5910 100644 --- a/db/external_sst_file_ingestion_job.h +++ b/db/external_sst_file_ingestion_job.h @@ -97,7 +97,7 @@ class ExternalSstFileIngestionJob { // REQUIRES: Mutex held void UpdateStats(); - // Cleanup after successfull/failed job + // Cleanup after successful/failed job void Cleanup(const Status& status); VersionEdit* edit() { return &edit_; } diff --git a/include/rocksdb/options.h b/include/rocksdb/options.h index 28618fccd..75f7a7a2a 100644 --- a/include/rocksdb/options.h +++ b/include/rocksdb/options.h @@ -771,7 +771,7 @@ struct DBOptions { // If enable_pipelined_write is true, separate write thread queue is // maintained for WAL write and memtable write. A write thread first enter WAL // writer queue and then memtable writer queue. Pending thread on the WAL - // writer queue thus only have to wait for previous writers to finish thier + // writer queue thus only have to wait for previous writers to finish their // WAL writing but not the memtable writing. Enabling the feature may improve // write throughput and reduce latency of the prepare phase of two-phase // commit. diff --git a/java/rocksjni/portal.h b/java/rocksjni/portal.h index c429d996d..aad26e570 100644 --- a/java/rocksjni/portal.h +++ b/java/rocksjni/portal.h @@ -1635,7 +1635,7 @@ class BackupInfoListJni { jobject jbackup_info_handle_list = env->NewObject(jarray_list_clazz, cstr_mid, backup_infos.size()); if(env->ExceptionCheck()) { - // exception occured constructing object + // exception occurred constructing object return nullptr; } @@ -1650,7 +1650,7 @@ class BackupInfoListJni { backup_info.size, backup_info.number_files); if(env->ExceptionCheck()) { - // exception occured constructing object + // exception occurred constructing object if(obj != nullptr) { env->DeleteLocalRef(obj); } @@ -1663,7 +1663,7 @@ class BackupInfoListJni { jboolean rs = env->CallBooleanMethod(jbackup_info_handle_list, add_mid, obj); if(env->ExceptionCheck() || rs == JNI_FALSE) { - // exception occured calling method, or could not add + // exception occurred calling method, or could not add if(obj != nullptr) { env->DeleteLocalRef(obj); } @@ -1825,7 +1825,7 @@ class WriteTypeJni : public JavaClass { env->GetStaticFieldID(jclazz, name, "Lorg/rocksdb/WBWIRocksIterator$WriteType;"); if(env->ExceptionCheck()) { - // exception occured while getting field + // exception occurred while getting field return nullptr; } else if(jfid == nullptr) { return nullptr; @@ -1962,7 +1962,7 @@ class InfoLogLevelJni : public JavaClass { jfieldID jfid = env->GetStaticFieldID(jclazz, name, "Lorg/rocksdb/InfoLogLevel;"); if(env->ExceptionCheck()) { - // exception occured while getting field + // exception occurred while getting field return nullptr; } else if(jfid == nullptr) { return nullptr; diff --git a/java/rocksjni/rocksjni.cc b/java/rocksjni/rocksjni.cc index 0dfe7f0a1..004427147 100644 --- a/java/rocksjni/rocksjni.cc +++ b/java/rocksjni/rocksjni.cc @@ -122,7 +122,7 @@ jlongArray rocksdb_open_helper(JNIEnv* env, jlong jopt_handle, env->ReleaseLongArrayElements(jcolumn_options, jco, JNI_ABORT); if(has_exception == JNI_TRUE) { - // exception occured + // exception occurred env->ReleaseStringUTFChars(jdb_path, db_path); return nullptr; } @@ -2180,7 +2180,7 @@ void Java_org_rocksdb_RocksDB_ingestExternalFile( rocksdb::JniUtil::copyStrings(env, jfile_path_list, jfile_path_list_len, &has_exception); if(has_exception == JNI_TRUE) { - // exception occured + // exception occurred return; } diff --git a/java/rocksjni/ttl.cc b/java/rocksjni/ttl.cc index 84f640e9e..31fdd74ad 100644 --- a/java/rocksjni/ttl.cc +++ b/java/rocksjni/ttl.cc @@ -91,7 +91,7 @@ jlongArray env->ReleaseLongArrayElements(jcolumn_options, jco, JNI_ABORT); if(has_exception == JNI_TRUE) { - // exception occured + // exception occurred env->ReleaseStringUTFChars(jdb_path, db_path); return nullptr; } diff --git a/java/src/main/java/org/rocksdb/CompactionOptionsUniversal.java b/java/src/main/java/org/rocksdb/CompactionOptionsUniversal.java index fdf3a4709..c6a49cf85 100644 --- a/java/src/main/java/org/rocksdb/CompactionOptionsUniversal.java +++ b/java/src/main/java/org/rocksdb/CompactionOptionsUniversal.java @@ -15,7 +15,7 @@ public class CompactionOptionsUniversal extends RocksObject { } /** - * Percentage flexibilty while comparing file size. If the candidate file(s) + * 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. * @@ -31,7 +31,7 @@ public class CompactionOptionsUniversal extends RocksObject { } /** - * Percentage flexibilty while comparing file size. If the candidate file(s) + * 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. * diff --git a/options/options_test.cc b/options/options_test.cc index ed001ff6c..b90c0f357 100644 --- a/options/options_test.cc +++ b/options/options_test.cc @@ -336,7 +336,7 @@ TEST_F(OptionsTest, GetColumnFamilyOptionsFromStringTest) { ASSERT_EQ(new_cf_opt.arena_block_size, 21 * tera); // Nested block based table options - // Emtpy + // Empty ASSERT_OK(GetColumnFamilyOptionsFromString(base_cf_opt, "write_buffer_size=10;max_write_buffer_number=16;" "block_based_table_factory={};arena_block_size=1024", @@ -404,7 +404,7 @@ TEST_F(OptionsTest, GetColumnFamilyOptionsFromStringTest) { ASSERT_OK(RocksDBOptionsParser::VerifyCFOptions(base_cf_opt, new_cf_opt)); // Nested plain table options - // Emtpy + // Empty ASSERT_OK(GetColumnFamilyOptionsFromString(base_cf_opt, "write_buffer_size=10;max_write_buffer_number=16;" "plain_table_factory={};arena_block_size=1024", diff --git a/tools/rdb/API.md b/tools/rdb/API.md index e651daa57..e9c2e5925 100644 --- a/tools/rdb/API.md +++ b/tools/rdb/API.md @@ -92,7 +92,7 @@ ### CreateColumnFamily - # Create a new column familiy for the database. + # Create a new column family for the database. # # column_family_name (string) - Name of the new column family. # diff --git a/tools/rdb/README.md b/tools/rdb/README.md index 2cc9acad2..f69b3f7b1 100644 --- a/tools/rdb/README.md +++ b/tools/rdb/README.md @@ -16,7 +16,7 @@ JavaScript binding for RocksDB within a Node application. ### Installation NOTE: If your default `python` binary is not a version of python2, add -the arguments `--python /path/to/python2` to the the `node-gyp` commands. +the arguments `--python /path/to/python2` to the `node-gyp` commands. 1. Make sure you have the static library (i.e. "librocksdb.a") in the root directory of your rocksdb installation. If not, `cd` there and run diff --git a/util/build_version.h b/util/build_version.h index 223d0bae6..d946b017a 100644 --- a/util/build_version.h +++ b/util/build_version.h @@ -7,7 +7,7 @@ // #pragma once #if !defined(IOS_CROSS_COMPILE) -// if we compile with Xcode, we don't run build_detect_vesion, so we don't +// if we compile with Xcode, we don't run build_detect_version, so we don't // generate these variables // this variable tells us about the git revision extern const char* rocksdb_build_git_sha; diff --git a/util/xxhash.cc b/util/xxhash.cc index 7bd80023c..4bce61a48 100644 --- a/util/xxhash.cc +++ b/util/xxhash.cc @@ -53,7 +53,7 @@ You can contact the author at : // By default, xxHash library provides endian-independent Hash values, based on little-endian convention. // Results are therefore identical for little-endian and big-endian CPU. // This comes at a performance cost for big-endian CPU, since some swapping is required to emulate little-endian format. -// Should endian-independance be of no importance for your application, you may set the #define below to 1. +// Should endian-independence be of no importance for your application, you may set the #define below to 1. // It will improve speed for Big-endian CPU. // This option has no impact on Little_Endian CPU. #define XXH_FORCE_NATIVE_FORMAT 0 diff --git a/utilities/document/document_db.cc b/utilities/document/document_db.cc index 010ea1a25..8637a2a3b 100644 --- a/utilities/document/document_db.cc +++ b/utilities/document/document_db.cc @@ -25,7 +25,7 @@ namespace rocksdb { // IMPORTANT NOTE: Secondary index column families should be very small and // generally fit in memory. Assume that accessing secondary index column // families is much faster than accessing primary index (data heap) column -// family. Accessing a key (i.e. checking for existance) from a column family in +// family. Accessing a key (i.e. checking for existence) from a column family in // RocksDB is not much faster than accessing both key and value since they are // kept together and loaded from storage together.