keep the original one and update code style

apache · Jan 5, 2018 · cf7cbce · cf7cbce
1 parent fa902d6
commit cf7cbce
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/internal/HiveSerDe.scala b/sql/core/src/main/scala/org/apache/spark/sql/internal/HiveSerDe.scala
@@ -72,6 +72,7 @@ object HiveSerDe {
   def sourceToSerDe(source: String): Option[HiveSerDe] = {
     val key = source.toLowerCase(Locale.ROOT) match {
       case s if s.startsWith("org.apache.spark.sql.parquet") => "parquet"
+      case s if s.startsWith("org.apache.spark.sql.orc") => "orc"
       case s if s.startsWith("org.apache.spark.sql.hive.orc") => "orc"
       case s if s.equals("orcfile") => "orc"
       case s if s.equals("parquetfile") => "parquet"

diff --git a/sql/hive/src/test/scala/org/apache/spark/sql/hive/orc/HiveOrcSourceSuite.scala b/sql/hive/src/test/scala/org/apache/spark/sql/hive/orc/HiveOrcSourceSuite.scala
@@ -70,13 +70,14 @@ class HiveOrcSourceSuite extends OrcSuite with TestHiveSingleton {
          |OPTIONS (
          |  PATH '${new File(orcTableAsDir.getAbsolutePath).toURI}'
          |)
-       """.
-        stripMargin)
-    spark.sql(
-      "desc formatted normal_orc_as_source_hive").show()
+       """.stripMargin)
+
+    spark.sql("desc formatted normal_orc_as_source_hive").show()
     checkAnswer(sql("SELECT COUNT(*) FROM normal_orc_as_source_hive"), Row(10))
     assert(HiveSerDe.sourceToSerDe("org.apache.spark.sql.hive.orc")
       .equals(HiveSerDe.sourceToSerDe("orc")))
+    assert(HiveSerDe.sourceToSerDe("org.apache.spark.sql.orc")
+      .equals(HiveSerDe.sourceToSerDe("orc")))
   }
 
   test("SPARK-19459/SPARK-18220: read char/varchar column written by Hive") {