[kylin] branch sync updated (db6087b -> d0972f4)

[li...@apache.org]

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

liyang pushed a change to branch sync
in repository https://gitbox.apache.org/repos/asf/kylin.git.


 discard db6087b  one more
 discard 0ebd98b  probing for error
     new d0972f4  KYLIN-3370 bug fix in UpdateCubeInfoAfterOptimizeStep

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (db6087b)
            \
             N -- N -- N   refs/heads/sync (d0972f4)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../kylin/engine/mr/steps/UpdateCubeInfoAfterOptimizeStep.java      | 1 +
 .../test/java/org/apache/kylin/provision/BuildCubeWithEngine.java   | 6 +-----
 2 files changed, 2 insertions(+), 5 deletions(-)

[kylin] 01/01: KYLIN-3370 bug fix in UpdateCubeInfoAfterOptimizeStep

[li...@apache.org]

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

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

commit d0972f41aa4c4fb9b4aee66df382f48653179144
Author: Li Yang <li...@apache.org>
AuthorDate: Thu Jul 5 14:16:01 2018 +0800

    KYLIN-3370 bug fix in UpdateCubeInfoAfterOptimizeStep
---
 .../apache/kylin/engine/mr/steps/UpdateCubeInfoAfterOptimizeStep.java    | 1 +
 .../src/test/java/org/apache/kylin/provision/BuildCubeWithEngine.java    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/UpdateCubeInfoAfterOptimizeStep.java b/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/UpdateCubeInfoAfterOptimizeStep.java
index d013386..03aa616 100644
--- a/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/UpdateCubeInfoAfterOptimizeStep.java
+++ b/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/UpdateCubeInfoAfterOptimizeStep.java
@@ -59,6 +59,7 @@ public class UpdateCubeInfoAfterOptimizeStep extends AbstractExecutable {
         segment.setSizeKB(cubeSizeBytes / 1024);
         segment.setInputRecords(sourceCount);
         segment.setInputRecordsSize(sourceSizeBytes);
+        segment.setDimensionRangeInfoMap(originalSegment.getDimensionRangeInfoMap());
 
         try {
             cubeManager.promoteNewlyOptimizeSegments(cube, segment);
diff --git a/kylin-it/src/test/java/org/apache/kylin/provision/BuildCubeWithEngine.java b/kylin-it/src/test/java/org/apache/kylin/provision/BuildCubeWithEngine.java
index 2f22bd4..16ceede 100644
--- a/kylin-it/src/test/java/org/apache/kylin/provision/BuildCubeWithEngine.java
+++ b/kylin-it/src/test/java/org/apache/kylin/provision/BuildCubeWithEngine.java
@@ -313,6 +313,7 @@ public class BuildCubeWithEngine {
         checkNormalSegRangeInfo(cubeManager.getCube(cubeName));
         if (!buildSegment(cubeName, date2, date3))
             return false;
+        checkNormalSegRangeInfo(cubeManager.getCube(cubeName));
         if (!optimizeCube(cubeName))
             return false;
         checkNormalSegRangeInfo(cubeManager.getCube(cubeName));