From 88e0f2d5cddad58e47cfa60485a745e9827789fd Mon Sep 17 00:00:00 2001 From: Patrick Wendell Date: Mon, 2 Feb 2015 16:33:46 -0800 Subject: Revert "[SPARK-5195][sql]Update HiveMetastoreCatalog.scala(override the MetastoreRelation's sameresult method only compare databasename and table name)" This reverts commit 54864403c4f132d9c1380c015122a849dd44dff8. --- .../scala/org/apache/spark/sql/hive/HiveMetastoreCatalog.scala | 9 --------- .../test/scala/org/apache/spark/sql/hive/CachedTableSuite.scala | 6 ------ 2 files changed, 15 deletions(-) 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 index 1f562accd9..bbf6752a56 100644 --- 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 @@ -522,15 +522,6 @@ private[hive] case class MetastoreRelation } ) - /** Only compare database and tablename, not alias. */ - override def sameResult(plan: LogicalPlan): Boolean = { - plan match { - case mr: MetastoreRelation => - mr.databaseName == databaseName && mr.tableName == tableName - case _ => false - } - } - val tableDesc = HiveShim.getTableDesc( Class.forName( hiveQlTable.getSerializationLib, diff --git a/sql/hive/src/test/scala/org/apache/spark/sql/hive/CachedTableSuite.scala b/sql/hive/src/test/scala/org/apache/spark/sql/hive/CachedTableSuite.scala index 1ff04e9d86..f95a6b43af 100644 --- a/sql/hive/src/test/scala/org/apache/spark/sql/hive/CachedTableSuite.scala +++ b/sql/hive/src/test/scala/org/apache/spark/sql/hive/CachedTableSuite.scala @@ -64,12 +64,6 @@ class CachedTableSuite extends QueryTest { sql("SELECT * FROM src"), preCacheResults) - assertCached(sql("SELECT * FROM src s")) - - checkAnswer( - sql("SELECT * FROM src s"), - preCacheResults) - uncacheTable("src") assertCached(sql("SELECT * FROM src"), 0) } -- cgit v1.2.3