Merge branch 'enable_codegen' of github.com:davies/spark into enable_codegen

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

Author: Davies Liu

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/arithmetic.scala

@@ -349,7 +349,7 @@ case class MaxOf(left: Expression, right: Expression) extends BinaryArithmetic {
   override def genCode(ctx: CodeGenContext, ev: GeneratedExpressionCode): String = {
     val eval1 = left.gen(ctx)
     val eval2 = right.gen(ctx)
-    val compCode = ctx.genCmop(dataType, eval1.primitive, eval2.primitive)
+    val compCode = ctx.genComp(dataType, eval1.primitive, eval2.primitive)
 
     eval1.code + eval2.code + s"""
       boolean ${ev.isNull} = false;
@@ -401,7 +401,7 @@ case class MinOf(left: Expression, right: Expression) extends BinaryArithmetic {
   override def genCode(ctx: CodeGenContext, ev: GeneratedExpressionCode): String = {
     val eval1 = left.gen(ctx)
     val eval2 = right.gen(ctx)
-    val compCode = ctx.genCmop(dataType, eval1.primitive, eval2.primitive)
+    val compCode = ctx.genComp(dataType, eval1.primitive, eval2.primitive)
 
     eval1.code + eval2.code + s"""
       boolean ${ev.isNull} = false;

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

@@ -159,7 +159,7 @@ class CodeGenContext {
   }
 
   /**
-   * Returns a function to generate equal expression in Java
+   * Generate code for equal expression in Java
    */
   def genEqual(dataType: DataType, c1: String, c2: String): String = dataType match {
     case BinaryType =>  s"java.util.Arrays.equals($c1, $c2)"
@@ -169,9 +169,9 @@ class CodeGenContext {
   }
 
   /**
-   * Return a function to generate compare expression in Java
+   * Generate code for compare expression in Java
    */
-  def genCmop(dataType: DataType, c1: String, c2: String): String = dataType match {
+  def genComp(dataType: DataType, c1: String, c2: String): String = dataType match {
     case BinaryType => s"org.apache.spark.sql.catalyst.util.TypeUtils.compareBinary($c1, $c2)"
     case IntegerType | LongType | DoubleType | FloatType | ShortType | ByteType | DateType =>
       s"$c1 - $c2"

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/predicates.scala

@@ -251,7 +251,7 @@ abstract class BinaryComparison extends BinaryExpression with Predicate {
 
   override def genCode(ctx: CodeGenContext, ev: GeneratedExpressionCode): String = {
     defineCodeGen(ctx, ev, {
-      (c1, c2) => s"${ctx.genCmop(left.dataType, c1, c2)} $symbol 0"
+      (c1, c2) => s"${ctx.genComp(left.dataType, c1, c2)} $symbol 0"
     })
   }