fix some code

Author: windpiger

sql/core/src/test/scala/org/apache/spark/sql/execution/command/DDLSuite.scala

@@ -1761,34 +1761,6 @@ class DDLSuite extends QueryTest with SharedSQLContext with BeforeAndAfterEach {
     assert(rows.length > 0)
   }
 
-  test("SET LOCATION for managed table") {
-    withTable("tbl") {
-      withTempDir { dir =>
-        sql("CREATE TABLE tbl(i INT) USING parquet")
-        sql("INSERT INTO tbl SELECT 1")
-        checkAnswer(spark.table("tbl"), Row(1))
-        val defaultTablePath = spark.sessionState.catalog
-          .getTableMetadata(TableIdentifier("tbl")).storage.locationUri.get
-
-        sql(s"ALTER TABLE tbl SET LOCATION '${dir.getCanonicalPath}'")
-        spark.catalog.refreshTable("tbl")
-        // SET LOCATION won't move data from previous table path to new table path.
-        assert(spark.table("tbl").count() == 0)
-        // the previous table path should be still there.
-        assert(new File(new URI(defaultTablePath)).exists())
-
-        sql("INSERT INTO tbl SELECT 2")
-        checkAnswer(spark.table("tbl"), Row(2))
-        // newly inserted data will go to the new table path.
-        assert(dir.listFiles().nonEmpty)
-
-        sql("DROP TABLE tbl")
-        // the new table path will be removed after DROP TABLE.
-        assert(!dir.exists())
-      }
-    }
-  }
-
   test("insert data to a data source table which has a not existed location should succeed") {
     withTable("t") {
       withTempDir { dir =>
@@ -1799,8 +1771,8 @@ class DDLSuite extends QueryTest with SharedSQLContext with BeforeAndAfterEach {
              |OPTIONS(path "$dir")
            """.stripMargin)
         val table = spark.sessionState.catalog.getTableMetadata(TableIdentifier("t"))
-        val expectedPath = dir.getAbsolutePath.stripSuffix("/")
-        assert(table.location.stripSuffix("/") == expectedPath)
+        val expectedPath = dir.getAbsolutePath
+        assert(table.location == expectedPath)
 
         dir.delete
         val tableLocFile = new File(table.location.stripPrefix("file:"))
@@ -1815,17 +1787,16 @@ class DDLSuite extends QueryTest with SharedSQLContext with BeforeAndAfterEach {
         assert(tableLocFile.exists)
         checkAnswer(spark.table("t"), Row("c", 1) :: Nil)
 
-        val newDir = dir.getAbsolutePath.stripSuffix("/") + "/x"
-        val newDirFile = new File(newDir)
+        val newDir = new File(dir, "x")
         spark.sql(s"ALTER TABLE t SET LOCATION '$newDir'")
         spark.sessionState.catalog.refreshTable(TableIdentifier("t"))
 
         val table1 = spark.sessionState.catalog.getTableMetadata(TableIdentifier("t"))
-        assert(table1.location == newDir)
-        assert(!newDirFile.exists)
+        assert(table1.location == newDir.getAbsolutePath)
+        assert(!newDir.exists)
 
         spark.sql("INSERT INTO TABLE t SELECT 'c', 1")
-        assert(newDirFile.exists)
+        assert(newDir.exists)
         checkAnswer(spark.table("t"), Row("c", 1) :: Nil)
       }
     }
@@ -1838,17 +1809,17 @@ class DDLSuite extends QueryTest with SharedSQLContext with BeforeAndAfterEach {
           s"""
              |CREATE TABLE t(a int, b int, c int, d int)
              |USING parquet
+             |OPTIONS(path '$dir')
              |PARTITIONED BY(a, b)
-             |LOCATION "$dir"
            """.stripMargin)
         val table = spark.sessionState.catalog.getTableMetadata(TableIdentifier("t"))
-        val expectedPath = dir.getAbsolutePath.stripSuffix("/")
-        assert(table.location.stripSuffix("/") == expectedPath)
+        val expectedPath = dir.getAbsolutePath
+        assert(table.location == expectedPath)
 
         spark.sql("INSERT INTO TABLE t PARTITION(a=1, b=2) SELECT 3, 4")
         checkAnswer(spark.table("t"), Row(3, 4, 1, 2) :: Nil)
 
-        val partLoc = new File(s"${dir.getAbsolutePath}/a=1")
+        val partLoc = new File(dir, "a=1")
         Utils.deleteRecursively(partLoc)
         assert(!partLoc.exists())
         // insert overwrite into a partition which location has been deleted.
@@ -1869,18 +1840,18 @@ class DDLSuite extends QueryTest with SharedSQLContext with BeforeAndAfterEach {
              |OPTIONS(path "$dir")
            """.stripMargin)
         val table = spark.sessionState.catalog.getTableMetadata(TableIdentifier("t"))
-        val expectedPath = dir.getAbsolutePath.stripSuffix("/")
-        assert(table.location.stripSuffix("/") == expectedPath)
+        val expectedPath = dir.getAbsolutePath
+        assert(table.location == expectedPath)
 
         dir.delete()
         checkAnswer(spark.table("t"), Nil)
 
-        val newDir = dir.getAbsolutePath.stripSuffix("/") + "/x"
+        val newDir = new File(dir, "x")
         spark.sql(s"ALTER TABLE t SET LOCATION '$newDir'")
 
         val table1 = spark.sessionState.catalog.getTableMetadata(TableIdentifier("t"))
-        assert(table1.location == newDir)
-        assert(!new File(newDir).exists())
+        assert(table1.location == newDir.getAbsolutePath)
+        assert(!newDir.exists())
         checkAnswer(spark.table("t"), Nil)
       }
     }
@@ -1893,8 +1864,8 @@ class DDLSuite extends QueryTest with SharedSQLContext with BeforeAndAfterEach {
           s"""
              |CREATE TABLE t(a int, b int, c int, d int)
              |USING parquet
+             |OPTIONS(path "$dir")
              |PARTITIONED BY(a, b)
-             |LOCATION "$dir"
            """.stripMargin)
         spark.sql("INSERT INTO TABLE t PARTITION(a=1, b=2) SELECT 3, 4")
         checkAnswer(spark.table("t"), Row(3, 4, 1, 2) :: Nil)