Removing leftovers from merge during rebase

Author: AndreSchumacher

sql/core/src/test/scala/org/apache/spark/sql/parquet/ParquetQuerySuite.scala

@@ -243,24 +243,6 @@ class ParquetQuerySuite extends QueryTest with FunSuite with BeforeAndAfterAll {
     assert(true)
   }
 
-  test("SELECT WHERE") {
-    val result = sql("SELECT * FROM testsource WHERE myint = 5").collect()
-  /*test("SELECT WHERE") {
-    //val result = parquetFile("/home/andre/input.adam").registerAsTable("adamtable")
-    //sql("SELECT * FROM adamtable WHERE mapq = 0").collect()
-    //assert(result != null)
-    //val result = sql("SELECT * FROM testsource WHERE myint = 5").collect()
-    // TODO: ADD larger case SchemaRDD with filtering on REQUIRED field!
-    implicit def anyToRow(value: Any): Row = value.asInstanceOf[Row]
-    TestSQLContext
-      .parquetFile(ParquetTestData.testNestedDir1.toString)
-      .toSchemaRDD.registerAsTable("xtmptable")
-    val result = sql("SELECT * FROM xtmptable WHERE owner = \"Julien Le Dem\"").collect()
->>>>>>> Extending ParquetFilters
-    assert(result != null)
-  }*/
-  }
-
   test("create RecordFilter for simple predicates") {
     val attribute1 = new AttributeReference("first", IntegerType, false)()
     val predicate1 = new Equals(attribute1, new Literal(1, IntegerType))