[SPARK-19137][SQL] Fix withSQLConf to reset OptionalConfigEntry correctly
#16522
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
Contributor
|
Looks ok since this is what other tests here do; but I wonder why this case isn't handled in |
Member
|
@dongjoon-hyun The expected behavior is this test should use a temp folder instead. Looks like it gets |
Member
Author
Member
Author
|
I found the root cause. |
dongjoon-hyun
changed the title
withSQLConf to reset OptionalConfigEntry correctly
Member
Author
zsxwing
reviewed
Jan 10, 2017
| val currentValues = keys.map(key => Try(spark.conf.get(key)).toOption) | ||
| val currentValues = keys.map { key => | ||
| if (spark.conf.contains(key)) { | ||
| Try(spark.conf.get(key)).toOption |
Member
There was a problem hiding this comment.
Nit: you can just use Some(spark.conf.get(key)). It's better to not hide exceptions from get.
Member
Author
|
Thank you. I updated it. |
|
Test build #71099 has finished for PR 16522 at commit
|
|
Test build #71106 has finished for PR 16522 at commit
|
|
Test build #71107 has finished for PR 16522 at commit
|
Member
Author
vanzin
reviewed
Jan 10, 2017
| protected def withSQLConf(pairs: (String, String)*)(f: => Unit): Unit = { | ||
| val (keys, values) = pairs.unzip | ||
| val currentValues = keys.map(key => Try(spark.conf.get(key)).toOption) | ||
| val currentValues = keys.map { key => |
Contributor
There was a problem hiding this comment.
I think this can just be keys.flatMap(conf.get). But I'll let Ryan look since he's more involved with this code.
Member
Author
There was a problem hiding this comment.
I see. Thank you, @vanzin .
Could you ping him?
Member
There was a problem hiding this comment.
@vanzin conf.get won't work as it will use defaultValueString when the key doesn't exist.
Member
|
LGTM. Merging to master and 2.1. |
asfgit
pushed a commit
that referenced
this pull request
Jan 10, 2017
…orrectly
## What changes were proposed in this pull request?
`DataStreamReaderWriterSuite` makes test files in source folder like the followings. Interestingly, the root cause is `withSQLConf` fails to reset `OptionalConfigEntry` correctly. In other words, it resets the config into `Some(undefined)`.
```bash
$ git status
Untracked files:
(use "git add <file>..." to include in what will be committed)
sql/core/%253Cundefined%253E/
sql/core/%3Cundefined%3E/
```
## How was this patch tested?
Manual.
```
build/sbt "project sql" test
git status
```
Author: Dongjoon Hyun <[email protected]>
Closes #16522 from dongjoon-hyun/SPARK-19137.
(cherry picked from commit d5b1dc9)
Signed-off-by: Shixiong Zhu <[email protected]>
Member
Author
uzadude
pushed a commit
to uzadude/spark
that referenced
this pull request
Jan 27, 2017
…orrectly
## What changes were proposed in this pull request?
`DataStreamReaderWriterSuite` makes test files in source folder like the followings. Interestingly, the root cause is `withSQLConf` fails to reset `OptionalConfigEntry` correctly. In other words, it resets the config into `Some(undefined)`.
```bash
$ git status
Untracked files:
(use "git add <file>..." to include in what will be committed)
sql/core/%253Cundefined%253E/
sql/core/%3Cundefined%3E/
```
## How was this patch tested?
Manual.
```
build/sbt "project sql" test
git status
```
Author: Dongjoon Hyun <[email protected]>
Closes apache#16522 from dongjoon-hyun/SPARK-19137.
cmonkey
pushed a commit
to cmonkey/spark
that referenced
this pull request
Feb 15, 2017
…orrectly
## What changes were proposed in this pull request?
`DataStreamReaderWriterSuite` makes test files in source folder like the followings. Interestingly, the root cause is `withSQLConf` fails to reset `OptionalConfigEntry` correctly. In other words, it resets the config into `Some(undefined)`.
```bash
$ git status
Untracked files:
(use "git add <file>..." to include in what will be committed)
sql/core/%253Cundefined%253E/
sql/core/%3Cundefined%3E/
```
## How was this patch tested?
Manual.
```
build/sbt "project sql" test
git status
```
Author: Dongjoon Hyun <[email protected]>
Closes apache#16522 from dongjoon-hyun/SPARK-19137.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
What changes were proposed in this pull request?
DataStreamReaderWriterSuitemakes test files in source folder like the followings. Interestingly, the root cause iswithSQLConffails to resetOptionalConfigEntrycorrectly. In other words, it resets the config intoSome(undefined).How was this patch tested?
Manual.