kylin-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mahong...@apache.org
Subject kylin git commit: KYLIN-1821 remaining
Date Sat, 25 Jun 2016 13:19:40 GMT
Repository: kylin
Updated Branches:
  refs/heads/master 81e3b2cd3 -> ef226f601


KYLIN-1821 remaining


Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/ef226f60
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/ef226f60
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/ef226f60

Branch: refs/heads/master
Commit: ef226f60155cbbbc9783e59c9459d09ca6ecb167
Parents: 81e3b2c
Author: Hongbin Ma <mahongbin@apache.org>
Authored: Sat Jun 25 21:19:29 2016 +0800
Committer: Hongbin Ma <mahongbin@apache.org>
Committed: Sat Jun 25 21:19:29 2016 +0800

----------------------------------------------------------------------
 .../src/main/java/org/apache/kylin/cube/model/CubeDesc.java      | 4 ++--
 .../src/main/java/org/apache/kylin/rest/service/UserService.java | 2 +-
 .../org/apache/kylin/storage/hbase/util/CubeMigrationCLI.java    | 3 +--
 3 files changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kylin/blob/ef226f60/core-cube/src/main/java/org/apache/kylin/cube/model/CubeDesc.java
----------------------------------------------------------------------
diff --git a/core-cube/src/main/java/org/apache/kylin/cube/model/CubeDesc.java b/core-cube/src/main/java/org/apache/kylin/cube/model/CubeDesc.java
index 7d9c058..fbdeeb7 100644
--- a/core-cube/src/main/java/org/apache/kylin/cube/model/CubeDesc.java
+++ b/core-cube/src/main/java/org/apache/kylin/cube/model/CubeDesc.java
@@ -710,13 +710,13 @@ public class CubeDesc extends RootPersistentEntity {
 
             if ((colStrs == null && dim.isDerived()) || ("{FK}".equalsIgnoreCase(colStrs)))
{
                 // when column is omitted, special case
-                
+
                 for (TblColRef col : join.getForeignKeyColumns()) {
                     dimCols.add(initDimensionColRef(col));
                 }
             } else {
                 // normal case
-                
+
                 if (StringUtils.isEmpty(colStrs))
                     throw new IllegalStateException("Dimension column must not be blank "
+ dim);
 

http://git-wip-us.apache.org/repos/asf/kylin/blob/ef226f60/server/src/main/java/org/apache/kylin/rest/service/UserService.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/kylin/rest/service/UserService.java b/server/src/main/java/org/apache/kylin/rest/service/UserService.java
index c1f4e98..07c7c6f 100644
--- a/server/src/main/java/org/apache/kylin/rest/service/UserService.java
+++ b/server/src/main/java/org/apache/kylin/rest/service/UserService.java
@@ -279,7 +279,7 @@ public class UserService implements UserDetailsManager {
                 return false;
             return true;
         }
-        
+
         @Override
         public String toString() {
             return authority;

http://git-wip-us.apache.org/repos/asf/kylin/blob/ef226f60/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/CubeMigrationCLI.java
----------------------------------------------------------------------
diff --git a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/CubeMigrationCLI.java
b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/CubeMigrationCLI.java
index 3f67e5c..32aa4b0 100644
--- a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/CubeMigrationCLI.java
+++ b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/CubeMigrationCLI.java
@@ -541,8 +541,7 @@ public class CubeMigrationCLI {
             logger.info("Undo for PURGE_AND_DISABLE is not supported");
             break;
         }
-        default:
-        {
+        default: {
             //do nothing
             break;
         }


Mime
View raw message