Skip to content

[SPARK-22103][FOLLOWUP] Rename addExtraCode to addInnerClass #19353

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

Closed
juliuszsompolski wants to merge 2 commits into from
Closed

[SPARK-22103][FOLLOWUP] Rename addExtraCode to addInnerClass #19353

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
55104df
post review comments
juliuszsompolski Sep 26, 2017
c0488fb
nit
juliuszsompolski Sep 26, 2017
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
11 changes: 5 additions & 6 deletions ...lyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/codegen/CodeGenerator.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -335,16 +335,15 @@ class CodegenContext {
* Emits any source code added with addExtraCode
Copy link
Member

@viirya viirya Sep 26, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: Emits extra classes added ...

Copy link
Contributor

@cloud-fan cloud-fan Sep 26, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Emits extra inner classes added ...

*/
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"
Expand Down
2 changes: 1 addition & 1 deletion sql/core/src/main/scala/org/apache/spark/sql/execution/aggregate/HashAggregateExec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -621,7 +621,7 @@ case class HashAggregateExec(
}
} else ""
}
ctx.addExtraCode(generateGenerateCode())
ctx.addInnerClass(generateGenerateCode())

val doAgg = ctx.freshName("doAggregateWithKeys")
val peakMemory = metricTerm(ctx, "peakMemory")
Expand Down