Update comments and rename files.

Author: dongjoon-hyun

sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/orc/OrcFilterSuite.scala

@@ -34,6 +34,10 @@ import org.apache.spark.sql.types._
 
 /**
  * A test suite that tests Apache ORC filter API based filter pushdown optimization.
+ * OrcFilterSuite and HiveOrcFilterSuite is logically duplicated to provide the same test coverage.
+ * The difference are the packages containing 'Predicate' and 'SearchArgument' classes.
+ * - OrcFilterSuite uses 'org.apache.orc.storage.ql.io.sarg' package.
+ * - HiveOrcFilterSuite uses 'org.apache.hadoop.hive.ql.io.sarg' package.
  */
 class OrcFilterSuite extends OrcTest with SharedSQLContext {
 
@@ -287,11 +291,6 @@ class OrcFilterSuite extends OrcTest with SharedSQLContext {
 
   test("filter pushdown - combinations with logical operators") {
     withOrcDataFrame((1 to 4).map(i => Tuple1(Option(i)))) { implicit df =>
-      // Because `ExpressionTree` is not accessible at Hive 1.2.x, this should be checked
-      // in string form in order to check filter creation including logical operators
-      // such as `and`, `or` or `not`. So, this function uses `SearchArgument.toString()`
-      // to produce string expression and then compare it to given string expression below.
-      // This might have to be changed after Hive version is upgraded.
       checkFilterPredicate(
         '_1.isNotNull,
         "leaf-0 = (IS_NULL _1), expr = (not leaf-0)"

sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/orc/OrcTest.scala

@@ -31,16 +31,16 @@ import org.apache.spark.sql.test.SQLTestUtils
 /**
  * OrcTest
  *   -> OrcSuite
- *       -> OrcSourceSuite
- *       -> HiveOrcSourceSuite
+ *       -> org.apache.spark.sql.execution.datasources.orc.OrcSourceSuite
+ *       -> org.apache.spark.sql.hive.orc.OrcSourceSuite
  *   -> OrcQueryTests
- *       -> OrcQuerySuite
- *       -> HiveOrcQuerySuite
+ *       -> org.apache.spark.sql.execution.datasources.orc.OrcQuerySuite
+ *       -> org.apache.spark.sql.hive.orc.OrcQuerySuite
  *   -> OrcPartitionDiscoveryTest
- *       -> OrcPartitionDiscoverySuite
- *       -> HiveOrcPartitionDiscoverySuite
- *   -> OrcFilterSuite
- *   -> HiveOrcFilterSuite
+ *       -> org.apache.spark.sql.execution.datasources.orc.OrcPartitionDiscoverySuite
+ *       -> org.apache.spark.sql.hive.orc.OrcPartitionDiscoverySuite
+ *   -> org.apache.spark.sql.execution.datasources.orc.OrcFilterSuite
+ *   -> org.apache.spark.sql.hive.orc.OrcFilterSuite
  */
 abstract class OrcTest extends QueryTest with SQLTestUtils with BeforeAndAfterAll {
   import testImplicits._

sql/hive/src/test/scala/org/apache/spark/sql/hive/orc/HiveOrcFilterSuite.scala renamed to sql/hive/src/test/scala/org/apache/spark/sql/hive/orc/OrcFilterSuite.scala

@@ -31,13 +31,12 @@ import org.apache.spark.sql.catalyst.planning.PhysicalOperation
 import org.apache.spark.sql.execution.datasources.{DataSourceStrategy, HadoopFsRelation, LogicalRelation}
 import org.apache.spark.sql.execution.datasources.orc.OrcTest
 import org.apache.spark.sql.hive.test.TestHiveSingleton
-import org.apache.spark.sql.internal.SQLConf.ORC_IMPLEMENTATION
 import org.apache.spark.sql.types._
 
 /**
  * A test suite that tests Hive ORC filter API based filter pushdown optimization.
  */
-class HiveOrcFilterSuite extends OrcTest with TestHiveSingleton {
+class OrcFilterSuite extends OrcTest with TestHiveSingleton {
 
   override val orcImp: String = "hive"
 

sql/hive/src/test/scala/org/apache/spark/sql/hive/orc/HiveOrcPartitionDiscoverySuite.scala renamed to sql/hive/src/test/scala/org/apache/spark/sql/hive/orc/OrcPartitionDiscoverySuite.scala

@@ -20,6 +20,6 @@ package org.apache.spark.sql.hive.orc
 import org.apache.spark.sql.execution.datasources.orc.OrcPartitionDiscoveryTest
 import org.apache.spark.sql.hive.test.TestHiveSingleton
 
-class HiveOrcPartitionDiscoverySuite extends OrcPartitionDiscoveryTest with TestHiveSingleton  {
+class OrcPartitionDiscoverySuite extends OrcPartitionDiscoveryTest with TestHiveSingleton  {
   override val orcImp: String = "hive"
 }

sql/hive/src/test/scala/org/apache/spark/sql/hive/orc/HiveOrcQuerySuite.scala renamed to sql/hive/src/test/scala/org/apache/spark/sql/hive/orc/OrcQuerySuite.scala

@@ -25,7 +25,7 @@ import org.apache.spark.sql.hive.HiveUtils
 import org.apache.spark.sql.hive.test.TestHiveSingleton
 import org.apache.spark.sql.internal.SQLConf
 
-class HiveOrcQuerySuite extends OrcQueryTest with TestHiveSingleton {
+class OrcQuerySuite extends OrcQueryTest with TestHiveSingleton {
   import testImplicits._
 
   override val orcImp: String = "hive"

sql/hive/src/test/scala/org/apache/spark/sql/hive/orc/HiveOrcSourceSuite.scala renamed to sql/hive/src/test/scala/org/apache/spark/sql/hive/orc/OrcSourceSuite.scala

@@ -24,7 +24,7 @@ import org.apache.spark.sql.execution.datasources.orc.OrcSuite
 import org.apache.spark.sql.hive.test.TestHiveSingleton
 import org.apache.spark.util.Utils
 
-class HiveOrcSourceSuite extends OrcSuite with TestHiveSingleton {
+class OrcSourceSuite extends OrcSuite with TestHiveSingleton {
 
   override val orcImp: String = "hive"