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 2018/01/21 12:02:18 UTC
[08/13] kylin git commit: KYLIN-3165 fix cannot auto merge bug
KYLIN-3165 fix cannot auto merge bug
Signed-off-by: shaofengshi <sh...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/c3d17452
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/c3d17452
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/c3d17452
Branch: refs/heads/KYLIN-2881-review
Commit: c3d17452a841892d426275fb7ee2f8857ae61914
Parents: a6189a6
Author: yanghao3 <ya...@xiaomi.com>
Authored: Tue Jan 16 11:20:28 2018 +0800
Committer: shaofengshi <sh...@apache.org>
Committed: Wed Jan 17 18:25:20 2018 +0800
----------------------------------------------------------------------
core-cube/src/main/java/org/apache/kylin/cube/CubeManager.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/c3d17452/core-cube/src/main/java/org/apache/kylin/cube/CubeManager.java
----------------------------------------------------------------------
diff --git a/core-cube/src/main/java/org/apache/kylin/cube/CubeManager.java b/core-cube/src/main/java/org/apache/kylin/cube/CubeManager.java
index 1fbbbe6..df1d95e 100755
--- a/core-cube/src/main/java/org/apache/kylin/cube/CubeManager.java
+++ b/core-cube/src/main/java/org/apache/kylin/cube/CubeManager.java
@@ -683,8 +683,10 @@ public class CubeManager implements IRealizationProvider {
tsRange = null;
Preconditions.checkArgument(segRange != null);
} else {
+ if(tsRange == null) {
+ tsRange = new TSRange((Long)segRange.start.v, (Long)segRange.end.v);
+ }
segRange = null;
- Preconditions.checkArgument(tsRange != null);
}
CubeSegment newSegment = newSegment(cubeCopy, tsRange, segRange);