From f0161c37b08663eff4ae08bb24311e18c4b581a6 Mon Sep 17 00:00:00 2001 From: Alexander Fenster Date: Thu, 10 Mar 2016 13:34:42 -0800 Subject: [PATCH] formatting fix --- tools/ldb_cmd.cc | 47 +++++++++++++++++++++++++---------------------- tools/ldb_cmd.h | 2 +- 2 files changed, 26 insertions(+), 23 deletions(-) diff --git a/tools/ldb_cmd.cc b/tools/ldb_cmd.cc index bec67a377..2b377e032 100644 --- a/tools/ldb_cmd.cc +++ b/tools/ldb_cmd.cc @@ -1742,15 +1742,17 @@ Options BatchPutCommand::PrepareOptionsForOpenDB() { // ---------------------------------------------------------------------------- ScanCommand::ScanCommand(const vector& params, - const map& options, const vector& flags) : - LDBCommand(options, flags, true, - BuildCmdLineOptions({ARG_TTL, ARG_NO_VALUE, ARG_HEX, ARG_KEY_HEX, ARG_TO, - ARG_VALUE_HEX, ARG_FROM, ARG_TIMESTAMP, - ARG_MAX_KEYS, ARG_TTL_START, ARG_TTL_END})), - start_key_specified_(false), - end_key_specified_(false), - max_keys_scanned_(-1), - no_value_(false) { + const map& options, + const vector& flags) + : LDBCommand(options, flags, true, + BuildCmdLineOptions( + {ARG_TTL, ARG_NO_VALUE, ARG_HEX, ARG_KEY_HEX, + ARG_TO, ARG_VALUE_HEX, ARG_FROM, ARG_TIMESTAMP, + ARG_MAX_KEYS, ARG_TTL_START, ARG_TTL_END})), + start_key_specified_(false), + end_key_specified_(false), + max_keys_scanned_(-1), + no_value_(false) { map::const_iterator itr = options.find(ARG_FROM); if (itr != options.end()) { @@ -1769,7 +1771,8 @@ ScanCommand::ScanCommand(const vector& params, end_key_specified_ = true; } - vector::const_iterator vitr = std::find(flags.begin(), flags.end(), ARG_NO_VALUE); + vector::const_iterator vitr = + std::find(flags.begin(), flags.end(), ARG_NO_VALUE); if (vitr != flags.end()) { no_value_ = true; } @@ -1858,20 +1861,20 @@ void ScanCommand::DoCommand() { } if (no_value_) { - fprintf(stdout, "%.*s\n", - static_cast(key_slice.size()), key_slice.data()); + fprintf(stdout, "%.*s\n", static_cast(key_slice.size()), + key_slice.data()); } else { - Slice val_slice = it->value(); - std::string formatted_value; - if (is_value_hex_) { - formatted_value = "0x" + val_slice.ToString(true /* hex */); - val_slice = formatted_value; - } - fprintf(stdout, "%.*s : %.*s\n", - static_cast(key_slice.size()), key_slice.data(), - static_cast(val_slice.size()), val_slice.data()); + Slice val_slice = it->value(); + std::string formatted_value; + if (is_value_hex_) { + formatted_value = "0x" + val_slice.ToString(true /* hex */); + val_slice = formatted_value; + } + fprintf(stdout, "%.*s : %.*s\n", static_cast(key_slice.size()), + key_slice.data(), static_cast(val_slice.size()), + val_slice.data()); } - + num_keys_scanned++; if (max_keys_scanned_ >= 0 && num_keys_scanned >= max_keys_scanned_) { break; diff --git a/tools/ldb_cmd.h b/tools/ldb_cmd.h index 2c1c5e4b1..b21be4a3d 100644 --- a/tools/ldb_cmd.h +++ b/tools/ldb_cmd.h @@ -378,7 +378,7 @@ private: */ bool StringToBool(string val) { std::transform(val.begin(), val.end(), val.begin(), - [](char ch) -> char { return (char)::tolower(ch); }); + [](char ch)->char { return (char)::tolower(ch); }); if (val == "true") { return true;