You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by sh...@apache.org on 2018/12/14 03:33:22 UTC

[kylin] branch master updated (ab51ea9 -> f031005)

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

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


    from ab51ea9  set JAVA_HOME before server start or stop (#385)
     new 1358e80  Revert "KYLIN-3648 Use Path as the input of addResource"
     new f031005  KYLIN-3718 Segments in volatile range is more than designated value

The 2 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:
 .../src/main/java/org/apache/kylin/metadata/model/Segments.java         | 2 +-
 .../src/main/java/org/apache/kylin/storage/hbase/HBaseConnection.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


[kylin] 01/02: Revert "KYLIN-3648 Use Path as the input of addResource"

Posted by sh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 1358e801990b1059ddbc4133381a74a77d66105b
Author: shaofengshi <sh...@apache.org>
AuthorDate: Fri Dec 14 11:31:59 2018 +0800

    Revert "KYLIN-3648 Use Path as the input of addResource"
    
    This reverts commit 3bcef1a186b1cb3794f23bb26db8362e68c76335.
---
 .../src/main/java/org/apache/kylin/storage/hbase/HBaseConnection.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/HBaseConnection.java b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/HBaseConnection.java
index bbe9d2e..53e8a68 100644
--- a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/HBaseConnection.java
+++ b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/HBaseConnection.java
@@ -207,7 +207,7 @@ public class HBaseConnection {
             return;
         }
         Configuration hdfsConf = new Configuration(false);
-        hdfsConf.addResource(new Path(hdfsConfigFile));
+        hdfsConf.addResource(hdfsConfigFile);
         Collection<String> nameServices = hdfsConf.getTrimmedStringCollection(DFSConfigKeys.DFS_NAMESERVICES);
         Collection<String> mainNameServices = conf.getTrimmedStringCollection(DFSConfigKeys.DFS_NAMESERVICES);
         for (String serviceId : nameServices) {


[kylin] 02/02: KYLIN-3718 Segments in volatile range is more than designated value

Posted by sh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit f031005e4bd61dc6340c221d9fcbc16fa2024777
Author: Temple Zhou <db...@gmail.com>
AuthorDate: Thu Dec 13 18:34:16 2018 +0800

    KYLIN-3718 Segments in volatile range is more than designated value
---
 .../src/main/java/org/apache/kylin/metadata/model/Segments.java         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/model/Segments.java b/core-metadata/src/main/java/org/apache/kylin/metadata/model/Segments.java
index 6c4c9a3..d66f899 100644
--- a/core-metadata/src/main/java/org/apache/kylin/metadata/model/Segments.java
+++ b/core-metadata/src/main/java/org/apache/kylin/metadata/model/Segments.java
@@ -178,7 +178,7 @@ public class Segments<T extends ISegment> extends ArrayList<T> implements Serial
         }
         Segments volatileSegs = new Segments();
         for(T seg: segs) {
-            if(seg.getTSRange().end.v + volatileRange >= latestSegEndTs) {
+            if(seg.getTSRange().end.v + volatileRange > latestSegEndTs) {
                 logger.warn("segment in volatile range: seg:" + seg.toString() +
                         "rangeStart:" + seg.getTSRange().start.v + ", rangeEnd" + seg.getTSRange().end.v);
                 volatileSegs.add(seg);