fix some reveiw issue

apache · Sep 23, 2019 · e168b34 · e168b34
1 parent fadc15c
commit e168b34
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 35 deletions.
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/catalog/SessionCatalog.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/catalog/SessionCatalog.scala
@@ -1084,9 +1084,9 @@ class SessionCatalog(
   private def partitionWithQualifiedPath(
       tableIdentifier: TableIdentifier,
       parts: Seq[CatalogTablePartition]): Seq[CatalogTablePartition] = {
+    lazy val tbl = getTableMetadata(tableIdentifier)
     parts.map { part =>
       if (part.storage.locationUri.isDefined && !part.storage.locationUri.get.isAbsolute) {
-        val tbl = getTableMetadata(tableIdentifier)
         val partPath = new Path(new Path(tbl.location), new Path(part.storage.locationUri.get))
         val qualifiedPartPath = makeQualifiedPath(CatalogUtils.stringToURI(partPath.toString))
         part.copy(storage = part.storage.copy(locationUri = Some(qualifiedPartPath)))

diff --git a/sql/core/src/test/scala/org/apache/spark/sql/execution/command/DDLSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/execution/command/DDLSuite.scala
@@ -2532,7 +2532,7 @@ abstract class DDLSuite extends QueryTest with SQLTestUtils {
       withTempDir { dir =>
         spark.sql(
           s"""
-             |CREATE TABLE t(a STRING, b STRING) USING parquet PARTITIONED BY(b) LOCATION '$dir'
+             |CREATE TABLE t(a STRING, b STRING) USING ${dataSource} PARTITIONED BY(b) LOCATION '$dir'
            """.stripMargin)
         spark.sql("INSERT INTO TABLE t PARTITION(b=1) SELECT 2")
         val part = spark.sessionState.catalog.getPartition(TableIdentifier("t"), Map("b" -> "1"))
@@ -2543,7 +2543,6 @@ abstract class DDLSuite extends QueryTest with SQLTestUtils {
       withTempDir { dir =>
         spark.sql(s"ALTER TABLE t PARTITION(b=1) SET LOCATION '$dir'")
 
-        val table = spark.sessionState.catalog.getTableMetadata(TableIdentifier("t"))
         val part = spark.sessionState.catalog.getPartition(TableIdentifier("t"), Map("b" -> "1"))
         assert(part.storage.locationUri.contains(makeQualifiedPath(dir.getAbsolutePath)))
         assert(part.storage.locationUri.get.toString.startsWith("file:/"))

diff --git a/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/HiveDDLSuite.scala b/sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/HiveDDLSuite.scala
@@ -2133,38 +2133,7 @@ class HiveDDLSuite
       }
     }
   }
-
-  test("the qualified path of a partition is stored in the catalog") {
-    withTable("t") {
-      withTempDir { dir =>
-        spark.sql(
-          s"""
-             |CREATE TABLE t(a STRING, b STRING) USING hive PARTITIONED BY(b) LOCATION '$dir'
-           """.stripMargin)
-        spark.sql("INSERT INTO TABLE t PARTITION(b=1) SELECT 2")
-        val part = spark.sessionState.catalog.getPartition(TableIdentifier("t"), Map("b" -> "1"))
-        assert(part.storage.locationUri.contains(
-          makeQualifiedPath(new File(dir, "b=1").getAbsolutePath)))
-        assert(part.storage.locationUri.get.toString.startsWith("file:/"))
-      }
-      withTempDir { dir =>
-        spark.sql(s"ALTER TABLE t PARTITION(b=1) SET LOCATION '$dir'")
-
-        val table = spark.sessionState.catalog.getTableMetadata(TableIdentifier("t"))
-        val part = spark.sessionState.catalog.getPartition(TableIdentifier("t"), Map("b" -> "1"))
-        assert(part.storage.locationUri.contains(makeQualifiedPath(dir.getAbsolutePath)))
-        assert(part.storage.locationUri.get.toString.startsWith("file:/"))
-      }
-
-      withTempDir { dir =>
-        spark.sql(s"ALTER TABLE t ADD PARTITION(b=2) LOCATION '$dir'")
-        val part = spark.sessionState.catalog.getPartition(TableIdentifier("t"), Map("b" -> "2"))
-        assert(part.storage.locationUri.contains(makeQualifiedPath(dir.getAbsolutePath)))
-        assert(part.storage.locationUri.get.toString.startsWith("file:/"))
-      }
-    }
-  }
-
+
   hiveFormats.foreach { tableType =>
     test(s"alter hive serde table add columns -- partitioned - $tableType") {
       withTable("tab") {