Fix 2.13 compile error.

Author: rdblue

sql/catalyst/src/main/scala/org/apache/spark/sql/connector/catalog/CatalogV2Util.scala

@@ -334,15 +334,17 @@ private[sql] object CatalogV2Util {
   private def convertToProperties(serdeInfo: Option[SerdeInfo]): Map[String, String] = {
     serdeInfo match {
       case Some(s) =>
-        (s.formatClasses match {
+        ((s.formatClasses match {
           case Some((inputFormat, outputFormat)) =>
             Map("hive.input-format" -> inputFormat, "hive.output-format" -> outputFormat)
           case _ =>
             Map.empty
         }) ++
-        s.storedAs.map("hive.stored-as" -> _).toMap ++
-        s.serde.map("hive.serde" -> _).toMap ++
-        s.serdeProperties.map { case (key, value) => TableCatalog.OPTION_PREFIX + key -> value }
+        s.storedAs.map("hive.stored-as" -> _) ++
+        s.serde.map("hive.serde" -> _) ++
+        s.serdeProperties.map {
+          case (key, value) => TableCatalog.OPTION_PREFIX + key -> value
+        }).toMap
       case None =>
         Map.empty
     }

sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/v2/V2SessionCatalog.scala

@@ -115,7 +115,9 @@ class V2SessionCatalog(catalog: SessionCatalog, conf: SQLConf)
   private def toOptions(properties: Map[String, String]): Map[String, String] = {
     properties
         .filterKeys(_.startsWith(TableCatalog.OPTION_PREFIX))
-        .map { case (key, value) => key.replaceFirst(TableCatalog.OPTION_PREFIX, "") -> value }
+        .map {
+          case (key, value) => key.replaceFirst(TableCatalog.OPTION_PREFIX, "") -> value
+        }.toMap
   }
 
   override def alterTable(