From d05d1fadbe0f773a00ff1d0e96ff9fe90b7b7f06 Mon Sep 17 00:00:00 2001
From: xuchuanyin <xuchuanyin@hust.edu.cn>
Date: Thu, 27 Jul 2017 15:07:25 +0800
Subject: [PATCH] Remove duplicated time-consuming method call

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

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 99a935b000b..2dc3ca3d970 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)
   }
 }