Skip to content

[SPARK-19257][SQL]location for table/partition/database should be java.net.URI #17149

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
windpiger wants to merge 13 commits into from
Closed

[SPARK-19257][SQL]location for table/partition/database should be java.net.URI #17149

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
38436e8
convert to URI
windpiger Mar 3, 2017
69a1646
fix some sytle
windpiger Mar 3, 2017
890327a
revert the DataBase location type
windpiger Mar 3, 2017
e792cb6
fix test failed
windpiger Mar 3, 2017
f2b9bd8
add test cases
windpiger Mar 3, 2017
109e2b5
fix some code review
windpiger Mar 5, 2017
dc0a37b
optimize code
windpiger Mar 6, 2017
b6bc466
optimize some code
windpiger Mar 6, 2017
abfb6f5
modify util func
windpiger Mar 6, 2017
80f2c40
fix a code
windpiger Mar 6, 2017
681db88
modify test name
windpiger Mar 6, 2017
5b92620
fix test failed
windpiger Mar 6, 2017
5b423f5
fix test failed
windpiger Mar 6, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
fix test failed
  • Loading branch information
@windpiger
windpiger committed Mar 6, 2017
commit 5b423f56b69a11b44cbc8ce6bf1e8821619ebf79
6 changes: 3 additions & 3 deletions sql/core/src/test/scala/org/apache/spark/sql/execution/command/DDLSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,7 @@ class DDLSuite extends QueryTest with SharedSQLContext with BeforeAndAfterEach {
sql(s"DESCRIBE DATABASE EXTENDED $dbName"),
Row("Database Name", dbNameWithoutBackTicks) ::
Row("Description", "") ::
Row("Location", location) ::
Row("Location", CatalogUtils.URIToString(location)) ::
Row("Properties", "") :: Nil)

sql(s"ALTER DATABASE $dbName SET DBPROPERTIES ('a'='a', 'b'='b', 'c'='c')")
Expand All @@ -457,7 +457,7 @@ class DDLSuite extends QueryTest with SharedSQLContext with BeforeAndAfterEach {
sql(s"DESCRIBE DATABASE EXTENDED $dbName"),
Row("Database Name", dbNameWithoutBackTicks) ::
Row("Description", "") ::
Row("Location", location) ::
Row("Location", CatalogUtils.URIToString(location)) ::
Row("Properties", "((a,a), (b,b), (c,c))") :: Nil)

sql(s"ALTER DATABASE $dbName SET DBPROPERTIES ('d'='d')")
Expand All @@ -466,7 +466,7 @@ class DDLSuite extends QueryTest with SharedSQLContext with BeforeAndAfterEach {
sql(s"DESCRIBE DATABASE EXTENDED $dbName"),
Row("Database Name", dbNameWithoutBackTicks) ::
Row("Description", "") ::
Row("Location", location) ::
Row("Location", CatalogUtils.URIToString(location)) ::
Row("Properties", "((a,a), (b,b), (c,c), (d,d))") :: Nil)
} finally {
catalog.reset()
Expand Down
22 changes: 11 additions & 11 deletions sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/HiveDDLSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1690,11 +1690,11 @@ class HiveDDLSuite
}
}

Seq("a b", "a:b", "a%b").foreach { specialCharInLoc =>
test(s"location uri contains $specialCharInLoc for datasource table") {
Seq("a b", "a:b", "a%b").foreach { specialChars =>
Copy link
Contributor

@cloud-fan cloud-fan Mar 6, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please add a TODO to remove these duplicated tests when we merge DDLSuite and HiveDDLSuite

Copy link
Member

@gatorsmile gatorsmile Mar 6, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This introduces the conflict in my PR #16592. Let me remove the duplicate there.

test(s"datasource table: location uri contains $specialChars") {
withTable("t", "t1") {
withTempDir { dir =>
val loc = new File(dir, specialCharInLoc)
val loc = new File(dir, specialChars)
loc.mkdir()
spark.sql(
s"""
Expand All @@ -1705,7 +1705,7 @@ class HiveDDLSuite

val table = spark.sessionState.catalog.getTableMetadata(TableIdentifier("t"))
assert(table.location == new Path(loc.getAbsolutePath).toUri)
assert(new Path(table.location).toString.contains(specialCharInLoc))
assert(new Path(table.location).toString.contains(specialChars))

assert(loc.listFiles().isEmpty)
spark.sql("INSERT INTO TABLE t SELECT 1")
Expand All @@ -1714,7 +1714,7 @@ class HiveDDLSuite
}

withTempDir { dir =>
val loc = new File(dir, specialCharInLoc)
val loc = new File(dir, specialChars)
loc.mkdir()
spark.sql(
s"""
Expand All @@ -1726,7 +1726,7 @@ class HiveDDLSuite

val table = spark.sessionState.catalog.getTableMetadata(TableIdentifier("t1"))
assert(table.location == new Path(loc.getAbsolutePath).toUri)
assert(new Path(table.location).toString.contains(specialCharInLoc))
assert(new Path(table.location).toString.contains(specialChars))

assert(loc.listFiles().isEmpty)
spark.sql("INSERT INTO TABLE t1 PARTITION(b=2) SELECT 1")
Expand All @@ -1746,7 +1746,7 @@ class HiveDDLSuite
}

Seq("a b", "a:b", "a%b").foreach { specialChars =>
test(s"location uri contains $specialChars for hive table") {
test(s"hive table: location uri contains $specialChars") {
withTable("t") {
withTempDir { dir =>
val loc = new File(dir, specialChars)
Expand All @@ -1762,10 +1762,10 @@ class HiveDDLSuite
val path = new Path(loc.getAbsolutePath)
val fs = path.getFileSystem(spark.sessionState.newHadoopConf())
assert(table.location == fs.makeQualified(path).toUri)
assert(new Path(table.location).toString.contains(specialCharInLoc))
assert(new Path(table.location).toString.contains(specialChars))

assert(loc.listFiles().isEmpty)
if (specialCharInLoc != "a:b") {
if (specialChars != "a:b") {
spark.sql("INSERT INTO TABLE t SELECT 1")
assert(loc.listFiles().length >= 1)
checkAnswer(spark.table("t"), Row("1") :: Nil)
Expand All @@ -1792,10 +1792,10 @@ class HiveDDLSuite
val path = new Path(loc.getAbsolutePath)
val fs = path.getFileSystem(spark.sessionState.newHadoopConf())
assert(table.location == fs.makeQualified(path).toUri)
assert(new Path(table.location).toString.contains(specialCharInLoc))
assert(new Path(table.location).toString.contains(specialChars))

assert(loc.listFiles().isEmpty)
if (specialCharInLoc != "a:b") {
if (specialChars != "a:b") {
spark.sql("INSERT INTO TABLE t1 PARTITION(b=2) SELECT 1")
val partFile = new File(loc, "b=2")
assert(partFile.listFiles().length >= 1)
Expand Down