cloud-fan commented on code in PR #49271:
URL: https://github.com/apache/spark/pull/49271#discussion_r1895771234
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/resolver/PlanLogger.scala:
##########
@@ -27,32 +28,64 @@ import org.apache.spark.sql.internal.SQLConf
* [[PlanLogger]] is used by the [[Resolver]] to log intermediate resolution
results.
*/
class PlanLogger extends Logging {
- private val logLevel = SQLConf.get.planChangeLogLevel
+ private val planChangeLogLevel = SQLConf.get.planChangeLogLevel
+ private val expressionTreeChangeLogLevel =
SQLConf.get.expressionTreeChangeLogLevel
- /**
- * Logs the transition from the `unresolvedPlan` to the `resolvedPlan`.
- */
- def log(unresolvedPlan: LogicalPlan, resolvedPlan: LogicalPlan): Unit = {
- logBasedOnLevel(() => createMessage(unresolvedPlan, resolvedPlan))
+ def logPlanResolutionEvent(plan: LogicalPlan, event: String): Unit = {
+ log(() => log"""
+ |=== Plan resolution: ${MDC(MESSAGE, event)} ===
+ |${MDC(QUERY_PLAN, plan.treeString)}
+ """.stripMargin, planChangeLogLevel)
}
- private def createMessage(
- unresolvedPlan: LogicalPlan,
- resolvedPlan: LogicalPlan): MessageWithContext =
- log"""
- |=== Unresolved/resolved operator subtree ===
+ def logPlanResolution(unresolvedPlan: LogicalPlan, resolvedPlan:
LogicalPlan): Unit = {
+ log(
+ () =>
+ log"""
+ |=== Unresolved plan -> Resolved plan ===
|${MDC(
- QUERY_PLAN,
- sideBySide(unresolvedPlan.treeString,
resolvedPlan.treeString).mkString("\n")
- )}
- """.stripMargin
-
- private def logBasedOnLevel(createMessage: () => MessageWithContext): Unit =
logLevel match {
- case "TRACE" => logTrace(createMessage().message)
- case "DEBUG" => logDebug(createMessage().message)
- case "INFO" => logInfo(createMessage())
- case "WARN" => logWarning(createMessage())
- case "ERROR" => logError(createMessage())
- case _ => logTrace(createMessage().message)
+ QUERY_PLAN,
+ sideBySide(unresolvedPlan.treeString,
resolvedPlan.treeString).mkString("\n")
+ )}
+ """.stripMargin,
+ planChangeLogLevel
+ )
}
+
+ def logExpressionTreeResolutionEvent(expressionTree: Expression, event:
String): Unit = {
+ log(
+ () => log"""
+ |=== Expression tree resolution: ${MDC(MESSAGE, event)} ===
+ |${MDC(QUERY_PLAN, expressionTree.treeString)}
+ """.stripMargin,
+ expressionTreeChangeLogLevel
+ )
+ }
+
+ def logExpressionTreeResolution(
+ unresolvedExpressionTree: Expression,
Review Comment:
so we log the unresolved expression twice? Once with
`logExpressionTreeResolutionEvent` and once with `logExpressionTreeResolution`.
In the fixed-point analyzer, we only log effective plan changes, shall we do
the same?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
