[kylin] branch kylin-on-parquet-v2 updated: HOTFIX Fix test cases for merging segments

[xxyu]

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

xxyu pushed a commit to branch kylin-on-parquet-v2
in repository https://gitbox.apache.org/repos/asf/kylin.git


The following commit(s) were added to refs/heads/kylin-on-parquet-v2 by this 
push:
     new 24fabdc  HOTFIX Fix test cases for merging segments
24fabdc is described below

commit 24fabdc69201cdb114c18a541ddf2995735a7f09
Author: Zhichao Zhang <441586...@qq.com>
AuthorDate: Tue Sep 1 20:59:05 2020 +0800

    HOTFIX Fix test cases for merging segments
---
 core-cube/src/main/java/org/apache/kylin/cube/CubeManager.java          | 2 +-
 .../test/java/org/apache/kylin/engine/spark/job/SparkCubingJobTest.java | 2 +-
 .../test/java/org/apache/kylin/engine/spark2/NBuildAndQueryTest.java    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

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 6844d64..babae6e 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
@@ -842,7 +842,7 @@ public class CubeManager implements IRealizationProvider {
 
             CubeSegment first = mergingSegments.get(0);
             CubeSegment last = mergingSegments.get(mergingSegments.size() - 1);
-            if (force == false) {
+            if (!force) {
                 checkReadyForMerge(mergingSegments);
             }
 
diff --git 
a/kylin-spark-project/kylin-spark-engine/src/test/java/org/apache/kylin/engine/spark/job/SparkCubingJobTest.java
 
b/kylin-spark-project/kylin-spark-engine/src/test/java/org/apache/kylin/engine/spark/job/SparkCubingJobTest.java
index 7b82b59..0cbe4c0 100644
--- 
a/kylin-spark-project/kylin-spark-engine/src/test/java/org/apache/kylin/engine/spark/job/SparkCubingJobTest.java
+++ 
b/kylin-spark-project/kylin-spark-engine/src/test/java/org/apache/kylin/engine/spark/job/SparkCubingJobTest.java
@@ -147,7 +147,7 @@ public class SparkCubingJobTest extends 
LocalWithSparkSessionTest {
          * Round2. Merge two segments
          */
         CubeSegment firstMergeSeg = cubeMgr.mergeSegments(cubeInstance, new 
SegmentRange.TSRange(date1, date3),
-                null, false);
+                null, true);
         NSparkMergingJob firstMergeJob = NSparkMergingJob.merge(firstMergeSeg, 
"ADMIN");
         jobService.addJob(firstMergeJob);
         // wait job done
diff --git 
a/kylin-spark-project/kylin-spark-test/src/test/java/org/apache/kylin/engine/spark2/NBuildAndQueryTest.java
 
b/kylin-spark-project/kylin-spark-test/src/test/java/org/apache/kylin/engine/spark2/NBuildAndQueryTest.java
index 20e8643..307e2ce 100644
--- 
a/kylin-spark-project/kylin-spark-test/src/test/java/org/apache/kylin/engine/spark2/NBuildAndQueryTest.java
+++ 
b/kylin-spark-project/kylin-spark-test/src/test/java/org/apache/kylin/engine/spark2/NBuildAndQueryTest.java
@@ -224,7 +224,7 @@ public class NBuildAndQueryTest extends 
LocalWithSparkSessionTest {
         Assert.assertEquals(ExecutableState.SUCCEED, state);
 
         // Round 2: Merge two segments
-        state = mergeSegments(cubeName, dateToLong("2010-01-01"), 
dateToLong("2015-01-01"), false);
+        state = mergeSegments(cubeName, dateToLong("2010-01-01"), 
dateToLong("2015-01-01"), true);
         Assert.assertEquals(ExecutableState.SUCCEED, state);
 
         // validate cube segment info