Skip to content

[SPARK-10548] [SPARK-10563] [SQL] Fix concurrent SQL executions #8710

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
andrewor14 wants to merge 11 commits into from
Closed

[SPARK-10548] [SPARK-10563] [SQL] Fix concurrent SQL executions #8710

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
8ceae42
Exclude certain local properties from being inherited
Sep 10, 2015
3ec715c
Fix remove from Properties + add tests
Sep 11, 2015
d48c114
Fix style
Sep 11, 2015
bbda199
Merge branch 'master' of github.com:apache/spark into concurrent-sql-…
Sep 11, 2015
5297f79
Always clone parent properties
Sep 11, 2015
3c00cc6
Merge branch 'master' of github.com:apache/spark into concurrent-sql-…
Sep 11, 2015
801fbe0
Merge branch 'master' of github.com:apache/spark into concurrent-sql-…
Sep 13, 2015
35bb6f0
Limit scope of mutable set
Sep 13, 2015
984a92f
Simplify fix by cloning properties on inherit
Sep 14, 2015
fce3819
Merge branch 'master' of github.com:apache/spark into concurrent-sql-…
Sep 14, 2015
75a8d90
Merge branch 'master' of github.com:apache/spark into concurrent-sql-…
Sep 14, 2015
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
Next Next commit
Fix style
  • Loading branch information
Andrew Or committed Sep 11, 2015
commit d48c11400b11e58d6ee3a4f5d9c330dd1736f25c
5 changes: 2 additions & 3 deletions core/src/main/scala/org/apache/spark/SparkContext.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ import java.util.concurrent.atomic.{AtomicReference, AtomicBoolean, AtomicIntege
import java.util.UUID.randomUUID

import scala.collection.JavaConverters._
import scala.collection.JavaConversions._
import scala.collection.{Map, Set}
import scala.collection.generic.Growable
import scala.collection.mutable.{HashMap, HashSet}
Expand Down Expand Up @@ -353,10 +352,10 @@ class SparkContext(config: SparkConf) extends Logging with ExecutorAllocationCli
if (nonInheritedLocalProperties.nonEmpty) {
// If there are properties that should not be inherited, filter them out
val p = new Properties
val filtered = parent.filter { case (k, _) =>
val filtered = parent.asScala.filter { case (k, _) =>
!nonInheritedLocalProperties.contains(k)
}
p.putAll(filtered)
p.putAll(filtered.asJava)
p
} else {
new Properties(parent)
Expand Down