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/23 09:31:52 UTC
[05/50] [abbrv] incubator-kylin git commit: simple cube build pass
simple cube build pass
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/6616aeac
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/6616aeac
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/6616aeac
Branch: refs/heads/inverted-index
Commit: 6616aeacd393ea22460a50327fac6c8ce39d0704
Parents: 3deba4b
Author: Li, Yang <ya...@ebay.com>
Authored: Thu Jan 22 11:07:43 2015 +0800
Committer: Li, Yang <ya...@ebay.com>
Committed: Thu Jan 22 11:07:43 2015 +0800
----------------------------------------------------------------------
.../src/main/java/com/kylinolap/cube/CubeManager.java | 6 ++++--
.../src/main/java/com/kylinolap/cube/CubeSegment.java | 14 ++++++++------
2 files changed, 12 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/6616aeac/cube/src/main/java/com/kylinolap/cube/CubeManager.java
----------------------------------------------------------------------
diff --git a/cube/src/main/java/com/kylinolap/cube/CubeManager.java b/cube/src/main/java/com/kylinolap/cube/CubeManager.java
index d955c40..aabac93 100644
--- a/cube/src/main/java/com/kylinolap/cube/CubeManager.java
+++ b/cube/src/main/java/com/kylinolap/cube/CubeManager.java
@@ -315,9 +315,11 @@ public class CubeManager implements IRealizationProvider {
CubeSegment newSegment;
if (cubeInstance.getDescriptor().getCubePartitionDesc().isPartitioned()) {
if (readySegments.isEmpty()) {
- newSegment = buildSegment(cubeInstance, cubeInstance.getDescriptor().getCubePartitionDesc().getPartitionDateStart(), endDate);
+ startDate = cubeInstance.getDescriptor().getCubePartitionDesc().getPartitionDateStart();
+ newSegment = buildSegment(cubeInstance, startDate, endDate);
} else {
- newSegment = buildSegment(cubeInstance, readySegments.get(readySegments.size() - 1).getDateRangeEnd(), endDate);
+ startDate = readySegments.get(readySegments.size() - 1).getDateRangeEnd();
+ newSegment = buildSegment(cubeInstance, startDate, endDate);
}
} else {
newSegment = buildSegment(cubeInstance, 0, Long.MAX_VALUE);
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/6616aeac/cube/src/main/java/com/kylinolap/cube/CubeSegment.java
----------------------------------------------------------------------
diff --git a/cube/src/main/java/com/kylinolap/cube/CubeSegment.java b/cube/src/main/java/com/kylinolap/cube/CubeSegment.java
index 3b3ed2c..ff1001e 100644
--- a/cube/src/main/java/com/kylinolap/cube/CubeSegment.java
+++ b/cube/src/main/java/com/kylinolap/cube/CubeSegment.java
@@ -271,13 +271,15 @@ public class CubeSegment implements Comparable<CubeSegment>, ISegment {
@Override
public int compareTo(CubeSegment other) {
- if (this.dateRangeEnd < other.dateRangeEnd) {
- return -1;
- } else if (this.dateRangeEnd > other.dateRangeEnd) {
- return 1;
- } else {
+ long comp = this.dateRangeStart - other.dateRangeStart;
+ if (comp != 0)
+ return comp < 0 ? -1 : 1;
+
+ comp = this.dateRangeEnd - other.dateRangeEnd;
+ if (comp != 0)
+ return comp < 0 ? -1 : 1;
+ else
return 0;
- }
}
@Override