kylin-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From liy...@apache.org
Subject [2/2] kylin git commit: Revert "KYLIN-2846 Add a config of hbase namespace for cube storage"
Date Fri, 15 Sep 2017 08:52:10 GMT
Revert "KYLIN-2846 Add a config of hbase namespace for cube storage"

This reverts commit ffcbdb7f4288fa6011f018163bdce9602415cf10.


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

Branch: refs/heads/master
Commit: e3e361d2e98783bed8a8652974f150acb5dc1acb
Parents: 44a37be
Author: Li Yang <liyang@apache.org>
Authored: Fri Sep 15 15:30:26 2017 +0800
Committer: Li Yang <liyang@apache.org>
Committed: Fri Sep 15 15:30:26 2017 +0800

----------------------------------------------------------------------
 .../src/main/java/org/apache/kylin/common/KylinConfigBase.java   | 4 ----
 core-common/src/main/resources/kylin-defaults.properties         | 3 ---
 core-cube/src/main/java/org/apache/kylin/cube/CubeManager.java   | 2 --
 .../java/org/apache/kylin/storage/hbase/steps/BulkLoadJob.java   | 2 +-
 .../java/org/apache/kylin/storage/hbase/steps/CubeHFileJob.java  | 2 +-
 5 files changed, 2 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kylin/blob/e3e361d2/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java
----------------------------------------------------------------------
diff --git a/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java b/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java
index 425ddde..c120c4b 100644
--- a/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java
+++ b/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java
@@ -720,10 +720,6 @@ abstract public class KylinConfigBase implements Serializable {
         return StorageURL.valueOf(url);
     }
 
-    public String getHBaseStorageNameSpace() {
-        return getOptional("kylin.storage.hbase.namespace", "default");
-    }
-
     public String getHBaseClusterFs() {
         return getOptional("kylin.storage.hbase.cluster-fs", "");
     }

http://git-wip-us.apache.org/repos/asf/kylin/blob/e3e361d2/core-common/src/main/resources/kylin-defaults.properties
----------------------------------------------------------------------
diff --git a/core-common/src/main/resources/kylin-defaults.properties b/core-common/src/main/resources/kylin-defaults.properties
index cdef3dc..c422b42 100644
--- a/core-common/src/main/resources/kylin-defaults.properties
+++ b/core-common/src/main/resources/kylin-defaults.properties
@@ -74,9 +74,6 @@ kylin.source.hive.redistribute-flat-table=true
 # The storage for final cube file in hbase
 kylin.storage.url=hbase
 
-# The namespace for hbase storage
-kylin.storage.hbase.namespace=default
-
 # Compression codec for htable, valid value [none, snappy, lzo, gzip, lz4]
 kylin.storage.hbase.compression-codec=none
 

http://git-wip-us.apache.org/repos/asf/kylin/blob/e3e361d2/core-cube/src/main/java/org/apache/kylin/cube/CubeManager.java
----------------------------------------------------------------------
diff --git a/core-cube/src/main/java/org/apache/kylin/cube/CubeManager.java b/core-cube/src/main/java/org/apache/kylin/cube/CubeManager.java
index 606ce4d..5fd3d1b 100755
--- a/core-cube/src/main/java/org/apache/kylin/cube/CubeManager.java
+++ b/core-cube/src/main/java/org/apache/kylin/cube/CubeManager.java
@@ -684,13 +684,11 @@ public class CubeManager implements IRealizationProvider {
     }
 
     private String generateStorageLocation() {
-        String namespace = config.getHBaseStorageNameSpace();
         String namePrefix = IRealizationConstants.CubeHbaseStorageLocationPrefix;
         String tableName = "";
         Random ran = new Random();
         do {
             StringBuffer sb = new StringBuffer();
-            sb.append(namespace).append(":");
             sb.append(namePrefix);
             for (int i = 0; i < HBASE_TABLE_LENGTH; i++) {
                 sb.append(ALPHA_NUM.charAt(ran.nextInt(ALPHA_NUM.length())));

http://git-wip-us.apache.org/repos/asf/kylin/blob/e3e361d2/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/BulkLoadJob.java
----------------------------------------------------------------------
diff --git a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/BulkLoadJob.java
b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/BulkLoadJob.java
index d1caccb..30616c5 100644
--- a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/BulkLoadJob.java
+++ b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/BulkLoadJob.java
@@ -47,7 +47,7 @@ public class BulkLoadJob extends AbstractHadoopJob {
         options.addOption(OPTION_CUBE_NAME);
         parseOptions(options, args);
 
-        String tableName = getOptionValue(OPTION_HTABLE_NAME);
+        String tableName = getOptionValue(OPTION_HTABLE_NAME).toUpperCase();
         // e.g
         // /tmp/kylin-3f150b00-3332-41ca-9d3d-652f67f044d7/test_kylin_cube_with_slr_ready_2_segments/hfile/
         // end with "/"

http://git-wip-us.apache.org/repos/asf/kylin/blob/e3e361d2/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/CubeHFileJob.java
----------------------------------------------------------------------
diff --git a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/CubeHFileJob.java
b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/CubeHFileJob.java
index 9f9b382..1a624c4 100644
--- a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/CubeHFileJob.java
+++ b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/CubeHFileJob.java
@@ -68,7 +68,7 @@ public class CubeHFileJob extends AbstractHadoopJob {
             Path partitionFilePath = new Path(getOptionValue(OPTION_PARTITION_FILE_PATH));
 
             Path output = new Path(getOptionValue(OPTION_OUTPUT_PATH));
-            String cubeName = getOptionValue(OPTION_CUBE_NAME);
+            String cubeName = getOptionValue(OPTION_CUBE_NAME).toUpperCase();
 
             CubeManager cubeMgr = CubeManager.getInstance(KylinConfig.getInstanceFromEnv());
 


Mime
View raw message