Skip to content

[SPARK-5355] use j.u.c.ConcurrentHashMap instead of TrieMap #4208

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

Jump to bottom
Closed
davies wants to merge 6 commits into from
Closed

[SPARK-5355] use j.u.c.ConcurrentHashMap instead of TrieMap #4208

davies wants to merge 6 commits into from

Conversation

@davies
Copy link
Contributor

@davies davies commented Jan 26, 2015

j.u.c.ConcurrentHashMap is more battle tested.

cc @rxin @JoshRosen @pwendell

@SparkQA
Copy link

SparkQA commented Jan 26, 2015

Test build #26097 has started for PR 4208 at commit da14ced.

  • This patch merges cleanly.

@SparkQA
Copy link

SparkQA commented Jan 26, 2015

Test build #26097 has finished for PR 4208 at commit da14ced.

  • This patch fails Spark unit tests.
  • This patch merges cleanly.
  • This patch adds no public classes.

@AmplabJenkins
Copy link

AmplabJenkins commented Jan 26, 2015

Test FAILed.
Refer to this link for build results (access rights to CI server needed):
https://amplab.cs.berkeley.edu/jenkins//job/SparkPullRequestBuilder/26097/
Test FAILed.

@SparkQA
Copy link

SparkQA commented Jan 26, 2015

Test build #26098 has started for PR 4208 at commit 3a1d821.

  • This patch merges cleanly.

@SparkQA
Copy link

SparkQA commented Jan 26, 2015

Test build #26098 has finished for PR 4208 at commit 3a1d821.

  • This patch fails Spark unit tests.
  • This patch merges cleanly.
  • This patch adds no public classes.

@AmplabJenkins
Copy link

AmplabJenkins commented Jan 26, 2015

Test FAILed.
Refer to this link for build results (access rights to CI server needed):
https://amplab.cs.berkeley.edu/jenkins//job/SparkPullRequestBuilder/26098/
Test FAILed.

vanzin
vanzin reviewed Jan 26, 2015
View reviewed changes
core/src/main/scala/org/apache/spark/SparkConf.scala Outdated
Copy link
Contributor

@vanzin vanzin Jan 26, 2015

Choose a reason for hiding this comment

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

nit: import order is wrong.

@vanzin
Copy link
Contributor

vanzin commented Jan 26, 2015

LGTM. It would probably be more efficient to have a private getOrElse implementation instead of using getOption(...).getOrElse(), but probably not worth the hassle.

rxin
rxin reviewed Jan 26, 2015
View reviewed changes
core/src/main/scala/org/apache/spark/SparkConf.scala Outdated
Copy link
Contributor

@rxin rxin Jan 26, 2015

Choose a reason for hiding this comment

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

while you are at it, define the return type explicitly here (java.util.Map?) since it is non private type

@SparkQA
Copy link

SparkQA commented Jan 26, 2015

Test build #26105 has started for PR 4208 at commit c2182dc.

  • This patch merges cleanly.

@SparkQA
Copy link

SparkQA commented Jan 26, 2015

Test build #26105 has finished for PR 4208 at commit c2182dc.

  • This patch passes all tests.
  • This patch merges cleanly.
  • This patch adds no public classes.

@AmplabJenkins
Copy link

AmplabJenkins commented Jan 26, 2015

Test PASSed.
Refer to this link for build results (access rights to CI server needed):
https://amplab.cs.berkeley.edu/jenkins//job/SparkPullRequestBuilder/26105/
Test PASSed.

@rxin
Copy link
Contributor

rxin commented Jan 26, 2015

Merging in master. Thanks.

@asfgit asfgit closed this in 1420931 Jan 26, 2015
@davies
Copy link
Contributor Author

davies commented Jan 26, 2015

@pwendell Should we also include this in 1.2.1?

@JoshRosen
Copy link
Contributor

JoshRosen commented Jan 26, 2015

Yes, let's put it in 1.2.1 as well, since the other patch went in to that branch, too.

asfgit pushed a commit that referenced this pull request Jan 26, 2015
@JoshRosen
[SPARK-5355] use j.u.c.ConcurrentHashMap instead of TrieMap
ef6fe84 
j.u.c.ConcurrentHashMap is more battle tested.

cc rxin JoshRosen pwendell

Author: Davies Liu <davies@databricks.com>

Closes #4208 from davies/safe-conf and squashes the following commits:

c2182dc [Davies Liu] address comments, fix tests
3a1d821 [Davies Liu] fix test
da14ced [Davies Liu] Merge branch 'master' of github.com:apache/spark into safe-conf
ae4d305 [Davies Liu] change to j.u.c.ConcurrentMap
f8fa1cf [Davies Liu] change to TrieMap
a1d769a [Davies Liu] make SparkConf thread-safe

(cherry picked from commit 1420931)
Signed-off-by: Josh Rosen <joshrosen@databricks.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@davies @SparkQA @AmplabJenkins @vanzin @rxin @JoshRosen