Fixing Tests

Author: sameeragarwal

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/plans/logical/basicOperators.scala

@@ -135,9 +135,9 @@ case class Aggregate(
   def references = (groupingExpressions ++ aggregateExpressions).flatMap(_.references).toSet
 }
 
-case class Limit(limit: Expression, child: LogicalPlan) extends UnaryNode {
+case class Limit(limitExpr: Expression, child: LogicalPlan) extends UnaryNode {
   def output = child.output
-  def references = limit.references
+  def references = limitExpr.references
 }
 
 case class Subquery(alias: String, child: LogicalPlan) extends UnaryNode {

sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/optimizer/CombiningLimitsSuite.scala

@@ -40,10 +40,10 @@ class CombiningLimitsSuite extends OptimizerTest {
     val originalQuery =
       testRelation
         .select('a)
-        .limit(10).analyze
-        .limit(5).analyze
+        .limit(10)
+        .limit(5)
 
-    val optimized = Optimize(originalQuery)
+    val optimized = Optimize(originalQuery.analyze)
     val correctAnswer =
       testRelation
         .select('a)
@@ -56,11 +56,11 @@ class CombiningLimitsSuite extends OptimizerTest {
     val originalQuery =
       testRelation
         .select('a)
-        .limit(2).analyze
-        .limit(7).analyze
-        .limit(5).analyze
+        .limit(2)
+        .limit(7)
+        .limit(5)
 
-    val optimized = Optimize(originalQuery)
+    val optimized = Optimize(originalQuery.analyze)
     val correctAnswer =
       testRelation
         .select('a)