From d1a978ae3d9261fffef8dc844406b90e1c01c4fa Mon Sep 17 00:00:00 2001 From: Yueh-Hsuan Chiang Date: Wed, 20 May 2015 12:11:57 -0700 Subject: [PATCH] Rename JSONWritter to JSONWriter Summary: Rename JSONWritter to JSONWriter Test Plan: make Reviewers: igor Reviewed By: igor Subscribers: dhruba, leveldb Differential Revision: https://reviews.facebook.net/D38733 --- util/event_logger.cc | 16 ++++++++-------- util/event_logger.h | 32 ++++++++++++++++---------------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/util/event_logger.cc b/util/event_logger.cc index fdecb8e54..80bba21b5 100644 --- a/util/event_logger.cc +++ b/util/event_logger.cc @@ -21,25 +21,25 @@ namespace rocksdb { const char* kEventLoggerPrefix = "EVENT_LOG_v1"; EventLoggerStream::EventLoggerStream(Logger* logger) - : logger_(logger), log_buffer_(nullptr), json_writter_(nullptr) {} + : logger_(logger), log_buffer_(nullptr), json_writer_(nullptr) {} EventLoggerStream::EventLoggerStream(LogBuffer* log_buffer) - : logger_(nullptr), log_buffer_(log_buffer), json_writter_(nullptr) {} + : logger_(nullptr), log_buffer_(log_buffer), json_writer_(nullptr) {} EventLoggerStream::~EventLoggerStream() { - if (json_writter_) { - json_writter_->EndObject(); + if (json_writer_) { + json_writer_->EndObject(); #ifdef ROCKSDB_PRINT_EVENTS_TO_STDOUT - printf("%s\n", json_writter_->Get().c_str()); + printf("%s\n", json_writer_->Get().c_str()); #else if (logger_) { - Log(logger_, "%s %s", kEventLoggerPrefix, json_writter_->Get().c_str()); + Log(logger_, "%s %s", kEventLoggerPrefix, json_writer_->Get().c_str()); } else if (log_buffer_) { LogToBuffer(log_buffer_, "%s %s", kEventLoggerPrefix, - json_writter_->Get().c_str()); + json_writer_->Get().c_str()); } #endif - delete json_writter_; + delete json_writer_; } } diff --git a/util/event_logger.h b/util/event_logger.h index 806b4e501..998950d50 100644 --- a/util/event_logger.h +++ b/util/event_logger.h @@ -15,11 +15,11 @@ namespace rocksdb { -// JSONWritter doesn't support objects in arrays yet. There wasn't a need for +// JSONWriter doesn't support objects in arrays yet. There wasn't a need for // that. -class JSONWritter { +class JSONWriter { public: - JSONWritter() : state_(kExpectKey), first_element_(true) { stream_ << "{"; } + JSONWriter() : state_(kExpectKey), first_element_(true) { stream_ << "{"; } void AddKey(const std::string& key) { assert(state_ == kExpectKey); @@ -85,7 +85,7 @@ class JSONWritter { std::string Get() const { return stream_.str(); } - JSONWritter& operator<<(const char* val) { + JSONWriter& operator<<(const char* val) { if (state_ == kExpectKey) { AddKey(val); } else { @@ -94,24 +94,24 @@ class JSONWritter { return *this; } - JSONWritter& operator<<(const std::string& val) { + JSONWriter& operator<<(const std::string& val) { return *this << val.c_str(); } template - JSONWritter& operator<<(const T& val) { + JSONWriter& operator<<(const T& val) { assert(state_ != kExpectKey); AddValue(val); return *this; } private: - enum JSONWritterState { + enum JSONWriterState { kExpectKey, kExpectValue, kInArray, }; - JSONWritterState state_; + JSONWriterState state_; bool first_element_; std::ostringstream stream_; }; @@ -121,21 +121,21 @@ class EventLoggerStream { template EventLoggerStream& operator<<(const T& val) { MakeStream(); - *json_writter_ << val; + *json_writer_ << val; return *this; } - void StartArray() { json_writter_->StartArray(); } - void EndArray() { json_writter_->EndArray(); } - void StartObject() { json_writter_->StartObject(); } - void EndObject() { json_writter_->EndObject(); } + void StartArray() { json_writer_->StartArray(); } + void EndArray() { json_writer_->EndArray(); } + void StartObject() { json_writer_->StartObject(); } + void EndObject() { json_writer_->EndObject(); } ~EventLoggerStream(); private: void MakeStream() { - if (!json_writter_) { - json_writter_ = new JSONWritter(); + if (!json_writer_) { + json_writer_ = new JSONWriter(); *this << "time_micros" << std::chrono::duration_cast( std::chrono::system_clock::now().time_since_epoch()).count(); @@ -148,7 +148,7 @@ class EventLoggerStream { Logger* const logger_; LogBuffer* const log_buffer_; // ownership - JSONWritter* json_writter_; + JSONWriter* json_writer_; }; // here is an example of the output that will show up in the LOG: