Address comment.

Author: dongjoon-hyun

docs/sql-programming-guide.md

@@ -1006,7 +1006,12 @@ Configuration of Parquet can be done using the `setConf` method on `SparkSession
 
 ## ORC Files
 
-Since Spark 2.3, Spark supports a vectorized ORC reader with a new ORC file format for ORC files. To do that, the following configurations are newly added. The vectorized reader is used for the native ORC tables (e.g., the ones created using the clause `USING ORC`) when `spark.sql.orc.impl` is set to `native` and `spark.sql.orc.enableVectorizedReader` is set to `true`. For the Hive ORC serde table (e.g., the ones created using the clause `USING HIVE OPTIONS (fileFormat 'ORC')`), the vectorized reader is used when `spark.sql.hive.convertMetastoreOrc` is set to `true`.
+Since Spark 2.3, Spark supports a vectorized ORC reader with a new ORC file format for ORC files.
+To do that, the following configurations are newly added. The vectorized reader is used for the
+native ORC tables (e.g., the ones created using the clause `USING ORC`) when `spark.sql.orc.impl`
+is set to `native` and `spark.sql.orc.enableVectorizedReader` is set to `true`. For the Hive ORC
+serde tables (e.g., the ones created using the clause `USING HIVE OPTIONS (fileFormat 'ORC')`),
+the vectorized reader is used when `spark.sql.hive.convertMetastoreOrc` is set to `true`.
 
 <table class="table">
   <tr><th><b>Property Name</b></th><th><b>Default</b></th><th><b>Meaning</b></th></tr>

sql/core/src/test/scala/org/apache/spark/sql/FileBasedDataSourceSuite.scala

@@ -36,8 +36,11 @@ class FileBasedDataSourceSuite extends QueryTest with SharedSQLContext with Befo
   }
 
   override def afterAll(): Unit = {
-    spark.sessionState.conf.unsetConf(SQLConf.ORC_IMPLEMENTATION)
-    super.afterAll()
+    try {
+      spark.sessionState.conf.unsetConf(SQLConf.ORC_IMPLEMENTATION)
+    } finally {
+      super.afterAll()
+    }
   }
 
   private val allFileBasedDataSources = Seq("orc", "parquet", "csv", "json", "text")

sql/core/src/test/scala/org/apache/spark/sql/streaming/FileStreamSinkSuite.scala

@@ -39,8 +39,11 @@ class FileStreamSinkSuite extends StreamTest {
   }
 
   override def afterAll(): Unit = {
-    spark.sessionState.conf.unsetConf(SQLConf.ORC_IMPLEMENTATION)
-    super.afterAll()
+    try {
+      spark.sessionState.conf.unsetConf(SQLConf.ORC_IMPLEMENTATION)
+    } finally {
+      super.afterAll()
+    }
   }
 
   test("unpartitioned writing and batch reading") {

sql/core/src/test/scala/org/apache/spark/sql/streaming/FileStreamSourceSuite.scala

@@ -213,8 +213,11 @@ class FileStreamSourceSuite extends FileStreamSourceTest {
   }
 
   override def afterAll(): Unit = {
-    spark.sessionState.conf.unsetConf(SQLConf.ORC_IMPLEMENTATION)
-    super.afterAll()
+    try {
+      spark.sessionState.conf.unsetConf(SQLConf.ORC_IMPLEMENTATION)
+    } finally {
+      super.afterAll()
+    }
   }
 
   // ============= Basic parameter exists tests ================