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 2016/03/29 04:09:39 UTC
kylin git commit: KYLIN-1540 REST API for deleting segment, fix UT
Repository: kylin
Updated Branches:
refs/heads/1.3.x 125b34b9e -> ed56aca0e
KYLIN-1540 REST API for deleting segment, fix UT
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/ed56aca0
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/ed56aca0
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/ed56aca0
Branch: refs/heads/1.3.x
Commit: ed56aca0eec4e70c78dc1b88ede114810fcc8681
Parents: 125b34b
Author: shaofengshi <sh...@apache.org>
Authored: Tue Mar 29 10:09:22 2016 +0800
Committer: shaofengshi <sh...@apache.org>
Committed: Tue Mar 29 10:09:22 2016 +0800
----------------------------------------------------------------------
cube/src/main/java/org/apache/kylin/cube/CubeInstance.java | 2 +-
.../localmeta/cube/test_kylin_cube_with_slr_ready_3_segments.json | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/ed56aca0/cube/src/main/java/org/apache/kylin/cube/CubeInstance.java
----------------------------------------------------------------------
diff --git a/cube/src/main/java/org/apache/kylin/cube/CubeInstance.java b/cube/src/main/java/org/apache/kylin/cube/CubeInstance.java
index 7773351..7224e78 100644
--- a/cube/src/main/java/org/apache/kylin/cube/CubeInstance.java
+++ b/cube/src/main/java/org/apache/kylin/cube/CubeInstance.java
@@ -292,7 +292,7 @@ public class CubeInstance extends RootPersistentEntity implements IRealization {
public CubeSegment getSegment(String name, SegmentStatusEnum status) {
for (CubeSegment segment : segments) {
- if ((null != segment.getName() && segment.getName().equals(name)) && segment.getStatus() == status) {
+ if ((null != segment.getName() && segment.getName().equals(name)) && (status == null || segment.getStatus() == status)) {
return segment;
}
}
http://git-wip-us.apache.org/repos/asf/kylin/blob/ed56aca0/examples/test_case_data/localmeta/cube/test_kylin_cube_with_slr_ready_3_segments.json
----------------------------------------------------------------------
diff --git a/examples/test_case_data/localmeta/cube/test_kylin_cube_with_slr_ready_3_segments.json b/examples/test_case_data/localmeta/cube/test_kylin_cube_with_slr_ready_3_segments.json
index e39de87..34031f5 100644
--- a/examples/test_case_data/localmeta/cube/test_kylin_cube_with_slr_ready_3_segments.json
+++ b/examples/test_case_data/localmeta/cube/test_kylin_cube_with_slr_ready_3_segments.json
@@ -83,6 +83,5 @@
} ],
"status" : "READY",
"create_time" : null,
- "notify_list" : null,
- "auto_merge_time_ranges" : [2595000000]
+ "notify_list" : null
}
\ No newline at end of file