Skip to content

[SPARK-18093][SQL] Fix default value test in SQLConfSuite to work rega… #15623

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
markgrover wants to merge 2 commits into from
Closed

[SPARK-18093][SQL] Fix default value test in SQLConfSuite to work rega… #15623

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dea1f33
SPARK-18093][SQL] Fix default value test in SQLConfSuite to work rega…
markgrover Oct 25, 2016
707f1ee
Removing trailing slash instead of adding one
markgrover Oct 25, 2016
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
10 changes: 8 additions & 2 deletions sql/core/src/test/scala/org/apache/spark/sql/internal/SQLConfSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,12 +215,18 @@ class SQLConfSuite extends QueryTest with SharedSQLContext {
}

test("default value of WAREHOUSE_PATH") {
def appendTrailingSlashIfNecessary(path: String): String = {
if (!path.endsWith("/")) path + "/" else path
}

Copy link
Contributor

@vanzin vanzin Oct 26, 2016

Choose a reason for hiding this comment

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

nit: shouldn't add this line but I'll clean it during merge.

val original = spark.conf.get(SQLConf.WAREHOUSE_PATH)
try {
// to get the default value, always unset it
spark.conf.unset(SQLConf.WAREHOUSE_PATH.key)
assert(new Path(Utils.resolveURI("spark-warehouse")).toString ===
spark.sessionState.conf.warehousePath + "/")
// JVM adds a trailing slash if the directory exists and leaves it as-is, if it doesn't
// In our comparison, add trailing slash to both sides if necessary, to account for both cases
assert(appendTrailingSlashIfNecessary(new Path(Utils.resolveURI("spark-warehouse"))
Copy link
Contributor

@vanzin vanzin Oct 25, 2016

Choose a reason for hiding this comment

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

I prefer removing the slash since that's much easier in Scala: str.stripSuffix("/")

Copy link
Member

@srowen srowen Oct 26, 2016

Choose a reason for hiding this comment

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

Right forgot that one!

.toString) === appendTrailingSlashIfNecessary(spark.sessionState.conf.warehousePath))
} finally {
sql(s"set ${SQLConf.WAREHOUSE_PATH}=$original")
}
Expand Down