[kylin] branch master updated: KYLIN-4753 Merging job stop working after Kylin upgrade

[xxyu]

This is an automated email from the ASF dual-hosted git repository.

xxyu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kylin.git


The following commit(s) were added to refs/heads/master by this push:
     new 3c21e72  KYLIN-4753 Merging job stop working after Kylin upgrade
3c21e72 is described below

commit 3c21e72f6cf149e549a2efe749acdcd328052fa9
Author: Xi Chen <chenx...@qiyi.com>
AuthorDate: Wed Sep 9 19:46:33 2020 +0800

    KYLIN-4753 Merging job stop working after Kylin upgrade
---
 .../src/main/java/org/apache/kylin/rest/service/CubeService.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/server-base/src/main/java/org/apache/kylin/rest/service/CubeService.java 
b/server-base/src/main/java/org/apache/kylin/rest/service/CubeService.java
index 21df411..5caf16b 100644
--- a/server-base/src/main/java/org/apache/kylin/rest/service/CubeService.java
+++ b/server-base/src/main/java/org/apache/kylin/rest/service/CubeService.java
@@ -819,7 +819,7 @@ public class CubeService extends BasicService implements 
InitializingBean {
         final List<CubingJob> jobInstanceList = 
jobService.listJobsByRealizationName(cubeName, projectName,
                 EnumSet.of(ExecutableState.DISCARDED));
         for (CubingJob cubingJob : jobInstanceList) {
-            if (cubingJob.getSegmentName().equals(segmentName)) {
+            if (segmentName.equals(cubingJob.getSegmentName())) {
                 logger.debug("Merge job {} has been discarded before, will not 
merge.", segmentName);
                 return true;
             }