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 2015/01/31 13:02:16 UTC
[49/50] incubator-kylin git commit: fix CI issue
fix CI issue
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/529c3eed
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/529c3eed
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/529c3eed
Branch: refs/heads/inverted-index
Commit: 529c3eed3826cbb581eeef17657ad08b18adc8c9
Parents: 2a97c73
Author: qianhao.zhou <qi...@ebay.com>
Authored: Fri Jan 30 14:04:12 2015 +0800
Committer: qianhao.zhou <qi...@ebay.com>
Committed: Fri Jan 30 14:04:12 2015 +0800
----------------------------------------------------------------------
.../java/com/kylinolap/metadata/MetadataManager.java | 3 +++
.../com/kylinolap/metadata/project/ProjectManager.java | 6 ++++--
.../com/kylinolap/rest/service/CacheServiceTest.java | 11 ++++++-----
3 files changed, 13 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/529c3eed/metadata/src/main/java/com/kylinolap/metadata/MetadataManager.java
----------------------------------------------------------------------
diff --git a/metadata/src/main/java/com/kylinolap/metadata/MetadataManager.java b/metadata/src/main/java/com/kylinolap/metadata/MetadataManager.java
index e08971f..7521d8f 100644
--- a/metadata/src/main/java/com/kylinolap/metadata/MetadataManager.java
+++ b/metadata/src/main/java/com/kylinolap/metadata/MetadataManager.java
@@ -253,6 +253,9 @@ public class MetadataManager {
private TableDesc reloadSourceTableAt(String path) throws IOException {
ResourceStore store = getStore();
TableDesc t = store.getResource(path, TableDesc.class, TABLE_SERIALIZER);
+ if (t == null) {
+ return null;
+ }
t.init();
String tableIdentity = t.getIdentity();
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/529c3eed/metadata/src/main/java/com/kylinolap/metadata/project/ProjectManager.java
----------------------------------------------------------------------
diff --git a/metadata/src/main/java/com/kylinolap/metadata/project/ProjectManager.java b/metadata/src/main/java/com/kylinolap/metadata/project/ProjectManager.java
index 6a81389..13f7b48 100644
--- a/metadata/src/main/java/com/kylinolap/metadata/project/ProjectManager.java
+++ b/metadata/src/main/java/com/kylinolap/metadata/project/ProjectManager.java
@@ -114,8 +114,10 @@ public class ProjectManager {
ResourceStore store = getStore();
ProjectInstance projectInstance = store.getResource(path, ProjectInstance.class, PROJECT_SERIALIZER);
- if (projectInstance == null)
+ if (projectInstance == null) {
+ logger.warn("reload project at path:" + path + " not found, this:" + this.toString());
return null;
+ }
projectInstance.init();
@@ -332,7 +334,7 @@ public class ProjectManager {
}
private String norm(String project) {
- return ProjectInstance.getNormalizedProjectName(project);
+ return project;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/529c3eed/server/src/test/java/com/kylinolap/rest/service/CacheServiceTest.java
----------------------------------------------------------------------
diff --git a/server/src/test/java/com/kylinolap/rest/service/CacheServiceTest.java b/server/src/test/java/com/kylinolap/rest/service/CacheServiceTest.java
index b1fffce..3744fa0 100644
--- a/server/src/test/java/com/kylinolap/rest/service/CacheServiceTest.java
+++ b/server/src/test/java/com/kylinolap/rest/service/CacheServiceTest.java
@@ -89,13 +89,14 @@ public class CacheServiceTest extends LocalFileMetadataTestCase {
@AfterClass
public static void afterClass() throws Exception {
- cleanAfterClass();
server.stop();
+ cleanAfterClass();
}
@Before
public void setUp() throws Exception {
counter.set(0L);
+ createTestMetadata();
}
@After
@@ -126,16 +127,16 @@ public class CacheServiceTest extends LocalFileMetadataTestCase {
}
- private CubeManager getCubeManager(KylinConfig config) throws Exception {
+ private static CubeManager getCubeManager(KylinConfig config) throws Exception {
return CubeManager.getInstance(config);
}
- private ProjectManager getProjectManager(KylinConfig config) throws Exception {
+ private static ProjectManager getProjectManager(KylinConfig config) throws Exception {
return ProjectManager.getInstance(config);
}
- private CubeDescManager getCubeDescManager(KylinConfig config) throws Exception {
+ private static CubeDescManager getCubeDescManager(KylinConfig config) throws Exception {
return CubeDescManager.getInstance(config);
}
- private MetadataManager getMetadataManager(KylinConfig config) throws Exception {
+ private static MetadataManager getMetadataManager(KylinConfig config) throws Exception {
return MetadataManager.getInstance(config);
}