You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@carbondata.apache.org by ja...@apache.org on 2017/07/27 13:32:48 UTC

carbondata git commit: [CARBONDATA-1335] Remove duplicated time-consuming method call

Repository: carbondata
Updated Branches:
  refs/heads/master ded8b4162 -> 7b2d901b1


[CARBONDATA-1335] Remove duplicated time-consuming method call

Carbondata only needs to call the super.lookupRelation only once, we need to remove the useless duplicated method call.

This closes #1199


Project: http://git-wip-us.apache.org/repos/asf/carbondata/repo
Commit: http://git-wip-us.apache.org/repos/asf/carbondata/commit/7b2d901b
Tree: http://git-wip-us.apache.org/repos/asf/carbondata/tree/7b2d901b
Diff: http://git-wip-us.apache.org/repos/asf/carbondata/diff/7b2d901b

Branch: refs/heads/master
Commit: 7b2d901b11e900a1cddcbd7941027a0608ae5c8b
Parents: ded8b41
Author: xuchuanyin <xu...@hust.edu.cn>
Authored: Thu Jul 27 15:07:25 2017 +0800
Committer: Jacky Li <ja...@qq.com>
Committed: Thu Jul 27 21:32:34 2017 +0800

----------------------------------------------------------------------
 .../scala/org/apache/spark/sql/hive/CarbonSessionState.scala | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/carbondata/blob/7b2d901b/integration/spark2/src/main/scala/org/apache/spark/sql/hive/CarbonSessionState.scala
----------------------------------------------------------------------
diff --git a/integration/spark2/src/main/scala/org/apache/spark/sql/hive/CarbonSessionState.scala b/integration/spark2/src/main/scala/org/apache/spark/sql/hive/CarbonSessionState.scala
index 99a935b..2dc3ca3 100644
--- a/integration/spark2/src/main/scala/org/apache/spark/sql/hive/CarbonSessionState.scala
+++ b/integration/spark2/src/main/scala/org/apache/spark/sql/hive/CarbonSessionState.scala
@@ -80,7 +80,8 @@ class CarbonSessionCatalog(
    */
   override def lookupRelation(name: TableIdentifier,
       alias: Option[String]): LogicalPlan = {
-    super.lookupRelation(name, alias) match {
+    val rtnRelation = super.lookupRelation(name, alias)
+    rtnRelation match {
       case SubqueryAlias(_,
           LogicalRelation(carbonDatasourceHadoopRelation: CarbonDatasourceHadoopRelation, _, _),
           _) =>
@@ -89,11 +90,13 @@ class CarbonSessionCatalog(
         refreshRelationFromCache(name, alias, carbonDatasourceHadoopRelation)
       case relation => relation
     }
+
+    rtnRelation
   }
 
   private def refreshRelationFromCache(name: TableIdentifier,
       alias: Option[String],
-      carbonDatasourceHadoopRelation: CarbonDatasourceHadoopRelation): LogicalPlan = {
+      carbonDatasourceHadoopRelation: CarbonDatasourceHadoopRelation): Unit = {
     carbonEnv.carbonMetastore.
       checkSchemasModifiedTimeAndReloadTables(CarbonEnv.getInstance(sparkSession).storePath)
     carbonEnv.carbonMetastore
@@ -106,7 +109,6 @@ class CarbonSessionCatalog(
         }
       case _ =>
     }
-    super.lookupRelation(name, alias)
   }
 }