You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by bi...@apache.org on 2018/02/09 13:25:39 UTC
[3/4] kylin git commit: KYLIN-2672 minor code review
KYLIN-2672 minor code review
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/8add1b46
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/8add1b46
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/8add1b46
Branch: refs/heads/2.3.x
Commit: 8add1b461c029591c663221ca3e01363418d1b31
Parents: a88403a
Author: Li Yang <li...@apache.org>
Authored: Mon Feb 5 18:40:48 2018 +0800
Committer: Billy Liu <bi...@apache.org>
Committed: Fri Feb 9 21:25:19 2018 +0800
----------------------------------------------------------------------
core-cube/src/main/java/org/apache/kylin/cube/CubeManager.java | 1 -
.../java/org/apache/kylin/metadata/TableMetadataManager.java | 4 ++--
.../java/org/apache/kylin/metadata/project/ProjectL2Cache.java | 2 +-
.../main/java/org/apache/kylin/rest/service/CacheService.java | 4 ++--
4 files changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/8add1b46/core-cube/src/main/java/org/apache/kylin/cube/CubeManager.java
----------------------------------------------------------------------
diff --git a/core-cube/src/main/java/org/apache/kylin/cube/CubeManager.java b/core-cube/src/main/java/org/apache/kylin/cube/CubeManager.java
index 9c52e8b..dc370e2 100755
--- a/core-cube/src/main/java/org/apache/kylin/cube/CubeManager.java
+++ b/core-cube/src/main/java/org/apache/kylin/cube/CubeManager.java
@@ -385,7 +385,6 @@ public class CubeManager implements IRealizationProvider {
}
}
- // for internal
public CubeInstance reloadCubeQuietly(String cubeName) {
try (AutoLock lock = cubeMapLock.lockForWrite()) {
CubeInstance cube = crud.reloadQuietly(cubeName);
http://git-wip-us.apache.org/repos/asf/kylin/blob/8add1b46/core-metadata/src/main/java/org/apache/kylin/metadata/TableMetadataManager.java
----------------------------------------------------------------------
diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/TableMetadataManager.java b/core-metadata/src/main/java/org/apache/kylin/metadata/TableMetadataManager.java
index 2308df4..42233b7 100644
--- a/core-metadata/src/main/java/org/apache/kylin/metadata/TableMetadataManager.java
+++ b/core-metadata/src/main/java/org/apache/kylin/metadata/TableMetadataManager.java
@@ -151,7 +151,7 @@ public class TableMetadataManager {
}
}
- public void reloadSourceTable(String table, String project) {
+ public void reloadSourceTableQuietly(String table, String project) {
try (AutoLock lock = srcTableMapLock.lockForWrite()) {
srcTableCrud.reloadQuietly(TableDesc.concatResourcePath(table, project));
}
@@ -320,7 +320,7 @@ public class TableMetadataManager {
}
}
- public void reloadTableExt(String table, String project) {
+ public void reloadTableExtQuietly(String table, String project) {
try (AutoLock lock = srcExtMapLock.lockForWrite()) {
srcExtCrud.reloadQuietly(TableExtDesc.concatResourcePath(table, project));
}
http://git-wip-us.apache.org/repos/asf/kylin/blob/8add1b46/core-metadata/src/main/java/org/apache/kylin/metadata/project/ProjectL2Cache.java
----------------------------------------------------------------------
diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/project/ProjectL2Cache.java b/core-metadata/src/main/java/org/apache/kylin/metadata/project/ProjectL2Cache.java
index 6e09ae8..1663c8d 100644
--- a/core-metadata/src/main/java/org/apache/kylin/metadata/project/ProjectL2Cache.java
+++ b/core-metadata/src/main/java/org/apache/kylin/metadata/project/ProjectL2Cache.java
@@ -187,7 +187,7 @@ class ProjectL2Cache {
return result;
}
- public void reloadCacheByProject(String project) {
+ void reloadCacheByProject(String project) {
projectCaches.put(project, loadCache(project));
}
http://git-wip-us.apache.org/repos/asf/kylin/blob/8add1b46/server-base/src/main/java/org/apache/kylin/rest/service/CacheService.java
----------------------------------------------------------------------
diff --git a/server-base/src/main/java/org/apache/kylin/rest/service/CacheService.java b/server-base/src/main/java/org/apache/kylin/rest/service/CacheService.java
index a8771ed..10ab90b 100644
--- a/server-base/src/main/java/org/apache/kylin/rest/service/CacheService.java
+++ b/server-base/src/main/java/org/apache/kylin/rest/service/CacheService.java
@@ -140,8 +140,8 @@ public class CacheService extends BasicService implements InitializingBean {
//table must before model
for (Map.Entry<String, String> entry : tableToProjects.entrySet()) {
//For KYLIN-2717 compatibility, use tableProject not project
- getTableManager().reloadSourceTable(entry.getKey(), entry.getValue());
- getTableManager().reloadTableExt(entry.getKey(), entry.getValue());
+ getTableManager().reloadSourceTableQuietly(entry.getKey(), entry.getValue());
+ getTableManager().reloadTableExtQuietly(entry.getKey(), entry.getValue());
}
logger.info("reload table cache done");