[GLUTEN-7795][CH] Remove duplicate log object (#7839)

apache · Nov 7, 2024 · c653337 · c653337
1 parent 27ab77c
commit c653337
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 16 deletions.
diff --git a/cpp-ch/local-engine/Common/DebugUtils.cpp b/cpp-ch/local-engine/Common/DebugUtils.cpp
@@ -30,6 +30,7 @@
 #include <google/protobuf/util/json_util.h>
 #include <google/protobuf/wrappers.pb.h>
 #include <Common/CHUtil.h>
+#include <Common/QueryContext.h>
 #include <Common/logger_useful.h>
 
 namespace pb_util = google::protobuf::util;
@@ -51,9 +52,9 @@ void dumpPlan(DB::QueryPlan & plan, bool force, LoggerPtr logger)
 
     auto out = local_engine::PlanUtil::explainPlan(plan);
     if (force) // force
-        LOG_ERROR(logger, "clickhouse plan:\n{}", out);
+        LOG_ERROR(logger, "clickhouse plan({}):\n{}", local_engine::QueryContext::instance().currentTaskIdOrEmpty(), out);
     else
-        LOG_DEBUG(logger, "clickhouse plan:\n{}", out);
+        LOG_DEBUG(logger, "clickhouse plan({}):\n{}", local_engine::QueryContext::instance().currentTaskIdOrEmpty(), out);
 }
 
 void dumpMessage(const google::protobuf::Message & message, const char * type, bool force, LoggerPtr logger)
@@ -73,9 +74,9 @@ void dumpMessage(const google::protobuf::Message & message, const char * type, b
         throw DB::Exception(DB::ErrorCodes::LOGICAL_ERROR, "Can not convert {} to Json", type);
 
     if (force) // force
-        LOG_ERROR(logger, "{}:\n{}", type, json);
+        LOG_ERROR(logger, "{}({}):\n{}", type, local_engine::QueryContext::instance().currentTaskIdOrEmpty(), json);
     else
-        LOG_DEBUG(logger, "{}:\n{}", type, json);
+        LOG_DEBUG(logger, "{}({}):\n{}", type, local_engine::QueryContext::instance().currentTaskIdOrEmpty(), json);
 }
 
 void headBlock(const DB::Block & block, size_t count)

diff --git a/cpp-ch/local-engine/Parser/SerializedPlanParser.cpp b/cpp-ch/local-engine/Parser/SerializedPlanParser.cpp
@@ -62,7 +62,6 @@
 #include <Common/Exception.h>
 #include <Common/GlutenConfig.h>
 #include <Common/JNIUtils.h>
-#include <Common/QueryContext.h>
 #include <Common/logger_useful.h>
 #include <Common/typeid_cast.h>
 
@@ -111,8 +110,8 @@ void SerializedPlanParser::adjustOutput(const DB::QueryPlanPtr & query_plan, con
         const auto cols = query_plan->getCurrentHeader().getNamesAndTypesList();
         if (cols.getNames().size() != static_cast<size_t>(root_rel.root().names_size()))
         {
-            debug::dumpPlan(*query_plan, true, log);
-            debug::dumpMessage(root_rel, "substrait::PlanRel", true, log);
+            debug::dumpPlan(*query_plan, true);
+            debug::dumpMessage(root_rel, "substrait::PlanRel", true);
             throw Exception(
                 ErrorCodes::LOGICAL_ERROR,
                 "Missmatch result columns size. plan column size {}, subtrait plan name size {}.",
@@ -135,8 +134,8 @@ void SerializedPlanParser::adjustOutput(const DB::QueryPlanPtr & query_plan, con
         const auto & original_cols = original_header.getColumnsWithTypeAndName();
         if (static_cast<size_t>(output_schema.types_size()) != original_cols.size())
         {
-            debug::dumpPlan(*query_plan, true, log);
-            debug::dumpMessage(root_rel, "substrait::PlanRel", true, log);
+            debug::dumpPlan(*query_plan, true);
+            debug::dumpMessage(root_rel, "substrait::PlanRel", true);
             throw Exception(
                 ErrorCodes::LOGICAL_ERROR,
                 "Missmatch result columns size. plan column size {}, subtrait plan output schema size {}, subtrait plan name size {}.",
@@ -184,7 +183,7 @@ void SerializedPlanParser::adjustOutput(const DB::QueryPlanPtr & query_plan, con
 
 QueryPlanPtr SerializedPlanParser::parse(const substrait::Plan & plan)
 {
-    debug::dumpMessage(plan, "substrait::Plan", false, log);
+    debug::dumpMessage(plan, "substrait::Plan");
     //parseExtensions(plan.extensions());
     if (plan.relations_size() != 1)
         throw Exception(ErrorCodes::BAD_ARGUMENTS, "too many relations found");
@@ -205,7 +204,7 @@ QueryPlanPtr SerializedPlanParser::parse(const substrait::Plan & plan)
     PlanUtil::checkOuputType(*query_plan);
 #endif
 
-    debug::dumpPlan(*query_plan, false, log);
+    debug::dumpPlan(*query_plan);
     return query_plan;
 }
 
@@ -324,7 +323,7 @@ std::unique_ptr<LocalExecutor> SerializedPlanParser::createExecutor(DB::QueryPla
     }
     catch (...)
     {
-        LOG_ERROR(log, "Invalid plan:\n{}", PlanUtil::explainPlan(*query_plan));
+        LOG_ERROR(getLogger("SerializedPlanParser"), "Invalid plan:\n{}", PlanUtil::explainPlan(*query_plan));
         throw;
     }
 
@@ -333,9 +332,9 @@ std::unique_ptr<LocalExecutor> SerializedPlanParser::createExecutor(DB::QueryPla
     assert(root_rel.has_root());
     if (root_rel.root().input().has_write())
         addSinkTransform(parser_context->queryContext(), root_rel.root().input().write(), builder);
-    LOG_INFO(log, "build pipeline {} ms", stopwatch.elapsedMicroseconds() / 1000.0);
+    LOG_INFO(getLogger("SerializedPlanParser"), "build pipeline {} ms", stopwatch.elapsedMicroseconds() / 1000.0);
     LOG_DEBUG(
-        log,
+        getLogger("SerializedPlanParser"),
         "clickhouse plan [optimization={}]:\n{}",
         settings[Setting::query_plan_enable_optimizations],
         PlanUtil::explainPlan(*query_plan));
@@ -347,7 +346,6 @@ std::unique_ptr<LocalExecutor> SerializedPlanParser::createExecutor(DB::QueryPla
 SerializedPlanParser::SerializedPlanParser(ParserContextPtr parser_context_) : parser_context(parser_context_)
 {
     context = parser_context->queryContext();
-    log = getLogger("SerializedPlanParser(" + QueryContext::instance().currentTaskIdOrEmpty() + ")");
 }
 
 NonNullableColumnsResolver::NonNullableColumnsResolver(

diff --git a/cpp-ch/local-engine/Parser/SerializedPlanParser.h b/cpp-ch/local-engine/Parser/SerializedPlanParser.h
@@ -120,7 +120,6 @@ class SerializedPlanParser
     DB::QueryPlanPtr parseOp(const substrait::Rel & rel, std::list<const substrait::Rel *> & rel_stack);
     void adjustOutput(const DB::QueryPlanPtr & query_plan, const substrait::PlanRel & root_rel) const;
 
-    LoggerPtr log;
     std::vector<jobject> input_iters;
     std::vector<std::string> split_infos;
     int split_info_index = 0;