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/06/14 01:31:19 UTC

[kylin] branch KYLIN-3404 created (now 05b0904)

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

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


      at 05b0904  KYLIN-3404 The last optimized time not showing up on cube planner tab

This branch includes the following new commits:

     new 5b4e1a0  KYLIN-3408 update LICENSE
     new 05b0904  KYLIN-3404 The last optimized time not showing up on cube planner tab

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.


-- 
To stop receiving notification emails like this one, please contact
shaofengshi@apache.org.

[kylin] 01/02: KYLIN-3408 update LICENSE

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

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

commit 5b4e1a064b400c832735a3c19388d7db4c65ce68
Author: shaofengshi <sh...@apache.org>
AuthorDate: Wed Jun 13 15:10:39 2018 +0800

    KYLIN-3408 update LICENSE
---
 LICENSE | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/LICENSE b/LICENSE
index 3cec384..94df266 100644
--- a/LICENSE
+++ b/LICENSE
@@ -206,6 +206,7 @@
 
 ==============================================================================
 Apache Kylin Subcomponents:
+==============================================================================
 
 The Apache Kylin project contains subcomponents with separate copyright
 notices and license terms. Your use of the source code for the these
@@ -234,4 +235,22 @@ For addthis/stream-lib:
 ==============================================================================
 This product copies some Top-K code from addthis/stream-lib, which is under
 Apache License Version 2. For details, see
-https://github.com/addthis/stream-lib/blob/master/LICENSE.txt
\ No newline at end of file
+https://github.com/addthis/stream-lib/blob/master/LICENSE.txt
+
+
+==============================================================================
+For amient/kafka-hadoop-loader:
+==============================================================================
+This library is open sourced under Apache License Version 2. For details, see
+https://github.com/michal-harish/kafka-hadoop-loader/blob/master/LICENSE
+
+
+==============================================================================
+For RocksDB:
+==============================================================================
+RocksDB is dual-licensed under both the GPLv2 and Apache 2.0 License.You may
+select, at your option, one of the above-listed licenses.
+https://github.com/facebook/rocksdb/blob/master/LICENSE.Apache
+
+
+

-- 
To stop receiving notification emails like this one, please contact
shaofengshi@apache.org.

[kylin] 02/02: KYLIN-3404 The last optimized time not showing up on cube planner tab

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

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

commit 05b0904f2d1bef8fc6ad7144cd3a92f08bd191a0
Author: ycq <yc...@meitu.com>
AuthorDate: Tue Jun 12 23:31:03 2018 +0800

    KYLIN-3404 The last optimized time not showing up on cube planner tab
    
    Signed-off-by: shaofengshi <sh...@apache.org>
---
 .../java/org/apache/kylin/job/execution/CheckpointExecutable.java  | 7 ++++---
 .../java/org/apache/kylin/rest/response/CubeInstanceResponse.java  | 1 +
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/core-job/src/main/java/org/apache/kylin/job/execution/CheckpointExecutable.java b/core-job/src/main/java/org/apache/kylin/job/execution/CheckpointExecutable.java
index c5f1c0a..779809a 100644
--- a/core-job/src/main/java/org/apache/kylin/job/execution/CheckpointExecutable.java
+++ b/core-job/src/main/java/org/apache/kylin/job/execution/CheckpointExecutable.java
@@ -83,9 +83,10 @@ public class CheckpointExecutable extends DefaultChainedExecutable {
                 // Add last optimization time
                 CubeManager cubeManager = CubeManager.getInstance(executableContext.getConfig());
                 CubeInstance cube = cubeManager.getCube(getCubeName());
-                try{
-                    cube.setCuboidLastOptimized(getEndTime());
-                    CubeUpdate cubeUpdate = new CubeUpdate(cube);
+                CubeInstance copyForWrite = cube.latestCopyForWrite();
+                try {
+                    copyForWrite.setCuboidLastOptimized(getEndTime());
+                    CubeUpdate cubeUpdate = new CubeUpdate(copyForWrite);
                     cubeManager.updateCube(cubeUpdate);
                 } catch (IOException e) {
                     logger.error("Failed to update last optimized for " + getCubeName(), e);
diff --git a/server-base/src/main/java/org/apache/kylin/rest/response/CubeInstanceResponse.java b/server-base/src/main/java/org/apache/kylin/rest/response/CubeInstanceResponse.java
index 19a5ef5..f6f88bd 100644
--- a/server-base/src/main/java/org/apache/kylin/rest/response/CubeInstanceResponse.java
+++ b/server-base/src/main/java/org/apache/kylin/rest/response/CubeInstanceResponse.java
@@ -64,6 +64,7 @@ public class CubeInstanceResponse extends CubeInstance {
         setSegments(cube.getSegments());
         setCreateTimeUTC(cube.getCreateTimeUTC());
         setLastModified(cube.getDescriptor().getLastModified());
+        setCuboidLastOptimized(cube.getCuboidLastOptimized());
 
         this.model = cube.getDescriptor().getModelName();
         this.partitionDateStart = cube.getDescriptor().getPartitionDateStart();

-- 
To stop receiving notification emails like this one, please contact
shaofengshi@apache.org.