Repository: spark Updated Branches: refs/heads/master 64fbd1cef -> f21f6ce99
[SPARK-22103][FOLLOWUP] Rename addExtraCode to addInnerClass ## What changes were proposed in this pull request? Address PR comments that appeared post-merge, to rename `addExtraCode` to `addInnerClass`, and not count the size of the inner class to the size of the outer class. ## How was this patch tested? YOLO. Author: Juliusz Sompolski <ju...@databricks.com> Closes #19353 from juliuszsompolski/SPARK-22103followup. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/f21f6ce9 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/f21f6ce9 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/f21f6ce9 Branch: refs/heads/master Commit: f21f6ce9982db38f549119616d544b427b7b1e1f Parents: 64fbd1c Author: Juliusz Sompolski <ju...@databricks.com> Authored: Tue Sep 26 10:04:34 2017 -0700 Committer: gatorsmile <gatorsm...@gmail.com> Committed: Tue Sep 26 10:04:34 2017 -0700 ---------------------------------------------------------------------- .../catalyst/expressions/codegen/CodeGenerator.scala | 13 ++++++------- .../sql/execution/aggregate/HashAggregateExec.scala | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/f21f6ce9/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/codegen/CodeGenerator.scala ---------------------------------------------------------------------- diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/codegen/CodeGenerator.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/codegen/CodeGenerator.scala index f10d368..f3b4579 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/codegen/CodeGenerator.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/codegen/CodeGenerator.scala @@ -243,7 +243,7 @@ class CodegenContext { mutable.Map(outerClassName -> mutable.Map.empty[String, String]) // Verbatim extra code to be added to the OuterClass. - private val extraCode: mutable.ListBuffer[String] = mutable.ListBuffer[String]() + private val extraClasses: mutable.ListBuffer[String] = mutable.ListBuffer[String]() // Returns the size of the most recently added class. private def currClassSize(): Int = classSize(classes.head._1) @@ -332,19 +332,18 @@ class CodegenContext { } /** - * Emits any source code added with addExtraCode + * Emits extra inner classes added with addExtraCode */ def emitExtraCode(): String = { - extraCode.mkString("\n") + extraClasses.mkString("\n") } /** * Add extra source code to the outermost generated class. - * @param code verbatim source code to be added. + * @param code verbatim source code of the inner class to be added. */ - def addExtraCode(code: String): Unit = { - extraCode.append(code) - classSize(outerClassName) += code.length + def addInnerClass(code: String): Unit = { + extraClasses.append(code) } final val JAVA_BOOLEAN = "boolean" http://git-wip-us.apache.org/repos/asf/spark/blob/f21f6ce9/sql/core/src/main/scala/org/apache/spark/sql/execution/aggregate/HashAggregateExec.scala ---------------------------------------------------------------------- diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/aggregate/HashAggregateExec.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/aggregate/HashAggregateExec.scala index abdf953..f424096 100644 --- a/sql/core/src/main/scala/org/apache/spark/sql/execution/aggregate/HashAggregateExec.scala +++ b/sql/core/src/main/scala/org/apache/spark/sql/execution/aggregate/HashAggregateExec.scala @@ -621,7 +621,7 @@ case class HashAggregateExec( } } else "" } - ctx.addExtraCode(generateGenerateCode()) + ctx.addInnerClass(generateGenerateCode()) val doAgg = ctx.freshName("doAggregateWithKeys") val peakMemory = metricTerm(ctx, "peakMemory") --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
