[kylin] branch master updated: KYLIN-4352 maxHistorySegmentTime should be reasonable

[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 d14eef5  KYLIN-4352 maxHistorySegmentTime should be reasonable
d14eef5 is described below

commit d14eef5fee3ef5a305b35b9121bde28fc2400d9d
Author: XiaoxiangYu <hit_la...@126.com>
AuthorDate: Fri Jun 5 00:08:41 2020 +0800

    KYLIN-4352 maxHistorySegmentTime should be reasonable
---
 .../java/org/apache/kylin/storage/stream/StreamStorageQuery.java    | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git 
a/storage-stream/src/main/java/org/apache/kylin/storage/stream/StreamStorageQuery.java
 
b/storage-stream/src/main/java/org/apache/kylin/storage/stream/StreamStorageQuery.java
index 9656109..7b7868c 100644
--- 
a/storage-stream/src/main/java/org/apache/kylin/storage/stream/StreamStorageQuery.java
+++ 
b/storage-stream/src/main/java/org/apache/kylin/storage/stream/StreamStorageQuery.java
@@ -68,10 +68,14 @@ public class StreamStorageQuery extends CubeStorageQuery {
         long maxHistorySegmentTime = -1;
         StreamingDataQueryPlanner segmentsPlanner = new 
StreamingDataQueryPlanner(cubeInstance.getDescriptor(),
                 request.getFilter());
+        long current = System.currentTimeMillis();
         for (CubeSegment cubeSeg : 
cubeInstance.getSegments(SegmentStatusEnum.READY)) {
             TSRange segmentRange = cubeSeg.getTSRange();
             if (segmentRange.end.v > maxHistorySegmentTime) {
-                maxHistorySegmentTime = cubeSeg.getTSRange().end.v;
+                if (cubeSeg.getTSRange().end.v < current) {
+                    // In normal case, the segment for future time range is 
not reasonable in streaming case
+                    maxHistorySegmentTime = cubeSeg.getTSRange().end.v;
+                }
             }
             CubeSegmentScanner scanner;