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 2015/03/21 01:28:11 UTC
[07/29] incubator-kylin git commit: KYLIN-644 join table as null
error when build the cube
KYLIN-644 join table as null error when build the cube
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/4a3278c0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/4a3278c0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/4a3278c0
Branch: refs/heads/staging
Commit: 4a3278c085fe03485528d8b7b32916737d74877b
Parents: 53eb20f
Author: Shao Feng, Shi <sh...@ebay.com>
Authored: Tue Mar 17 16:47:16 2015 +0800
Committer: Shao Feng, Shi <sh...@ebay.com>
Committed: Tue Mar 17 16:47:16 2015 +0800
----------------------------------------------------------------------
cube/src/main/java/org/apache/kylin/cube/model/CubeDesc.java | 4 ++++
.../main/java/org/apache/kylin/job/hadoop/AbstractHadoopJob.java | 3 ++-
.../main/java/org/apache/kylin/job/tools/CubeMigrationCLI.java | 4 ++--
3 files changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/4a3278c0/cube/src/main/java/org/apache/kylin/cube/model/CubeDesc.java
----------------------------------------------------------------------
diff --git a/cube/src/main/java/org/apache/kylin/cube/model/CubeDesc.java b/cube/src/main/java/org/apache/kylin/cube/model/CubeDesc.java
index 0c9cf7a..499dd63 100644
--- a/cube/src/main/java/org/apache/kylin/cube/model/CubeDesc.java
+++ b/cube/src/main/java/org/apache/kylin/cube/model/CubeDesc.java
@@ -212,6 +212,10 @@ public class CubeDesc extends RootPersistentEntity {
return functions;
}
+ /**
+ * @deprecated use getModel().getAllTables() instead
+ * @return
+ */
public List<TableDesc> listTables() {
MetadataManager metaMgr = MetadataManager.getInstance(config);
HashSet<String> tableNames = new HashSet<String>();
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/4a3278c0/job/src/main/java/org/apache/kylin/job/hadoop/AbstractHadoopJob.java
----------------------------------------------------------------------
diff --git a/job/src/main/java/org/apache/kylin/job/hadoop/AbstractHadoopJob.java b/job/src/main/java/org/apache/kylin/job/hadoop/AbstractHadoopJob.java
index 087dd04..9cd01a4 100644
--- a/job/src/main/java/org/apache/kylin/job/hadoop/AbstractHadoopJob.java
+++ b/job/src/main/java/org/apache/kylin/job/hadoop/AbstractHadoopJob.java
@@ -231,7 +231,8 @@ public abstract class AbstractHadoopJob extends Configured implements Tool {
dumpList.add(cube.getResourcePath());
dumpList.add(cube.getDescriptor().getModel().getResourcePath());
dumpList.add(cube.getDescriptor().getResourcePath());
- for (TableDesc table : cube.getDescriptor().listTables()) {
+ for (String tableName : cube.getDescriptor().getModel().getAllTables()) {
+ TableDesc table = MetadataManager.getInstance(kylinConfig).getTableDesc(tableName);
dumpList.add(table.getResourcePath());
}
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/4a3278c0/job/src/main/java/org/apache/kylin/job/tools/CubeMigrationCLI.java
----------------------------------------------------------------------
diff --git a/job/src/main/java/org/apache/kylin/job/tools/CubeMigrationCLI.java b/job/src/main/java/org/apache/kylin/job/tools/CubeMigrationCLI.java
index 6fe4a68..a5904fc 100644
--- a/job/src/main/java/org/apache/kylin/job/tools/CubeMigrationCLI.java
+++ b/job/src/main/java/org/apache/kylin/job/tools/CubeMigrationCLI.java
@@ -210,8 +210,8 @@ public class CubeMigrationCLI {
metaResource.add(cube.getResourcePath());
metaResource.add(cubeDesc.getResourcePath());
- for (TableDesc tableDesc : cubeDesc.listTables()) {
- metaResource.add(tableDesc.getResourcePath());
+ for (String table : cubeDesc.getModel().getAllTables()) {
+ metaResource.add(TableDesc.concatResourcePath(table.toUpperCase()));
}
for (CubeSegment segment : cube.getSegments()) {