From 8eb3dc509b16b85b9d60dd485a3084e8a750dfcb Mon Sep 17 00:00:00 2001
From: jiazhong <jiazhong@ebay.com>
Date: Fri, 21 Nov 2014 11:26:33 +0800
Subject: [PATCH] remove cache when load hive table

---
 cube/src/main/java/com/kylinolap/cube/project/ProjectManager.java | 6 +++++-
 webapp/app/js/controllers/sourceMeta.js                           | 6 ++++--
 webapp/app/partials/tables/source_table_tree.html                 | 6 +++---
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/cube/src/main/java/com/kylinolap/cube/project/ProjectManager.java b/cube/src/main/java/com/kylinolap/cube/project/ProjectManager.java
index 81b9f68..bfbe282 100644
--- a/cube/src/main/java/com/kylinolap/cube/project/ProjectManager.java
+++ b/cube/src/main/java/com/kylinolap/cube/project/ProjectManager.java
@@ -238,12 +238,16 @@ public void removeCubeFromProjects(String cubeName) throws IOException {
         project = ProjectInstance.getNormalizedProjectName(project);
         ProjectInstance projectInstance = getProject(project);
         
+        int originTableCount = projectInstance.getTablesCount();
         //sync exposed table to project when list
         List<TableDesc> exposedTables = listExposedTables(project);
         for(TableDesc table : exposedTables){
             projectInstance.addTable(table.getName());
         }
-        saveResource(projectInstance);
+        
+        if (originTableCount < projectInstance.getTablesCount()) {
+            saveResource(projectInstance);
+        }
         
         List<TableDesc> tables = Lists.newArrayList();
         for (String table : projectInstance.getTables()) {
diff --git a/webapp/app/js/controllers/sourceMeta.js b/webapp/app/js/controllers/sourceMeta.js
index 36a9b99..658b645 100644
--- a/webapp/app/js/controllers/sourceMeta.js
+++ b/webapp/app/js/controllers/sourceMeta.js
@@ -1,7 +1,8 @@
 'use strict';
 
 KylinApp
-    .controller('SourceMetaCtrl', function ($scope, $q, $window, $routeParams, CubeService, $modal, TableService,$route) {
+    .controller('SourceMetaCtrl', function ($scope,$cacheFactory, $q, $window, $routeParams, CubeService, $modal, TableService,$route) {
+        var $httpDefaultCache = $cacheFactory.get('$http');
         $scope.srcTables = {};
         $scope.srcDbs = [];
         $scope.selectedSrcDb = [];
@@ -55,7 +56,8 @@ KylinApp
             };
             if (forceLoad)
             {
-                param.timestamp = new Date().getTime();
+//                param.timestamp = new Date().getTime();
+                $httpDefaultCache.removeAll();
             }
             TableService.list(param, function (tables) {
                 var tableMap = [];
diff --git a/webapp/app/partials/tables/source_table_tree.html b/webapp/app/partials/tables/source_table_tree.html
index d561bcd..2f4bc1e 100644
--- a/webapp/app/partials/tables/source_table_tree.html
+++ b/webapp/app/partials/tables/source_table_tree.html
@@ -1,13 +1,13 @@
 <div ng-animate="{enter: 'fadeInDown animated'}">
-    <h3 class="text-info">Tables</h3>
+
     <div class="tree-border">
         <div class="row">
             <div class="col-xs-7">
-
+                <h3 class="text-info">Tables</h3>
             </div>
 
             <!--button-->
-            <div class="col-xs-5" style="padding-left: 0px;">
+            <div class="col-xs-5" style="padding-left: 0px;margin-top: 20px;">
                 <span ng-show="hiveTbLoad.status==='loading'" class="ng-hide"><img src="../../image/ajax-loader.gif"> Loading...</span>
                 <div class="pull-right">
                     <a class="btn btn-xs btn-primary" ng-disabled="hiveTbLoad.status==='loading'" tooltip="Load Hive Table"  ng-if="userService.hasRole('ROLE_MODELER')"  ng-click="openModal()"><i class="fa fa-download"></i></a>