You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by li...@apache.org on 2016/08/08 23:47:36 UTC
kylin git commit: minor, code refactor
Repository: kylin
Updated Branches:
refs/heads/master 2f166580c -> a0d8ab988
minor, code refactor
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/a0d8ab98
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/a0d8ab98
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/a0d8ab98
Branch: refs/heads/master
Commit: a0d8ab98874ceb1c1d69d6cb7bfc923077a30056
Parents: 2f16658
Author: Yang Li <li...@apache.org>
Authored: Tue Aug 9 07:47:26 2016 +0800
Committer: Yang Li <li...@apache.org>
Committed: Tue Aug 9 07:47:26 2016 +0800
----------------------------------------------------------------------
core-cube/src/main/java/org/apache/kylin/cube/CubeInstance.java | 5 -----
.../java/org/apache/kylin/metadata/project/ProjectInstance.java | 1 +
.../org/apache/kylin/metadata/realization/IRealization.java | 1 -
.../java/org/apache/kylin/storage/hybrid/HybridInstance.java | 5 -----
.../main/java/org/apache/kylin/storage/hbase/HBaseStorage.java | 2 +-
5 files changed, 2 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/a0d8ab98/core-cube/src/main/java/org/apache/kylin/cube/CubeInstance.java
----------------------------------------------------------------------
diff --git a/core-cube/src/main/java/org/apache/kylin/cube/CubeInstance.java b/core-cube/src/main/java/org/apache/kylin/cube/CubeInstance.java
index ce12ac8..90da59d 100644
--- a/core-cube/src/main/java/org/apache/kylin/cube/CubeInstance.java
+++ b/core-cube/src/main/java/org/apache/kylin/cube/CubeInstance.java
@@ -404,11 +404,6 @@ public class CubeInstance extends RootPersistentEntity implements IRealization,
return endTime;
}
- @Override
- public String getModelName() {
- return this.getDescriptor().getModelName();
- }
-
public int getRowKeyColumnCount() {
return getDescriptor().getRowkey().getRowKeyColumns().length;
}
http://git-wip-us.apache.org/repos/asf/kylin/blob/a0d8ab98/core-metadata/src/main/java/org/apache/kylin/metadata/project/ProjectInstance.java
----------------------------------------------------------------------
diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/project/ProjectInstance.java b/core-metadata/src/main/java/org/apache/kylin/metadata/project/ProjectInstance.java
index 2b4c4d4..1afc603 100644
--- a/core-metadata/src/main/java/org/apache/kylin/metadata/project/ProjectInstance.java
+++ b/core-metadata/src/main/java/org/apache/kylin/metadata/project/ProjectInstance.java
@@ -41,6 +41,7 @@ import com.google.common.collect.Lists;
/**
* Project is a concept in Kylin similar to schema in DBMS
*/
+@SuppressWarnings("serial")
@JsonAutoDetect(fieldVisibility = Visibility.NONE, getterVisibility = Visibility.NONE, isGetterVisibility = Visibility.NONE, setterVisibility = Visibility.NONE)
public class ProjectInstance extends RootPersistentEntity {
http://git-wip-us.apache.org/repos/asf/kylin/blob/a0d8ab98/core-metadata/src/main/java/org/apache/kylin/metadata/realization/IRealization.java
----------------------------------------------------------------------
diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/realization/IRealization.java b/core-metadata/src/main/java/org/apache/kylin/metadata/realization/IRealization.java
index 10a810b..fda05ce 100644
--- a/core-metadata/src/main/java/org/apache/kylin/metadata/realization/IRealization.java
+++ b/core-metadata/src/main/java/org/apache/kylin/metadata/realization/IRealization.java
@@ -57,5 +57,4 @@ public interface IRealization extends IStorageAware {
public long getDateRangeEnd();
- public String getModelName();
}
http://git-wip-us.apache.org/repos/asf/kylin/blob/a0d8ab98/core-storage/src/main/java/org/apache/kylin/storage/hybrid/HybridInstance.java
----------------------------------------------------------------------
diff --git a/core-storage/src/main/java/org/apache/kylin/storage/hybrid/HybridInstance.java b/core-storage/src/main/java/org/apache/kylin/storage/hybrid/HybridInstance.java
index 556bce7..a0262e3 100644
--- a/core-storage/src/main/java/org/apache/kylin/storage/hybrid/HybridInstance.java
+++ b/core-storage/src/main/java/org/apache/kylin/storage/hybrid/HybridInstance.java
@@ -257,11 +257,6 @@ public class HybridInstance extends RootPersistentEntity implements IRealization
}
@Override
- public String getModelName() {
- return this.getLatestRealization().getModelName();
- }
-
- @Override
public List<TblColRef> getAllDimensions() {
init();
return allDimensions;
http://git-wip-us.apache.org/repos/asf/kylin/blob/a0d8ab98/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/HBaseStorage.java
----------------------------------------------------------------------
diff --git a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/HBaseStorage.java b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/HBaseStorage.java
index e7a322c..f4dfd2b 100644
--- a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/HBaseStorage.java
+++ b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/HBaseStorage.java
@@ -75,7 +75,7 @@ public class HBaseStorage implements IStorage {
}
private static TblColRef getPartitionCol(IRealization realization) {
- String modelName = realization.getModelName();
+ String modelName = realization.getDataModelDesc().getName();
DataModelDesc dataModelDesc = MetadataManager.getInstance(KylinConfig.getInstanceFromEnv()).getDataModelDesc(modelName);
PartitionDesc partitionDesc = dataModelDesc.getPartitionDesc();
Preconditions.checkArgument(partitionDesc != null, "PartitionDesc for " + realization + " is null!");