From a94e8c78d76ad0201792b12c7a19b8ab5a6b142d Mon Sep 17 00:00:00 2001 From: Liang-Chi Hsieh Date: Thu, 5 Mar 2015 16:19:15 +0800 Subject: [PATCH] Relocate logDebug to correct location. --- .../apache/spark/sql/catalyst/analysis/Analyzer.scala | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala index e4e542562f22..96bf55917acd 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Analyzer.scala @@ -325,12 +325,13 @@ class Analyzer(catalog: Catalog, val missingInProject = requiredAttributes -- p.output if (missingInProject.nonEmpty) { + logDebug(s"Failed to find $missingInProject in ${p.output.mkString(", ")}") + logDebug(s"Adding $missingInProject to $p") // Add missing attributes and then project them away after the sort. - Project(projectList.map(_.toAttribute), + Project(p.output, Sort(ordering, global, Project(projectList ++ missingInProject, child))) } else { - logDebug(s"Failed to find $missingInProject in ${p.output.mkString(", ")}") s // Nothing we can do here. Return original plan. } case s @ Sort(ordering, global, a @ Aggregate(grouping, aggs, child)) @@ -345,8 +346,10 @@ class Analyzer(catalog: Catalog, logDebug(s"Grouping expressions: $groupingRelation") val resolved = unresolved.flatMap(groupingRelation.resolve(_, resolver)) val missingInAggs = resolved.filterNot(a.outputSet.contains) - logDebug(s"Resolved: $resolved Missing in aggs: $missingInAggs") + logDebug(s"Resolved: $resolved") if (missingInAggs.nonEmpty) { + logDebug(s"Missing in aggs: $missingInAggs") + logDebug(s"Adding $missingInAggs to $a") // Add missing grouping exprs and then project them away after the sort. Project(a.output, Sort(ordering, global, Aggregate(grouping, aggs ++ missingInAggs, child)))