[SPARK-18093][SQL] Fix default value test in SQLConfSuite to work rega… #15623
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…rdless of warehouse dir's existence Appending a trailing slash, if there already isn't one for the sake comparison of the two paths. It doesn't take away from the essence of the check, but removes any potential mismatch due to lack of trailing slash.
srowen
approved these changes
Oct 25, 2016
|
Test build #67514 has finished for PR 15623 at commit
|
|
Thanks @srowen, indeed, it could be stripping the trailing slash too. I am ok either way too. Let me know if you have strong preference to the other one, otherwise, this should be ok. Thanks again! |
markgrover
changed the title
vanzin
reviewed
Oct 25, 2016
| 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")) |
There was a problem hiding this comment.
I prefer removing the slash since that's much easier in Scala: str.stripSuffix("/")
vanzin
reviewed
Oct 26, 2016
| @@ -215,12 +215,15 @@ class SQLConfSuite extends QueryTest with SharedSQLContext { | |||
| } | |||
|
|
|||
| test("default value of WAREHOUSE_PATH") { | |||
|
|
|||
There was a problem hiding this comment.
nit: shouldn't add this line but I'll clean it during merge.
|
LGTM will merge once tests pass. |
|
Test build #67535 has finished for PR 15623 at commit
|
|
Merging to master / 2.0. |
asfgit
pushed a commit
that referenced
this pull request
Oct 26, 2016
…rdless of warehouse dir's existence ## What changes were proposed in this pull request? Appending a trailing slash, if there already isn't one for the sake comparison of the two paths. It doesn't take away from the essence of the check, but removes any potential mismatch due to lack of trailing slash. ## How was this patch tested? Ran unit tests and they passed. Author: Mark Grover <mark@apache.org> Closes #15623 from markgrover/spark-18093. (cherry picked from commit 4bee954) Signed-off-by: Marcelo Vanzin <vanzin@cloudera.com>
robert3005
pushed a commit
to palantir/spark
that referenced
this pull request
Nov 1, 2016
…rdless of warehouse dir's existence ## What changes were proposed in this pull request? Appending a trailing slash, if there already isn't one for the sake comparison of the two paths. It doesn't take away from the essence of the check, but removes any potential mismatch due to lack of trailing slash. ## How was this patch tested? Ran unit tests and they passed. Author: Mark Grover <mark@apache.org> Closes apache#15623 from markgrover/spark-18093.
uzadude
pushed a commit
to uzadude/spark
that referenced
this pull request
Jan 27, 2017
…rdless of warehouse dir's existence ## What changes were proposed in this pull request? Appending a trailing slash, if there already isn't one for the sake comparison of the two paths. It doesn't take away from the essence of the check, but removes any potential mismatch due to lack of trailing slash. ## How was this patch tested? Ran unit tests and they passed. Author: Mark Grover <mark@apache.org> Closes apache#15623 from markgrover/spark-18093.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
…rdless of warehouse dir's existence
What changes were proposed in this pull request?
Appending a trailing slash, if there already isn't one for the
sake comparison of the two paths. It doesn't take away from
the essence of the check, but removes any potential mismatch
due to lack of trailing slash.
How was this patch tested?
Ran unit tests and they passed.