Changed minor things

Author: sarutak

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/codegen/CodeFormatter.scala

@@ -26,7 +26,7 @@ import org.apache.commons.lang3.StringUtils
  * Written by Matei Zaharia.
  */
 object CodeFormatter {
-  def format(code: SourceCode): String = {
+  def format(code: CodeAndComment): String = {
     StringUtils.replaceEach(
       new CodeFormatter().addLines(code.body).result(),
       code.comment.keys.toArray,

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/codegen/CodeGenerator.scala

@@ -721,9 +721,9 @@ class CodegenContext {
   }
 
   /**
-   * Get a immutable map of the pair of a place holder and a corresponding comment
+   * Copy an immutable map of the pair of a place holder and a corresponding comment
    */
-  def getPlaceHolderToCommentMap(): immutable.Map[String, String] = {
+  def copyPlaceHolderToCommentMap(): immutable.Map[String, String] = {
     immutable.Map() ++ placeHolderToCommentMap
   }
 }
@@ -739,12 +739,12 @@ abstract class GeneratedClass {
 /**
  * A wrapper for the source code to be compiled by [[CodeGenerator]].
  */
-class SourceCode(val body: String, val comment: Map[String, String]) extends Serializable {
+class CodeAndComment(val body: String, val comment: Map[String, String]) extends Serializable {
   override def equals(that: Any): Boolean = {
-    if (!that.isInstanceOf[SourceCode]) {
+    if (!that.isInstanceOf[CodeAndComment]) {
       return false
     }
-    val thatSourceCode = that.asInstanceOf[SourceCode]
+    val thatSourceCode = that.asInstanceOf[CodeAndComment]
     if (thatSourceCode eq null) return false
 
     return body == thatSourceCode.body
@@ -797,14 +797,14 @@ object CodeGenerator extends Logging {
   /**
    * Compile the Java source code into a Java class, using Janino.
    */
-  def compile(code: SourceCode): GeneratedClass = {
+  def compile(code: CodeAndComment): GeneratedClass = {
     cache.get(code)
   }
 
   /**
    * Compile the Java source code into a Java class, using Janino.
    */
-  private[this] def doCompile(code: SourceCode): GeneratedClass = {
+  private[this] def doCompile(code: CodeAndComment): GeneratedClass = {
     val evaluator = new ClassBodyEvaluator()
     evaluator.setParentClassLoader(Utils.getContextOrSparkClassLoader)
     // Cannot be under package codegen, or fail with java.lang.InstantiationException
@@ -856,8 +856,8 @@ object CodeGenerator extends Logging {
   private val cache = CacheBuilder.newBuilder()
     .maximumSize(100)
     .build(
-      new CacheLoader[SourceCode, GeneratedClass]() {
-        override def load(code: SourceCode): GeneratedClass = {
+      new CacheLoader[CodeAndComment, GeneratedClass]() {
+        override def load(code: CodeAndComment): GeneratedClass = {
           val startTime = System.nanoTime()
           val result = doCompile(code)
           val endTime = System.nanoTime()

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/codegen/GenerateMutableProjection.scala

@@ -133,7 +133,7 @@ object GenerateMutableProjection extends CodeGenerator[Seq[Expression], MutableP
       }
     """
 
-    val code = new SourceCode(codeBody, ctx.getPlaceHolderToCommentMap())
+    val code = new CodeAndComment(codeBody, ctx.copyPlaceHolderToCommentMap())
     lazy val formatted = CodeFormatter.format(code)
     logDebug(s"code for ${expressions.mkString(",")}:\n$formatted")
 

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/codegen/GenerateOrdering.scala

@@ -136,7 +136,7 @@ object GenerateOrdering extends CodeGenerator[Seq[SortOrder], Ordering[InternalR
         }
       }"""
 
-    val code = new SourceCode(codeBody, ctx.getPlaceHolderToCommentMap())
+    val code = new CodeAndComment(codeBody, ctx.copyPlaceHolderToCommentMap())
     lazy val formatted = CodeFormatter.format(code)
     logDebug(s"Generated Ordering by ${ordering.mkString(",")}:\n$formatted")
 

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/codegen/GeneratePredicate.scala

@@ -61,7 +61,7 @@ object GeneratePredicate extends CodeGenerator[Expression, (InternalRow) => Bool
         }
       }"""
 
-    val code = new SourceCode(codeBody, ctx.getPlaceHolderToCommentMap())
+    val code = new CodeAndComment(codeBody, ctx.copyPlaceHolderToCommentMap())
     lazy val formatted = CodeFormatter.format(code)
     logDebug(s"Generated predicate '$predicate':\n$formatted")
 

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/codegen/GenerateSafeProjection.scala

@@ -181,7 +181,7 @@ object GenerateSafeProjection extends CodeGenerator[Seq[Expression], Projection]
       }
     """
 
-    val code = new SourceCode(codeBody, ctx.getPlaceHolderToCommentMap())
+    val code = new CodeAndComment(codeBody, ctx.copyPlaceHolderToCommentMap())
     lazy val formatted = CodeFormatter.format(code)
     logDebug(s"code for ${expressions.mkString(",")}:\n$formatted")
 

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/codegen/GenerateUnsafeProjection.scala

@@ -390,7 +390,7 @@ object GenerateUnsafeProjection extends CodeGenerator[Seq[Expression], UnsafePro
       }
       """
 
-    val code = new SourceCode(codeBody, ctx.getPlaceHolderToCommentMap())
+    val code = new CodeAndComment(codeBody, ctx.copyPlaceHolderToCommentMap())
     lazy val formatted = CodeFormatter.format(code)
     logDebug(s"code for ${expressions.mkString(",")}:\n$formatted")
 

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/codegen/GenerateUnsafeRowJoiner.scala

@@ -193,7 +193,7 @@ object GenerateUnsafeRowJoiner extends CodeGenerator[(StructType, StructType), U
        |  }
        |}
      """.stripMargin
-    val code = new SourceCode(codeBody, Map.empty)
+    val code = new CodeAndComment(codeBody, Map.empty)
     lazy val formatted = CodeFormatter.format(code)
     logDebug(s"SpecificUnsafeRowJoiner($schema1, $schema2):\n$formatted")
 

sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/expressions/codegen/CodeFormatterSuite.scala

@@ -25,7 +25,7 @@ class CodeFormatterSuite extends SparkFunSuite {
 
   def testCase(name: String)(input: String)(expected: String): Unit = {
     test(name) {
-      val sourceCode = new SourceCode(input, Map.empty)
+      val sourceCode = new CodeAndComment(input, Map.empty)
       if (CodeFormatter.format(sourceCode).trim !== expected.trim) {
         fail(
           s"""

sql/core/src/main/scala/org/apache/spark/sql/execution/WholeStageCodegenExec.scala

@@ -299,7 +299,7 @@ case class WholeStageCodegenExec(child: SparkPlan) extends UnaryExecNode with Co
    *
    * @return the tuple of the codegen context and the actual generated source.
    */
-  def doCodeGen(): (CodegenContext, SourceCode) = {
+  def doCodeGen(): (CodegenContext, CodeAndComment) = {
     val ctx = new CodegenContext
     val code = child.asInstanceOf[CodegenSupport].produce(ctx, this)
     val source = s"""
@@ -334,7 +334,10 @@ case class WholeStageCodegenExec(child: SparkPlan) extends UnaryExecNode with Co
 
     // try to compile, helpful for debug
     val cleanedSource =
-      new SourceCode(CodeFormatter.stripExtraNewLines(source), ctx.getPlaceHolderToCommentMap())
+      new CodeAndComment(
+        CodeFormatter.stripExtraNewLines(source),
+        ctx.copyPlaceHolderToCommentMap())
+
     logDebug(s"\n${CodeFormatter.format(cleanedSource)}")
     CodeGenerator.compile(cleanedSource)
     (ctx, cleanedSource)