Merge branch 'ESPARK-135' into 'spark_2.1'

[HOTFIX] 修复打包编译时候的语法检查错误

修复打包编译时候的语法检查错误

See merge request !83

Author: cenyuhai

sql/core/src/main/scala/org/apache/spark/sql/execution/aggregate/ObjectAggregationIterator.scala

@@ -75,8 +75,8 @@ class ObjectAggregationIterator(
     FromUnsafeProjection(outputAttributes.map(_.dataType))
 
   /**
-    * Start processing input rows.
-    */
+   * Start processing input rows.
+   */
   processInputs()
 
   override final def hasNext: Boolean = {
@@ -89,8 +89,8 @@ class ObjectAggregationIterator(
   }
 
   /**
-    * Generate an output row when there is no input and there is no grouping expression.
-    */
+   * Generate an output row when there is no input and there is no grouping expression.
+   */
   def outputForEmptyGroupingKeyWithoutInput(): UnsafeRow = {
     if (groupingExpressions.isEmpty) {
       val defaultAggregationBuffer = createNewAggregationBuffer()
@@ -233,9 +233,9 @@ class SortBasedAggregator(
   }
 
   /**
-    * Returns a destructive iterator of AggregationBufferEntry.
-    * Notice: it is illegal to call any method after `destructiveIterator()` has been called.
-    */
+   * Returns a destructive iterator of AggregationBufferEntry.
+   * Notice: it is illegal to call any method after `destructiveIterator()` has been called.
+   */
   def destructiveIterator(): Iterator[AggregationBufferEntry] = {
     new Iterator[AggregationBufferEntry] {
       val inputIterator = inputSorter.sortedIterator()

sql/core/src/main/scala/org/apache/spark/sql/execution/aggregate/ObjectAggregationMap.scala

@@ -60,9 +60,9 @@ class ObjectAggregationMap() {
   }
 
   /**
-    * Dumps all entries into a newly created external sorter, clears the hash map, and returns the
-    * external sorter.
-    */
+   * Dumps all entries into a newly created external sorter, clears the hash map, and returns the
+   * external sorter.
+   */
   def dumpToExternalSorter(
       groupingAttributes: Seq[Attribute],
       aggregateFunctions: Seq[AggregateFunction]): UnsafeKVExternalSorter = {

sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/SparkExecuteStatementOperation.scala

@@ -19,7 +19,7 @@ package org.apache.spark.sql.hive.thriftserver
 
 import java.security.PrivilegedExceptionAction
 import java.sql.{Date, Timestamp}
-import java.util.{Arrays, UUID, Map => JMap}
+import java.util.{Arrays, Map => JMap, UUID}
 import java.util.concurrent.RejectedExecutionException
 
 import scala.collection.JavaConverters._
@@ -37,7 +37,7 @@ import org.apache.hive.service.cli.session.HiveSession
 import org.apache.spark.SparkContext
 import org.apache.spark.deploy.SparkHadoopUtil
 import org.apache.spark.internal.Logging
-import org.apache.spark.sql.{DataFrame, SQLContext, Row => SparkRow}
+import org.apache.spark.sql.{DataFrame, Row => SparkRow, SQLContext}
 import org.apache.spark.sql.execution.command.SetCommand
 import org.apache.spark.sql.hive.HiveUtils
 import org.apache.spark.sql.internal.SQLConf