Repository: spark Updated Branches: refs/heads/branch-1.6 8a22275de -> 797e758b1
[SPARK-15541] Casting ConcurrentHashMap to ConcurrentMap (branch-1.6) ## 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 Author: Maciej Brynski <maciej.bryn...@adpilot.pl> Closes #14390 from maver1ck/spark-15541. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/797e758b Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/797e758b Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/797e758b Branch: refs/heads/branch-1.6 Commit: 797e758b16946aa5779cc302f943eafec34c0c39 Parents: 8a22275 Author: Maciej Brynski <maciej.bryn...@adpilot.pl> Authored: Tue Aug 2 16:07:35 2016 -0700 Committer: Sean Owen <so...@cloudera.com> Committed: Tue Aug 2 16:07:35 2016 -0700 ---------------------------------------------------------------------- .../scala/org/apache/spark/sql/catalyst/analysis/Catalog.scala | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/797e758b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Catalog.scala ---------------------------------------------------------------------- diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Catalog.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Catalog.scala index 8f4ce74..e66d2ad 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Catalog.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Catalog.scala @@ -17,7 +17,7 @@ package org.apache.spark.sql.catalyst.analysis -import java.util.concurrent.ConcurrentHashMap +import java.util.concurrent.{ConcurrentHashMap, ConcurrentMap} import scala.collection.JavaConverters._ import scala.collection.mutable @@ -80,7 +80,8 @@ trait Catalog { } class SimpleCatalog(val conf: CatalystConf) extends Catalog { - private[this] val tables = new ConcurrentHashMap[String, LogicalPlan] + private[this] val tables: ConcurrentMap[String, LogicalPlan] = + new ConcurrentHashMap[String, LogicalPlan] override def registerTable(tableIdent: TableIdentifier, plan: LogicalPlan): Unit = { tables.put(getTableName(tableIdent), plan) --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org