[SPARK-15541] Casting ConcurrentHashMap to ConcurrentMap (branch-1.6)

[maver1ck]

What changes were proposed in this pull request?

Casting ConcurrentHashMap to ConcurrentMap allows to run code compiled with Java 8 on Java 7

How was this patch tested?

Compilation. Existing automatic tests

[SparkQA]

Test build #62959 has finished for PR 14390 at commit 921e3c8.

• This patch fails Scala style tests.
• This patch merges cleanly.
• This patch adds no public classes.

[SparkQA]

Test build #62960 has finished for PR 14390 at commit 3ffbff1.

• This patch fails Scala style tests.
• This patch merges cleanly.
• This patch adds no public classes.

[SparkQA]

Test build #62963 has finished for PR 14390 at commit 7bd4f44.

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

[maver1ck]

@jkbradley
Could you look at it ?
I think this is problem from: https://issues.apache.org/jira/browse/SPARK-10086
Maybe we should merge this PR to branch-1.6 before testing ?
https://github.com/apache/spark/pull/10909/files

[srowen]

LGTM

[srowen]

... but this needs to be opened vs master first. Don't worry about the flaky test here.

[srowen]

Ping @maver1ck

[maver1ck]

I added another PR #14459 vs master. Using following command to find suspicious code.

for i in `grep -c -R ConcurrentHashMap | grep -v ':0' | sed -e s/:.*//`; do echo $i; grep keySet $i ; done

[srowen]

Can you close this PR please?

[maver1ck]

Could you tell me why ?
We need different PR against different branches.
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Catalog.scala should be modified only in branch-1.6

[srowen]

We merge to master first and then cherry pick into other branches. Unless the patch is quite different in other branches, we can just merge it into others automatically.

[maver1ck]

I know that.
And this patch is quite different. On master there are changes only in Dispatcher.scala.
On branch-1.6 we need changes also in Catalog.scala.

So maybe this patch should add only changes in Catalog.scala ? (and we we'll patch it after #14459)

[maver1ck]

As you merged #14459 I removed changes in Dispatcher.scala.

[SparkQA]

Test build #63131 has finished for PR 14390 at commit ea2810f.

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

[srowen]

Ah, I get it now. I will merge this too then. Thank you.

[srowen]

Merged. @maver1ck you'll have to manually close it since the ASF bot won't close PRs not open vs master.

[maver1ck]

Done.
Thank you.

[maver1ck]

@srowen
I missed one change in Catalog.scala

[zzcclp]

@maver1ck I think you need to open another pr for change in Catalog.scala.

[SparkQA]

Test build #63220 has finished for PR 14390 at commit f009ee7.

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

[srowen]

@maver1ck this is already merged, leave it closed