You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by ch...@apache.org on 2018/01/08 06:02:19 UTC
[2/2] kylin git commit: KYLIN-3048 Give warning when merge with holes,
but allow user to force proceed at the same time
KYLIN-3048 Give warning when merge with holes, but allow user to force proceed at the same time
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/39311571
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/39311571
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/39311571
Branch: refs/heads/master
Commit: 393115712af3cd46faa2664e4bdc1431a3b2f135
Parents: 2ee18bc
Author: nichunen <ch...@kyligence.io>
Authored: Sun Jan 7 16:29:14 2018 +0800
Committer: chenzhx <ch...@apache.org>
Committed: Mon Jan 8 14:02:11 2018 +0800
----------------------------------------------------------------------
.../main/java/org/apache/kylin/rest/request/JobBuildRequest.java | 3 ---
webapp/app/js/controllers/cubes.js | 2 +-
2 files changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/39311571/server-base/src/main/java/org/apache/kylin/rest/request/JobBuildRequest.java
----------------------------------------------------------------------
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 0529cb2..270d2d5 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;
}
http://git-wip-us.apache.org/repos/asf/kylin/blob/39311571/webapp/app/js/controllers/cubes.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/controllers/cubes.js b/webapp/app/js/controllers/cubes.js
index dfa26a4..e6f4d71 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:'',