Skip to content

[SPARK-59456][SQL] Fix: RuleExecutor.PlanChangeLogger does work even when it doesn't log #58755

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bhollis-dbx wants to merge 1 commit into
base: master
Choose a base branch
from
+20 −17
Open

[SPARK-59456][SQL] Fix: RuleExecutor.PlanChangeLogger does work even when it doesn't log #58755

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions common/utils/src/main/scala/org/apache/spark/internal/Logging.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,10 @@ trait Logging {
log.isTraceEnabled
}

protected def withLogLevel(level: Slf4jLevel)(f: => Unit): Unit = {
if (log.isEnabledForLevel(level)) f
}

protected def logBasedOnLevel(level: Slf4jLevel)(f: => MessageWithContext): Unit = {
level match {
case Slf4jLevel.TRACE => logTrace(f.message)
Expand Down
33 changes: 16 additions & 17 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/rules/RuleExecutor.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,25 +55,24 @@ class PlanChangeLogger[TreeType <: TreeNode[_]] extends Logging {
private val logBatches = SQLConf.get.planChangeBatches.map(Utils.stringToSeq)

def logRule(ruleName: String, oldPlan: TreeType, newPlan: TreeType): Unit = {
if (!newPlan.fastEquals(oldPlan)) {
if (logRules.isEmpty || logRules.get.contains(ruleName)) {
def message(): MessageWithContext = {
val oldPlanStringWithOutput = oldPlan.treeString(verbose = false,
printOutputColumns = true)
val newPlanStringWithOutput = newPlan.treeString(verbose = false,
printOutputColumns = true)
// scalastyle:off line.size.limit
withLogLevel(logLevel) {
if ((logRules.isEmpty || logRules.get.contains(ruleName)) &&
!newPlan.fastEquals(oldPlan)) {
val oldPlanStringWithOutput = oldPlan.treeString(verbose = false,
printOutputColumns = true)
val newPlanStringWithOutput = newPlan.treeString(verbose = false,
printOutputColumns = true)
// scalastyle:off line.size.limit
logBasedOnLevel(logLevel) {
log"""
|=== Applying Rule ${MDC(RULE_NAME, ruleName)} ===
|${MDC(QUERY_PLAN, sideBySide(oldPlan.treeString, newPlan.treeString).mkString("\n"))}
|
|Output Information:
|${MDC(QUERY_PLAN, sideBySide(oldPlanStringWithOutput, newPlanStringWithOutput).mkString("\n"))}
""".stripMargin
// scalastyle:on line.size.limit
|=== Applying Rule ${MDC(RULE_NAME, ruleName)} ===
|${MDC(QUERY_PLAN, sideBySide(oldPlan.treeString, newPlan.treeString).mkString("\n"))}
|
|Output Information:
|${MDC(QUERY_PLAN, sideBySide(oldPlanStringWithOutput, newPlanStringWithOutput).mkString("\n"))}
""".stripMargin
}

logBasedOnLevel(logLevel)(message())
// scalastyle:on line.size.limit
}
}
}
Expand Down