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/06/30 09:54:09 UTC
incubator-kylin git commit: KYLIN-863 fix compile error
Repository: incubator-kylin
Updated Branches:
refs/heads/0.8 1d0803023 -> 7a67ff8a4
KYLIN-863 fix compile error
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/7a67ff8a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/7a67ff8a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/7a67ff8a
Branch: refs/heads/0.8
Commit: 7a67ff8a481647f81dbe10cff08b017bcbffcee4
Parents: 1d08030
Author: shaofengshi <sh...@apache.org>
Authored: Tue Jun 30 15:54:00 2015 +0800
Committer: shaofengshi <sh...@apache.org>
Committed: Tue Jun 30 15:54:00 2015 +0800
----------------------------------------------------------------------
cube/src/test/java/org/apache/kylin/cube/CubeSegmentsTest.java | 6 +++---
.../apache/kylin/job/hadoop/cube/MergeCuboidMapperTest.java | 2 +-
.../main/java/org/apache/kylin/rest/service/CacheService.java | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/7a67ff8a/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 a7dbb74..94d0925 100644
--- a/cube/src/test/java/org/apache/kylin/cube/CubeSegmentsTest.java
+++ b/cube/src/test/java/org/apache/kylin/cube/CubeSegmentsTest.java
@@ -74,7 +74,7 @@ public class CubeSegmentsTest extends LocalFileMetadataTestCase {
assertEquals(2, cube.getSegments().size());
// non-partitioned cannot merge, throw exception
- mgr.mergeSegments(cube, 0, Long.MAX_VALUE);
+ mgr.mergeSegments(cube, 0, Long.MAX_VALUE, false);
}
@Test
@@ -99,7 +99,7 @@ public class CubeSegmentsTest extends LocalFileMetadataTestCase {
seg2.setStatus(SegmentStatusEnum.READY);
// merge first and second
- CubeSegment merge = mgr.mergeSegments(cube, 0, 2000);
+ CubeSegment merge = mgr.mergeSegments(cube, 0, 2000, false);
assertEquals(3, cube.getSegments().size());
assertEquals(0, merge.getDateRangeStart());
@@ -115,7 +115,7 @@ public class CubeSegmentsTest extends LocalFileMetadataTestCase {
cube.getSegments().remove(merge);
// try merge at start/end at middle of segments
- CubeSegment merge2 = mgr.mergeSegments(cube, 500, 1500);
+ CubeSegment merge2 = mgr.mergeSegments(cube, 500, 1500, false);
assertEquals(3, cube.getSegments().size());
assertEquals(0, merge2.getDateRangeStart());
assertEquals(2000, merge2.getDateRangeEnd());
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/7a67ff8a/job/src/test/java/org/apache/kylin/job/hadoop/cube/MergeCuboidMapperTest.java
----------------------------------------------------------------------
diff --git a/job/src/test/java/org/apache/kylin/job/hadoop/cube/MergeCuboidMapperTest.java b/job/src/test/java/org/apache/kylin/job/hadoop/cube/MergeCuboidMapperTest.java
index b1d37bb..01e57d5 100644
--- a/job/src/test/java/org/apache/kylin/job/hadoop/cube/MergeCuboidMapperTest.java
+++ b/job/src/test/java/org/apache/kylin/job/hadoop/cube/MergeCuboidMapperTest.java
@@ -159,7 +159,7 @@ public class MergeCuboidMapperTest extends LocalFileMetadataTestCase {
// String cubeName = "test_kylin_cube_without_slr_left_join_ready_2_segments";
- CubeSegment newSeg = cubeManager.mergeSegments(cube, 0L, 1386835200000L);
+ CubeSegment newSeg = cubeManager.mergeSegments(cube, 0L, 1386835200000L, false);
// String segmentName = newSeg.getName();
final Dictionary<?> dictionary = cubeManager.getDictionary(newSeg, lfn);
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/7a67ff8a/server/src/main/java/org/apache/kylin/rest/service/CacheService.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/kylin/rest/service/CacheService.java b/server/src/main/java/org/apache/kylin/rest/service/CacheService.java
index 66760a5..6a301ae 100644
--- a/server/src/main/java/org/apache/kylin/rest/service/CacheService.java
+++ b/server/src/main/java/org/apache/kylin/rest/service/CacheService.java
@@ -170,7 +170,7 @@ public class CacheService extends BasicService {
try {
newSeg = getCubeManager().autoMergeCubeSegments(cube);
if (newSeg != null) {
- newSeg = getCubeManager().mergeSegments(cube, newSeg.getDateRangeStart(), newSeg.getDateRangeEnd());
+ newSeg = getCubeManager().mergeSegments(cube, newSeg.getDateRangeStart(), newSeg.getDateRangeEnd(), true);
logger.debug("Will submit merge job on " + newSeg);
CubingJobBuilder builder = new CubingJobBuilder(new JobEngineConfig(getConfig()));
builder.setSubmitter("SYSTEM");