Skip to content

[SPARK-19137][SQL] Fix withSQLConf to reset OptionalConfigEntry correctly #16522

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
dongjoon-hyun wants to merge 3 commits into from
Closed

[SPARK-19137][SQL] Fix withSQLConf to reset OptionalConfigEntry correctly #16522

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bddaa64
[SPARK-19137][SQL][SS] Garbage left in source tree after SQL tests ar…
dongjoon-hyun Jan 9, 2017
efcfb81
Fix `withSQLConf` to reset `OptionalConfigEntry` correctly.
dongjoon-hyun Jan 10, 2017
eceffcb
Address comments.
dongjoon-hyun Jan 10, 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
8 changes: 7 additions & 1 deletion sql/core/src/test/scala/org/apache/spark/sql/test/SQLTestUtils.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,13 @@ private[sql] trait SQLTestUtils
*/
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 =>
Copy link
Contributor

@vanzin vanzin Jan 10, 2017

Choose a reason for hiding this comment

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

I think this can just be keys.flatMap(conf.get). But I'll let Ryan look since he's more involved with this code.

Copy link
Member Author

@dongjoon-hyun dongjoon-hyun Jan 10, 2017

Choose a reason for hiding this comment

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

I see. Thank you, @vanzin .
Could you ping him?

Copy link
Contributor

@vanzin vanzin Jan 10, 2017

Choose a reason for hiding this comment

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

You already did.

Copy link
Member Author

@dongjoon-hyun dongjoon-hyun Jan 10, 2017

Choose a reason for hiding this comment

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

Oh. You meant @zsxwing . I see.

Copy link
Member

@zsxwing zsxwing Jan 10, 2017

Choose a reason for hiding this comment

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

@vanzin conf.get won't work as it will use defaultValueString when the key doesn't exist.

if (spark.conf.contains(key)) {
Some(spark.conf.get(key))
} else {
None
}
}
(keys, values).zipped.foreach(spark.conf.set)
try f finally {
keys.zip(currentValues).foreach {
Expand Down