make test case more readable

apache · Dec 31, 2018 · fd7c63b · fd7c63b
1 parent d410a9c
commit fd7c63b
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/sql/core/src/test/scala/org/apache/spark/sql/execution/metric/SQLMetricsSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/execution/metric/SQLMetricsSuite.scala
@@ -82,18 +82,11 @@ class SQLMetricsSuite extends SparkFunSuite with SQLMetricsTestUtils with Shared
     //   Filter(nodeId = 1)
     //     Range(nodeId = 2)
     // TODO: update metrics in generated operators
-<<<<<<< HEAD
     val ds = spark.range(10).filter('id < 5)
     testSparkPlanMetricsWithPredicates(ds.toDF(), 1, Map(
       0L -> (("WholeStageCodegen", Map(
         "duration total (min, med, max)" -> {_.toString.matches(timingMetricPattern)})))
     ), true)
-=======
-    val df = spark.range(10).filter('id < 5).toDF()
-    testSparkPlanMetrics(df, 1, Map.empty, true)
-    df.queryExecution.executedPlan.find(_.isInstanceOf[WholeStageCodegenExec])
-      .getOrElse(assert(false))
->>>>>>> check whole-stage codegen enabled
   }
 
   test("Aggregate metrics") {