You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by ma...@apache.org on 2015/04/03 01:58:43 UTC
spark git commit: [SPARK-5195][sql]Update
HiveMetastoreCatalog.scala(override the MetastoreRelation's sameresult method
only compare databasename and table name)
Repository: spark
Updated Branches:
refs/heads/branch-1.2 d82e73239 -> 2991dd042
[SPARK-5195][sql]Update HiveMetastoreCatalog.scala(override the MetastoreRelation's sameresult method only compare databasename and table name)
override the MetastoreRelation's sameresult method only compare databasename and table name
because in previous :
cache table t1;
select count(*) from t1;
it will read data from memory but the sql below will not,instead it read from hdfs:
select count(*) from t1 t;
because cache data is keyed by logical plan and compare with sameResult ,so when table with alias the same table 's logicalplan is not the same logical plan with out alias so modify the sameresult method only compare databasename and table name
Author: seayi <40...@qq.com>
Author: Michael Armbrust <mi...@databricks.com>
Closes #3898 from seayi/branch-1.2 and squashes the following commits:
8f0c7d2 [seayi] Update CachedTableSuite.scala
a277120 [seayi] Update HiveMetastoreCatalog.scala
8d910aa [seayi] Update HiveMetastoreCatalog.scala
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/2991dd04
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/2991dd04
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/2991dd04
Branch: refs/heads/branch-1.2
Commit: 2991dd04215a4ba5c3367b71ff19de47efae47ca
Parents: d82e732
Author: seayi <40...@qq.com>
Authored: Mon Feb 2 16:06:52 2015 -0800
Committer: Michael Armbrust <mi...@databricks.com>
Committed: Thu Apr 2 16:57:57 2015 -0700
----------------------------------------------------------------------
.../org/apache/spark/sql/hive/HiveMetastoreCatalog.scala | 9 +++++++++
.../scala/org/apache/spark/sql/hive/CachedTableSuite.scala | 6 ++++++
2 files changed, 15 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/2991dd04/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveMetastoreCatalog.scala
----------------------------------------------------------------------
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 bbf6752..1f562ac 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,6 +522,15 @@ 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,
http://git-wip-us.apache.org/repos/asf/spark/blob/2991dd04/sql/hive/src/test/scala/org/apache/spark/sql/hive/CachedTableSuite.scala
----------------------------------------------------------------------
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 f95a6b4..1ff04e9 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,6 +64,12 @@ 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)
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org