Add more test.

Author: viirya

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

@@ -24,6 +24,7 @@ import org.apache.hadoop.conf.Configuration
 import org.apache.hadoop.hive.ql.io.orc.{OrcStruct, SparkOrcNewRecordReader}
 import org.scalatest.BeforeAndAfterAll
 
+import org.apache.spark.SparkException
 import org.apache.spark.sql._
 import org.apache.spark.sql.catalyst.TableIdentifier
 import org.apache.spark.sql.execution.datasources.{LogicalRelation, RecordReaderIterator}
@@ -596,7 +597,7 @@ class OrcQuerySuite extends QueryTest with BeforeAndAfterAll with OrcTest {
       singleRowDF.createOrReplaceTempView("single")
 
       withSQLConf(HiveUtils.CONVERT_METASTORE_ORC.key -> "true") {
-        withTable("dummy_orc") {
+        withTable("dummy_orc", "dummy_orc2", "dummy_orc3") {
           withTempPath { dir =>
             val path = dir.getCanonicalPath
 
@@ -619,7 +620,7 @@ class OrcQuerySuite extends QueryTest with BeforeAndAfterAll with OrcTest {
             val df = spark.sql("SELECT key, value FROM dummy_orc WHERE key=0")
             checkAnswer(df, singleRowDF)
 
-            // Create a Metastore ORC table with different schema.
+            // Create a Metastore ORC table with the schema of different column names.
             spark.sql(
               s"""
                  |CREATE EXTERNAL TABLE dummy_orc2(value2 STRING)
@@ -630,7 +631,7 @@ class OrcQuerySuite extends QueryTest with BeforeAndAfterAll with OrcTest {
 
             spark.sql("ALTER TABLE dummy_orc2 ADD PARTITION(key=0)")
 
-            // The output of the relation is the schema from the Metastore, not the file.
+            // The output of the relation is the schema from the Metastore, not from the orc file.
             val df2 = spark.sql("SELECT key, value2 FROM dummy_orc2 WHERE key=0 AND value2='foo'")
             checkAnswer(df2, singleRowDF)
 
@@ -641,6 +642,22 @@ class OrcQuerySuite extends QueryTest with BeforeAndAfterAll with OrcTest {
               fail(s"Expecting the query plan to convert orc to data sources, " +
                 s"but got:\n$queryExecution")
             }
+
+            // When the column types of Orc files are not matching with metastore schema,
+            // we can't convert Hive metastore Orc table to datasource table.
+            spark.sql(
+              s"""
+                 |CREATE EXTERNAL TABLE dummy_orc3(value2 INT)
+                 |PARTITIONED BY (key INT)
+                 |STORED AS ORC
+                 |LOCATION '$path'
+               """.stripMargin)
+
+            spark.sql("ALTER TABLE dummy_orc3 ADD PARTITION(key=0)")
+            val errorMessage = intercept[SparkException] {
+              spark.sql("SELECT key, value2 FROM dummy_orc3 WHERE key=0 AND value2=1").count()
+            }.getMessage
+            assert(errorMessage.contains("please disable spark.sql.hive.convertMetastoreOrc"))
           }
         }
       }