From e13d8dcbbb0b851faf968bf03a86ea2726ee9748 Mon Sep 17 00:00:00 2001 From: Dmitry Alimov Date: Thu, 4 Oct 2018 20:44:43 -0700 Subject: [PATCH] Fix typos in comments (#4456) Summary: Fix some typos in the comments Pull Request resolved: https://github.com/facebook/rocksdb/pull/4456 Differential Revision: D10209214 Pulled By: miasantreble fbshipit-source-id: dff857ba60396bc95126e635db96d7dc8330d2cb --- build_tools/gnu_parallel | 4 ++-- db/error_handler.cc | 2 +- db/error_handler.h | 2 +- db/external_sst_file_ingestion_job.cc | 2 +- port/win/io_win.h | 2 +- table/block.h | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/build_tools/gnu_parallel b/build_tools/gnu_parallel index abbf8f100..1cf164fff 100755 --- a/build_tools/gnu_parallel +++ b/build_tools/gnu_parallel @@ -5082,8 +5082,8 @@ sub openoutputfiles { # Set reading FD if using --group (--ungroup does not need) for my $fdno (1,2) { # Re-open the file for reading - # so fdw can be closed seperately - # and fdr can be seeked seperately (for --line-buffer) + # so fdw can be closed separately + # and fdr can be seeked separately (for --line-buffer) open(my $fdr,"<", $self->fh($fdno,'name')) || ::die_bug("fdr: Cannot open ".$self->fh($fdno,'name')); $self->set_fh($fdno,'r',$fdr); diff --git a/db/error_handler.cc b/db/error_handler.cc index 8e297df98..afec14edc 100644 --- a/db/error_handler.cc +++ b/db/error_handler.cc @@ -157,7 +157,7 @@ void ErrorHandler::CancelErrorRecovery() { // a default one is allocated during DB::Open(), so there will always be // one. // This can also get called as part of a recovery operation. In that case, we -// also track the error seperately in recovery_error_ so we can tell in the +// also track the error separately in recovery_error_ so we can tell in the // end whether recovery succeeded or not Status ErrorHandler::SetBGError(const Status& bg_err, BackgroundErrorReason reason) { db_mutex_->AssertHeld(); diff --git a/db/error_handler.h b/db/error_handler.h index ce8454da6..c2af809fc 100644 --- a/db/error_handler.h +++ b/db/error_handler.h @@ -60,7 +60,7 @@ class ErrorHandler { DBImpl* db_; const ImmutableDBOptions& db_options_; Status bg_error_; - // A seperate Status variable used to record any errors during the + // A separate Status variable used to record any errors during the // recovery process from hard errors Status recovery_error_; InstrumentedMutex* db_mutex_; diff --git a/db/external_sst_file_ingestion_job.cc b/db/external_sst_file_ingestion_job.cc index e142bfbea..af11f6de9 100644 --- a/db/external_sst_file_ingestion_job.cc +++ b/db/external_sst_file_ingestion_job.cc @@ -225,7 +225,7 @@ void ExternalSstFileIngestionJob::UpdateStats() { for (IngestedFileInfo& f : files_to_ingest_) { InternalStats::CompactionStats stats(CompactionReason::kExternalSstIngestion, 1); stats.micros = total_time; - // If actual copy occured for this file, then we need to count the file + // If actual copy occurred for this file, then we need to count the file // size as the actual bytes written. If the file was linked, then we ignore // the bytes written for file metadata. // TODO (yanqin) maybe account for file metadata bytes for exact accuracy? diff --git a/port/win/io_win.h b/port/win/io_win.h index 3b08c394f..c46876b8c 100644 --- a/port/win/io_win.h +++ b/port/win/io_win.h @@ -58,7 +58,7 @@ class WinFileData { protected: const std::string filename_; HANDLE hFile_; - // If ture, the I/O issued would be direct I/O which the buffer + // If true, the I/O issued would be direct I/O which the buffer // will need to be aligned (not sure there is a guarantee that the buffer // passed in is aligned). const bool use_direct_io_; diff --git a/table/block.h b/table/block.h index 83900b56f..2638260a9 100644 --- a/table/block.h +++ b/table/block.h @@ -170,7 +170,7 @@ class Block { // // key_includes_seq, default true, means that the keys are in internal key // format. - // value_is_full, default ture, means that no delta encoding is + // value_is_full, default true, means that no delta encoding is // applied to values. // // NewIterator @@ -449,7 +449,7 @@ class IndexBlockIter final : public BlockIter { } // key_includes_seq, default true, means that the keys are in internal key // format. - // value_is_full, default ture, means that no delta encoding is + // value_is_full, default true, means that no delta encoding is // applied to values. IndexBlockIter(const Comparator* comparator, const Comparator* user_comparator, const char* data,