Merge pull request #2 from marmbrus/pr/5333

yhuai · yhuai · commit 76670308d548 · 2015-04-02T15:06:33.000-07:00
Correctly lock on MetastoreCatalog
diff --git a/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveMetastoreCatalog.scala b/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveMetastoreCatalog.scala
@@ -67,7 +67,7 @@ private[hive] class HiveMetastoreCatalog(hive: HiveContext) extends Catalog with
     val cacheLoader = new CacheLoader[QualifiedTableName, LogicalPlan]() {
       override def load(in: QualifiedTableName): LogicalPlan = {
         logDebug(s"Creating new cached data source for $in")
-        val table = synchronized {
+        val table = HiveMetastoreCatalog.this.synchronized {
           client.getTable(in.database, in.name)
         }
         val userSpecifiedSchema =

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ private[hive] class HiveMetastoreCatalog(hive: HiveContext) extends Catalog with`
`67`	`67`	`val cacheLoader = new CacheLoader[QualifiedTableName, LogicalPlan]() {`
`68`	`68`	`override def load(in: QualifiedTableName): LogicalPlan = {`
`69`	`69`	`logDebug(s"Creating new cached data source for $in")`
`70`		`- val table = synchronized {`
	`70`	`+ val table = HiveMetastoreCatalog.this.synchronized {`
`71`	`71`	`client.getTable(in.database, in.name)`
`72`	`72`	`}`
`73`	`73`	`val userSpecifiedSchema =`