From 45a612f990718634ae8f89500b53cb2c2c9ddc27 Mon Sep 17 00:00:00 2001 From: Igor Canadi Date: Fri, 31 Oct 2014 19:22:42 -0700 Subject: [PATCH] Revert "Fix incorrect fixing of lint errors in ldb_cmd.cc" This reverts commit 8ddddd62d0bf7ac74cf64a024452587a007b6096. --- util/ldb_cmd.cc | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/util/ldb_cmd.cc b/util/ldb_cmd.cc index 1dfdd732d..c03c1b31a 100644 --- a/util/ldb_cmd.cc +++ b/util/ldb_cmd.cc @@ -510,7 +510,7 @@ void ManifestDumpCommand::Help(std::string* ret) { ret->append(" "); ret->append(ManifestDumpCommand::Name()); ret->append(" [--" + ARG_VERBOSE + "]"); - ret->append(" [--" + ARG_PATH + "=]"); + ret->append(" [--" + ARG_PATH + " = ]"); ret->append("\n"); } @@ -737,9 +737,9 @@ void InternalDumpCommand::Help(std::string* ret) { ret->append(InternalDumpCommand::Name()); ret->append(HelpRangeCmdArgs()); ret->append(" [--" + ARG_INPUT_KEY_HEX + "]"); - ret->append(" [--" + ARG_MAX_KEYS + "=]"); + ret->append(" [--" + ARG_MAX_KEYS + " = ]"); ret->append(" [--" + ARG_COUNT_ONLY + "]"); - ret->append(" [--" + ARG_COUNT_DELIM + "=]"); + ret->append(" [--" + ARG_COUNT_DELIM + " = ]"); ret->append(" [--" + ARG_STATS + "]"); ret->append("\n"); } @@ -922,14 +922,14 @@ void DBDumperCommand::Help(std::string* ret) { ret->append(DBDumperCommand::Name()); ret->append(HelpRangeCmdArgs()); ret->append(" [--" + ARG_TTL + "]"); - ret->append(" [--" + ARG_MAX_KEYS + "=]"); + ret->append(" [--" + ARG_MAX_KEYS + " = ]"); ret->append(" [--" + ARG_TIMESTAMP + "]"); ret->append(" [--" + ARG_COUNT_ONLY + "]"); - ret->append(" [--" + ARG_COUNT_DELIM + "=]"); + ret->append(" [--" + ARG_COUNT_DELIM + " = ]"); ret->append(" [--" + ARG_STATS + "]"); - ret->append(" [--" + ARG_TTL_BUCKET + "=]"); - ret->append(" [--" + ARG_TTL_START + "=:- is inclusive]"); - ret->append(" [--" + ARG_TTL_END + "=:- is exclusive]"); + ret->append(" [--" + ARG_TTL_BUCKET + " = ]"); + ret->append(" [--" + ARG_TTL_START + " = :- is inclusive]"); + ret->append(" [--" + ARG_TTL_END + " = :- is exclusive]"); ret->append("\n"); } @@ -1096,8 +1096,8 @@ std::vector ReduceDBLevelsCommand::PrepareArgs( int new_levels, bool print_old_level) { std::vector ret; ret.push_back("reduce_levels"); - ret.push_back("--" + ARG_DB + "=" + db_path); - ret.push_back("--" + ARG_NEW_LEVELS + "=" + std::to_string(new_levels)); + ret.push_back("--" + ARG_DB + " = " + db_path); + ret.push_back("--" + ARG_NEW_LEVELS + " = " + std::to_string(new_levels)); if (print_old_level) { ret.push_back("--" + ARG_PRINT_OLD_LEVELS); } @@ -1107,7 +1107,7 @@ std::vector ReduceDBLevelsCommand::PrepareArgs( void ReduceDBLevelsCommand::Help(std::string* ret) { ret->append(" "); ret->append(ReduceDBLevelsCommand::Name()); - ret->append(" --" + ARG_NEW_LEVELS + "="); + ret->append(" --" + ARG_NEW_LEVELS + " = "); ret->append(" [--" + ARG_PRINT_OLD_LEVELS + "]"); ret->append("\n"); } @@ -1255,10 +1255,10 @@ void ChangeCompactionStyleCommand::Help(std::string* ret) { ret->append(" "); ret->append(ChangeCompactionStyleCommand::Name()); ret->append( - " --" + ARG_OLD_COMPACTION_STYLE + "="); ret->append( - " --" + ARG_NEW_COMPACTION_STYLE + "="); ret->append("\n"); } @@ -1408,7 +1408,7 @@ WALDumperCommand::WALDumperCommand( void WALDumperCommand::Help(std::string* ret) { ret->append(" "); ret->append(WALDumperCommand::Name()); - ret->append(" --" + ARG_WAL_FILE + "="); + ret->append(" --" + ARG_WAL_FILE + " = "); ret->append(" [--" + ARG_PRINT_HEADER + "] "); ret->append(" [--" + ARG_PRINT_VALUE + "] "); ret->append("\n"); @@ -1660,9 +1660,9 @@ void ScanCommand::Help(std::string* ret) { ret->append(HelpRangeCmdArgs()); ret->append(" [--" + ARG_TTL + "]"); ret->append(" [--" + ARG_TIMESTAMP + "]"); - ret->append(" [--" + ARG_MAX_KEYS + "=q] "); - ret->append(" [--" + ARG_TTL_START + "=:- is inclusive]"); - ret->append(" [--" + ARG_TTL_END + "=:- is exclusive]"); + ret->append(" [--" + ARG_MAX_KEYS + " = q] "); + ret->append(" [--" + ARG_TTL_START + " = :- is inclusive]"); + ret->append(" [--" + ARG_TTL_END + " = :- is exclusive]"); ret->append("\n"); }