From 1d0d27265e3ae02e7a9c3fa3c6ebaed184f708b5 Mon Sep 17 00:00:00 2001 From: nichunen Date: Sun, 7 Jan 2018 16:29:14 +0800 Subject: [PATCH] KYLIN-3048 Give warning when merge with holes, but allow user to force proceed at the same time --- .../src/main/java/org/apache/kylin/rest/request/JobBuildRequest.java | 3 --- webapp/app/js/controllers/cubes.js | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/server-base/src/main/java/org/apache/kylin/rest/request/JobBuildRequest.java b/server-base/src/main/java/org/apache/kylin/rest/request/JobBuildRequest.java index 0529cb206..270d2d5e8 100644 --- a/server-base/src/main/java/org/apache/kylin/rest/request/JobBuildRequest.java +++ b/server-base/src/main/java/org/apache/kylin/rest/request/JobBuildRequest.java @@ -28,7 +28,6 @@ public class JobBuildRequest { private boolean force; - @Deprecated private boolean forceMergeEmptySegment = false; public long getStartTime() { @@ -63,12 +62,10 @@ public class JobBuildRequest { this.force = force; } - @Deprecated public boolean isForceMergeEmptySegment() { return forceMergeEmptySegment; } - @Deprecated public void setForceMergeEmptySegment(boolean forceMergeEmptySegment) { this.forceMergeEmptySegment = forceMergeEmptySegment; } diff --git a/webapp/app/js/controllers/cubes.js b/webapp/app/js/controllers/cubes.js index dfa26a4c5..e6f4d719a 100644 --- a/webapp/app/js/controllers/cubes.js +++ b/webapp/app/js/controllers/cubes.js @@ -597,7 +597,7 @@ var jobSubmitCtrl = function ($scope, $modalInstance, CubeService, MessageServic if (e.data && e.data.exception) { var message = e.data.exception; - if(message.indexOf("Empty cube segment found")!=-1){ + if(message.indexOf("Empty cube segment found")!=-1 || message.indexOf("Merging segments must not have gaps between")!=-1){ var _segment = message.substring(message.indexOf(":")+1,message.length-1); SweetAlert.swal({ title:'', -- 2.11.0 (Apple Git-81)