address comments

Author: cloud-fan

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

@@ -136,7 +136,7 @@ private[sql] trait ColumnarBatchScan extends CodegenSupport {
        |if ($batch == null) {
        |  $nextBatchFuncName();
        |}
-       |while ($batch != null$limitNotReachedCond) {
+       |while ($limitNotReachedCond $batch != null) {
        |  int $numRows = $batch.numRows();
        |  int $localEnd = $numRows - $idx;
        |  for (int $localIdx = 0; $localIdx < $localEnd; $localIdx++) {
@@ -166,7 +166,7 @@ private[sql] trait ColumnarBatchScan extends CodegenSupport {
     }
     val inputRow = if (needsUnsafeRowConversion) null else row
     s"""
-       |while ($input.hasNext()$limitNotReachedCond) {
+       |while ($limitNotReachedCond $input.hasNext()) {
        |  InternalRow $row = (InternalRow) $input.next();
        |  $numOutputRows.add(1);
        |  ${consume(ctx, outputVars, inputRow).trim}

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

@@ -179,7 +179,7 @@ case class SortExec(
        |   $needToSort = false;
        | }
        |
-       | while ($sortedIterator.hasNext()$limitNotReachedCond) {
+       | while ($limitNotReachedCond $sortedIterator.hasNext()) {
        |   UnsafeRow $outputRow = (UnsafeRow)$sortedIterator.next();
        |   ${consume(ctx, null, outputRow)}
        |   if (shouldStop()) return;

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

@@ -363,7 +363,7 @@ trait CodegenSupport extends SparkPlan {
     if (parent.limitNotReachedChecks.isEmpty) {
       ""
     } else {
-      parent.limitNotReachedChecks.mkString(" && ", " && ", "")
+      parent.limitNotReachedChecks.mkString("", " && ", " &&")
     }
   }
 }
@@ -402,7 +402,7 @@ case class InputAdapter(child: SparkPlan) extends UnaryExecNode with CodegenSupp
       forceInline = true)
     val row = ctx.freshName("row")
     s"""
-       | while ($input.hasNext()$limitNotReachedCond) {
+       | while ($limitNotReachedCond $input.hasNext()) {
        |   InternalRow $row = (InternalRow) $input.next();
        |   ${consume(ctx, null, row).trim}
        |   if (shouldStop()) return;

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

@@ -712,7 +712,7 @@ case class HashAggregateExec(
 
     def outputFromRegularHashMap: String = {
       s"""
-         |while ($iterTerm.next()$limitNotReachedCond) {
+         |while ($limitNotReachedCond $iterTerm.next()) {
          |  UnsafeRow $keyTerm = (UnsafeRow) $iterTerm.getKey();
          |  UnsafeRow $bufferTerm = (UnsafeRow) $iterTerm.getValue();
          |  $outputFunc($keyTerm, $bufferTerm);

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

@@ -457,6 +457,11 @@ case class RangeExec(range: org.apache.spark.sql.catalyst.plans.logical.Range)
     } else {
       "// shouldStop check is eliminated"
     }
+    val loopCondition = if (limitNotReachedChecks.isEmpty) {
+      "true"
+    } else {
+      limitNotReachedChecks.mkString(" && ")
+    }
 
     // An overview of the Range processing.
     //
@@ -469,7 +474,7 @@ case class RangeExec(range: org.apache.spark.sql.catalyst.plans.logical.Range)
     // with partition start. `batchEnd` tracks the end index of the current batch, initialized
     // with `nextIndex`. In the outer loop, we first check if `nextIndex == batchEnd`. If it's true,
     // it means the current batch is fully consumed, and we will update `batchEnd` to process the
-    // next batch. If `batchEnd` reaches partition end, exit the outer loop. finally we enter the
+    // next batch. If `batchEnd` reaches partition end, exit the outer loop. Finally we enter the
     // inner loop. Note that, when we enter inner loop, `nextIndex` must be different from
     // `batchEnd`, otherwise we already exit the outer loop.
     //
@@ -490,7 +495,7 @@ case class RangeExec(range: org.apache.spark.sql.catalyst.plans.logical.Range)
       |   $initRangeFuncName(partitionIndex);
       | }
       |
-      | while (true$limitNotReachedCond) {
+      | while ($loopCondition) {
       |   if ($nextIndex == $batchEnd) {
       |     long $nextBatchTodo;
       |     if ($numElementsTodo > ${batchSize}L) {