fix return bug

Author: AngersZhuuuu

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

@@ -35,12 +35,12 @@ object PushCNFPredicateThroughFileScan extends Rule[LogicalPlan] with PredicateH
   def apply(plan: LogicalPlan): LogicalPlan = {
     var resolved = false
     plan resolveOperatorsDown {
-      case ScanOperation(projectList, conditions, relation: LogicalRelation)
+      case op @ ScanOperation(projectList, conditions, relation: LogicalRelation)
         if conditions.nonEmpty && !resolved =>
         resolved = true
         val predicates = conjunctiveNormalFormAndGroupExpsByReference(conditions.reduceLeft(And))
         if (predicates.isEmpty) {
-          plan
+          op
         } else {
           Project(projectList, Filter(predicates.reduceLeft(And), relation))
         }

sql/hive/src/main/scala/org/apache/spark/sql/hive/execution/PushCNFPredicateThroughHiveTableScan.scala

@@ -34,12 +34,12 @@ object PushCNFPredicateThroughHiveTableScan extends Rule[LogicalPlan] with Predi
   def apply(plan: LogicalPlan): LogicalPlan = {
     var resolved = false
     plan resolveOperatorsDown {
-      case ScanOperation(projectList, conditions, relation: HiveTableRelation)
+      case op @ ScanOperation(projectList, conditions, relation: HiveTableRelation)
         if conditions.nonEmpty && !resolved =>
         resolved = true
         val predicates = conjunctiveNormalFormAndGroupExpsByReference(conditions.reduceLeft(And))
         if (predicates.isEmpty) {
-          plan
+          op
         } else {
           Project(projectList, Filter(predicates.reduceLeft(And), relation))
         }