Fix mctiming's --json=pretty flag

Currently mctiming's doesn't respect the pretty arg to --json and
instead produces json in pretty format at all times. To fix this only
dump() json with indentation when the pretty flag has be set. Also
ensure we don't print the histogram legend when the pretty is set.

Change-Id: Ib1b8f47c57a00ac0babb7c624b7291a06c35144d
Reviewed-on: http://review.couchbase.org/c/kv_engine/+/151170
Tested-by: Build Bot <[email protected]>
Reviewed-by: Dave Rigby <[email protected]>

Author: rdemellow

programs/mctimings/mctimings.cc

@@ -29,6 +29,7 @@
 #include <stdexcept>
 #include <string>
 
+#define JSON_DUMP_NO_INDENT -1
 #define JSON_DUMP_INDENT_SIZE 4
 
 const static std::string_view histogramInfo = R"(Histogram Legend:
@@ -511,7 +512,7 @@ int main(int argc, char** argv) {
             connection.selectBucket(bucket);
         }
 
-        if (verbose) {
+        if (verbose && !json) {
             fmt::print(stdout, histogramInfo);
         }
 
@@ -547,7 +548,10 @@ int main(int argc, char** argv) {
             }
         }
         if (jsonOutput.has_value()) {
-            fmt::print(stdout, "{}\n", jsonOutput->dump(JSON_DUMP_INDENT_SIZE));
+            fmt::print(stdout,
+                       "{}\n",
+                       jsonOutput->dump(verbose ? JSON_DUMP_INDENT_SIZE
+                                                : JSON_DUMP_NO_INDENT));
         }
     } catch (const ConnectionError& ex) {
         fmt::print(stderr, "{}\n", ex.what());