formatting fix

main
Alexander Fenster 9 years ago
parent e16438bb86
commit f0161c37b0
  1. 47
      tools/ldb_cmd.cc
  2. 2
      tools/ldb_cmd.h

@ -1742,15 +1742,17 @@ Options BatchPutCommand::PrepareOptionsForOpenDB() {
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
ScanCommand::ScanCommand(const vector<string>& params, ScanCommand::ScanCommand(const vector<string>& params,
const map<string, string>& options, const vector<string>& flags) : const map<string, string>& options,
LDBCommand(options, flags, true, const vector<string>& flags)
BuildCmdLineOptions({ARG_TTL, ARG_NO_VALUE, ARG_HEX, ARG_KEY_HEX, ARG_TO, : LDBCommand(options, flags, true,
ARG_VALUE_HEX, ARG_FROM, ARG_TIMESTAMP, BuildCmdLineOptions(
ARG_MAX_KEYS, ARG_TTL_START, ARG_TTL_END})), {ARG_TTL, ARG_NO_VALUE, ARG_HEX, ARG_KEY_HEX,
start_key_specified_(false), ARG_TO, ARG_VALUE_HEX, ARG_FROM, ARG_TIMESTAMP,
end_key_specified_(false), ARG_MAX_KEYS, ARG_TTL_START, ARG_TTL_END})),
max_keys_scanned_(-1), start_key_specified_(false),
no_value_(false) { end_key_specified_(false),
max_keys_scanned_(-1),
no_value_(false) {
map<string, string>::const_iterator itr = options.find(ARG_FROM); map<string, string>::const_iterator itr = options.find(ARG_FROM);
if (itr != options.end()) { if (itr != options.end()) {
@ -1769,7 +1771,8 @@ ScanCommand::ScanCommand(const vector<string>& params,
end_key_specified_ = true; end_key_specified_ = true;
} }
vector<string>::const_iterator vitr = std::find(flags.begin(), flags.end(), ARG_NO_VALUE); vector<string>::const_iterator vitr =
std::find(flags.begin(), flags.end(), ARG_NO_VALUE);
if (vitr != flags.end()) { if (vitr != flags.end()) {
no_value_ = true; no_value_ = true;
} }
@ -1858,20 +1861,20 @@ void ScanCommand::DoCommand() {
} }
if (no_value_) { if (no_value_) {
fprintf(stdout, "%.*s\n", fprintf(stdout, "%.*s\n", static_cast<int>(key_slice.size()),
static_cast<int>(key_slice.size()), key_slice.data()); key_slice.data());
} else { } else {
Slice val_slice = it->value(); Slice val_slice = it->value();
std::string formatted_value; std::string formatted_value;
if (is_value_hex_) { if (is_value_hex_) {
formatted_value = "0x" + val_slice.ToString(true /* hex */); formatted_value = "0x" + val_slice.ToString(true /* hex */);
val_slice = formatted_value; val_slice = formatted_value;
} }
fprintf(stdout, "%.*s : %.*s\n", fprintf(stdout, "%.*s : %.*s\n", static_cast<int>(key_slice.size()),
static_cast<int>(key_slice.size()), key_slice.data(), key_slice.data(), static_cast<int>(val_slice.size()),
static_cast<int>(val_slice.size()), val_slice.data()); val_slice.data());
} }
num_keys_scanned++; num_keys_scanned++;
if (max_keys_scanned_ >= 0 && num_keys_scanned >= max_keys_scanned_) { if (max_keys_scanned_ >= 0 && num_keys_scanned >= max_keys_scanned_) {
break; break;

@ -378,7 +378,7 @@ private:
*/ */
bool StringToBool(string val) { bool StringToBool(string val) {
std::transform(val.begin(), val.end(), val.begin(), 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") { if (val == "true") {
return true; return true;

Loading…
Cancel
Save