[CH] Format log output for CH backend (facebookincubator#1746)

What changes were proposed in this pull request? How was this patch tested? manual tests
marin-ma · Jun 1, 2023 · c5fe982 · c5fe982
1 parent 40bebcc
commit c5fe982
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/cpp-ch/local-engine/Common/Logger.cpp b/cpp-ch/local-engine/Common/Logger.cpp
@@ -4,17 +4,28 @@
 #include <Poco/AsyncChannel.h>
 #include <Poco/AutoPtr.h>
 #include <Poco/ConsoleChannel.h>
+#include <Poco/PatternFormatter.h>
+#include <Poco/FormattingChannel.h>
 #include <Poco/SimpleFileChannel.h>
 
 
 using Poco::AsyncChannel;
 using Poco::AutoPtr;
 using Poco::ConsoleChannel;
+using Poco::PatternFormatter;
+using Poco::FormattingChannel;
 
 void local_engine::Logger::initConsoleLogger(const std::string & level)
 {
     AutoPtr<ConsoleChannel> chan(new ConsoleChannel);
-    AutoPtr<AsyncChannel> async_chann(new AsyncChannel(chan));
+
+    AutoPtr<PatternFormatter> formatter(new PatternFormatter);
+    formatter->setProperty("pattern", "%Y-%m-%d %H:%M:%S.%i <%p> %s: %t");
+    formatter->setProperty("times", "local");
+
+    AutoPtr<FormattingChannel> format_channel(new FormattingChannel(formatter, chan));
+    AutoPtr<AsyncChannel> async_chann(new AsyncChannel(format_channel));
+
     Poco::Logger::root().setChannel(async_chann);
     Poco::Logger::root().setLevel(level);
 }

diff --git a/cpp-ch/local-engine/Parser/SerializedPlanParser.cpp b/cpp-ch/local-engine/Parser/SerializedPlanParser.cpp
@@ -639,7 +639,7 @@ QueryPlanPtr SerializedPlanParser::parse(std::unique_ptr<substrait::Plan> plan)
         pb_util::JsonOptions options;
         std::string json;
         pb_util::MessageToJsonString(*plan, &json, options);
-        LOG_DEBUG(&Poco::Logger::get("SerializedPlanParser"), "substrait plan:{}", json);
+        LOG_DEBUG(&Poco::Logger::get("SerializedPlanParser"), "substrait plan:\n{}", json);
     }
     parseExtensions(plan->extensions());
     if (plan->relations_size() == 1)
@@ -2009,7 +2009,7 @@ QueryPlanPtr SerializedPlanParser::parse(const std::string & plan)
     if (logger->debug())
     {
         auto out = PlanUtil::explainPlan(*res);
-        LOG_DEBUG(logger, "clickhouse plan:{}", out);
+        LOG_DEBUG(logger, "clickhouse plan:\n{}", out);
     }
     return std::move(res);
 }
@@ -2348,7 +2348,7 @@ ActionsDAGPtr ASTParser::convertToActions(const NamesAndTypesList & name_and_typ
 
 ASTPtr ASTParser::parseToAST(const Names & names, const substrait::Expression & rel)
 {
-    LOG_DEBUG(&Poco::Logger::get("ASTParser"), "substrait plan:{}", rel.DebugString());
+    LOG_DEBUG(&Poco::Logger::get("ASTParser"), "substrait plan:\n{}", rel.DebugString());
     if (!rel.has_scalar_function())
         throw Exception(ErrorCodes::BAD_ARGUMENTS, "the root of expression should be a scalar function:\n {}", rel.DebugString());
 
@@ -2579,7 +2579,7 @@ void LocalExecutor::execute(QueryPlanPtr query_plan)
                 .compile_expressions = CompileExpressions::yes},
                 .process_list_element = query_status});
     query_pipeline = QueryPipelineBuilder::getPipeline(std::move(*pipeline_builder));
-    LOG_DEBUG(&Poco::Logger::get("LocalExecutor"), "clickhouse pipeline:{}", QueryPipelineUtil::explainPipeline(query_pipeline));
+    LOG_DEBUG(&Poco::Logger::get("LocalExecutor"), "clickhouse pipeline:\n{}", QueryPipelineUtil::explainPipeline(query_pipeline));
     auto t_pipeline = stopwatch.elapsedMicroseconds();
     executor = std::make_unique<PullingPipelineExecutor>(query_pipeline);
     auto t_executor = stopwatch.elapsedMicroseconds() - t_pipeline;