You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by li...@apache.org on 2016/09/27 00:26:28 UTC
[35/50] [abbrv] kylin git commit: KYLIN-2047 Remove ineffective null
check in MetadataManager
KYLIN-2047 Remove ineffective null check in MetadataManager
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/afa350f0
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/afa350f0
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/afa350f0
Branch: refs/heads/1.5.x-HBase1.x
Commit: afa350f0018fce4d34692fb0a1616829e11977ae
Parents: a346db5
Author: lidongsjtu <li...@apache.org>
Authored: Sat Sep 24 10:32:47 2016 +0800
Committer: lidongsjtu <li...@apache.org>
Committed: Sat Sep 24 10:42:46 2016 +0800
----------------------------------------------------------------------
.../java/org/apache/kylin/metadata/MetadataManager.java | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/afa350f0/core-metadata/src/main/java/org/apache/kylin/metadata/MetadataManager.java
----------------------------------------------------------------------
diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/MetadataManager.java b/core-metadata/src/main/java/org/apache/kylin/metadata/MetadataManager.java
index 9be3faf..8d77131 100644
--- a/core-metadata/src/main/java/org/apache/kylin/metadata/MetadataManager.java
+++ b/core-metadata/src/main/java/org/apache/kylin/metadata/MetadataManager.java
@@ -263,7 +263,7 @@ public class MetadataManager {
reloadAllSourceTableExd();
reloadAllDataModel();
reloadAllExternalFilter();
-
+
// touch lower level metadata before registering my listener
Broadcaster.getInstance(config).registerListener(new SrcTableSyncListener(), "table");
Broadcaster.getInstance(config).registerListener(new SrcTableExtSyncListener(), "table_ext");
@@ -283,7 +283,7 @@ public class MetadataManager {
srcTableMap.removeLocal(cacheKey);
else
reloadSourceTable(cacheKey);
-
+
for (ProjectInstance prj : ProjectManager.getInstance(config).findProjectsByTable(cacheKey)) {
broadcaster.notifyProjectSchemaUpdate(prj.getName());
}
@@ -302,7 +302,7 @@ public class MetadataManager {
srcTableExdMap.removeLocal(cacheKey);
else
reloadSourceTableExt(cacheKey);
-
+
for (ProjectInstance prj : ProjectManager.getInstance(config).findProjectsByTable(cacheKey)) {
broadcaster.notifyProjectSchemaUpdate(prj.getName());
}
@@ -328,7 +328,7 @@ public class MetadataManager {
dataModelDescMap.removeLocal(cacheKey);
else
reloadDataModelDesc(cacheKey);
-
+
for (ProjectInstance prj : ProjectManager.getInstance(config).findProjectsByModel(cacheKey)) {
broadcaster.notifyProjectSchemaUpdate(prj.getName());
}
@@ -549,8 +549,7 @@ public class MetadataManager {
public DataModelDesc dropModel(DataModelDesc desc) throws IOException {
logger.info("Dropping model '" + desc.getName() + "'");
ResourceStore store = getStore();
- if (desc != null)
- store.deleteResource(desc.getResourcePath());
+ store.deleteResource(desc.getResourcePath());
// delete model from project
ProjectManager.getInstance(config).removeModelFromProjects(desc.getName());
// clean model cache