rebase again

Author: chenghao-intel

sql/core/src/main/scala/org/apache/spark/sql/execution/aggregate2/Aggregate.scala

@@ -17,7 +17,7 @@
 
 package org.apache.spark.sql.execution.aggregate2
 
-import java.util.{HashSet=>JHashSet, Set=>JSet}
+import java.util.{HashSet => JHashSet, Set => JSet}
 
 import org.apache.spark.annotation.DeveloperApi
 import org.apache.spark.rdd.RDD

sql/core/src/test/scala/org/apache/spark/sql/SQLQuerySuite.scala

@@ -174,7 +174,7 @@ class SQLQuerySuite extends QueryTest with BeforeAndAfterAll with SQLTestUtils {
         case generatedAgg: GeneratedAggregate => hasGeneratedAgg = true
         case _ =>
       }
-      if (!hasGeneratedAgg && conf.aggregate2 == false) {
+      if (!hasGeneratedAgg && sqlContext.getConf(SQLConf.AGGREGATE_2) == false) {
         fail(
           s"""
              |Codegen is enabled, but query $sqlText does not have GeneratedAggregate in the plan.
@@ -1369,11 +1369,11 @@ class SQLQuerySuite extends QueryTest with BeforeAndAfterAll with SQLTestUtils {
 class SQLNewUDAFQuerySuite extends SQLQuerySuite {
   override def beforeAll() {
     super.beforeAll()
-    sqlCtx.setConf(SQLConf.AGGREGATE_2, "true")
+    sqlContext.setConf(SQLConf.AGGREGATE_2, "true")
   }
 
   override def afterAll() {
-    sqlCtx.setConf(SQLConf.AGGREGATE_2, "false")
+    sqlContext.setConf(SQLConf.AGGREGATE_2, "false")
     super.afterAll()
   }
 }

sql/hive/src/main/scala/org/apache/spark/sql/hive/hiveUdfs.scala

@@ -17,7 +17,7 @@
 
 package org.apache.spark.sql.hive
 
-import java.util.{Set=>JSet}
+import java.util.{Set => JSet}
 
 import org.apache.hadoop.hive.ql.udf.generic.GenericUDAFEvaluator.AggregationBuffer
 import org.apache.hadoop.hive.ql.udf.generic.GenericUDFUtils.ConversionHelper