Skip to content

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

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
maver1ck wants to merge 5 commits into from
Closed

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

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
921e3c8
[SPARK-15541] Casting ConcurrentHashMap to ConcurrentMap
Jul 28, 2016
3ffbff1
Fix for style error
Jul 28, 2016
7bd4f44
Fix whitespaces
Jul 28, 2016
ea2810f
Remove changes in Dispatcher.scala #14459
Aug 2, 2016
f009ee7
Second fix in Catalog.scala
Aug 4, 2016
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: 5 additions & 3 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/Catalog.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -129,7 +130,8 @@ class SimpleCatalog(val conf: CatalystConf) extends Catalog {
* lost when the JVM exits.
*/
trait OverrideCatalog extends Catalog {
private[this] val overrides = new ConcurrentHashMap[String, LogicalPlan]
private[this] val overrides: ConcurrentMap[String, LogicalPlan] =
new ConcurrentHashMap[String, LogicalPlan]

private def getOverriddenTable(tableIdent: TableIdentifier): Option[LogicalPlan] = {
if (tableIdent.database.isDefined) {
Expand Down