You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by sh...@apache.org on 2015/07/20 06:41:33 UTC
[1/2] incubator-kylin git commit: KYLIN-863 Update test case
Repository: incubator-kylin
Updated Branches:
refs/heads/0.7-staging df020d7c7 -> 2f3f4b2a2
KYLIN-863 Update test case
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/2f3f4b2a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/2f3f4b2a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/2f3f4b2a
Branch: refs/heads/0.7-staging
Commit: 2f3f4b2a201b7ddb9ab29272b4ce9e040a2131b5
Parents: 4cf0b67
Author: shaofengshi <sh...@apache.org>
Authored: Mon Jul 20 12:41:08 2015 +0800
Committer: shaofengshi <sh...@apache.org>
Committed: Mon Jul 20 12:41:24 2015 +0800
----------------------------------------------------------------------
cube/src/test/java/org/apache/kylin/cube/CubeSegmentsTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/2f3f4b2a/cube/src/test/java/org/apache/kylin/cube/CubeSegmentsTest.java
----------------------------------------------------------------------
diff --git a/cube/src/test/java/org/apache/kylin/cube/CubeSegmentsTest.java b/cube/src/test/java/org/apache/kylin/cube/CubeSegmentsTest.java
index bbc73db..2d641d8 100644
--- a/cube/src/test/java/org/apache/kylin/cube/CubeSegmentsTest.java
+++ b/cube/src/test/java/org/apache/kylin/cube/CubeSegmentsTest.java
@@ -99,7 +99,7 @@ public class CubeSegmentsTest extends LocalFileMetadataTestCase {
seg2.setStatus(SegmentStatusEnum.READY);
// merge first and second
- CubeSegment merge = mgr.mergeSegments(cube, 0, 2000, false);
+ CubeSegment merge = mgr.mergeSegments(cube, 0, 2000, true);
assertEquals(3, cube.getSegments().size());
assertEquals(0, merge.getDateRangeStart());
[2/2] incubator-kylin git commit: KYLIN-897 Update CubeMigrationCLI
to copy data model info
Posted by sh...@apache.org.
KYLIN-897 Update CubeMigrationCLI to copy data model info
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/4cf0b67b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/4cf0b67b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/4cf0b67b
Branch: refs/heads/0.7-staging
Commit: 4cf0b67b8526480d8f4b2f3714e9a99c823b3b85
Parents: df020d7
Author: shaofengshi <sh...@apache.org>
Authored: Mon Jul 20 11:45:05 2015 +0800
Committer: shaofengshi <sh...@apache.org>
Committed: Mon Jul 20 12:41:24 2015 +0800
----------------------------------------------------------------------
.../main/java/org/apache/kylin/job/tools/CubeMigrationCLI.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/4cf0b67b/job/src/main/java/org/apache/kylin/job/tools/CubeMigrationCLI.java
----------------------------------------------------------------------
diff --git a/job/src/main/java/org/apache/kylin/job/tools/CubeMigrationCLI.java b/job/src/main/java/org/apache/kylin/job/tools/CubeMigrationCLI.java
index a5904fc..b71725d 100644
--- a/job/src/main/java/org/apache/kylin/job/tools/CubeMigrationCLI.java
+++ b/job/src/main/java/org/apache/kylin/job/tools/CubeMigrationCLI.java
@@ -31,6 +31,7 @@ import org.apache.kylin.dict.DictionaryManager;
import org.apache.kylin.dict.lookup.SnapshotManager;
import org.apache.kylin.dict.lookup.SnapshotTable;
import org.apache.kylin.job.JobInstance;
+import org.apache.kylin.metadata.model.DataModelDesc;
import org.apache.kylin.metadata.model.SegmentStatusEnum;
import org.apache.kylin.metadata.model.TableDesc;
import org.apache.kylin.metadata.project.ProjectInstance;
@@ -209,6 +210,7 @@ public class CubeMigrationCLI {
CubeDesc cubeDesc = cube.getDescriptor();
metaResource.add(cube.getResourcePath());
metaResource.add(cubeDesc.getResourcePath());
+ metaResource.add(DataModelDesc.concatResourcePath(cubeDesc.getModelName()));
for (String table : cubeDesc.getModel().getAllTables()) {
metaResource.add(TableDesc.concatResourcePath(table.toUpperCase()));
@@ -386,7 +388,7 @@ public class CubeMigrationCLI {
Serializer<ProjectInstance> projectSerializer = new JsonSerializer<ProjectInstance>(ProjectInstance.class);
ProjectInstance project = dstStore.getResource(projectResPath, ProjectInstance.class, projectSerializer);
project.removeRealization(RealizationType.CUBE, cubeName);
- project.removeRealization(RealizationType.CUBE, cubeName);
+ project.addRealizationEntry(RealizationType.CUBE, cubeName);
dstStore.putResource(projectResPath, project, projectSerializer);
logger.info("Project instance for " + projectName + " is corrected");
break;