KYLIN-2514 make left and inner model align Signed-off-by: Hongbin Ma <mahong...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/8b70fa52 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/8b70fa52 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/8b70fa52 Branch: refs/heads/master-hbase0.98 Commit: 8b70fa5210c7c2f95086dd2311d373277161d4ed Parents: 14b96a8 Author: Roger Shi <rogershijich...@hotmail.com> Authored: Fri Mar 17 22:19:16 2017 +0800 Committer: Hongbin Ma <mahong...@apache.org> Committed: Fri Mar 17 23:28:15 2017 +0800 ---------------------------------------------------------------------- .../apache/kylin/metadata/model/JoinsTree.java | 3 ++- .../model_desc/ci_inner_join_model.json | 28 ++++++++++---------- 2 files changed, 16 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/8b70fa52/core-metadata/src/main/java/org/apache/kylin/metadata/model/JoinsTree.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/model/JoinsTree.java b/core-metadata/src/main/java/org/apache/kylin/metadata/model/JoinsTree.java index 3c876a0..224788c 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/model/JoinsTree.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/model/JoinsTree.java @@ -19,6 +19,7 @@ package org.apache.kylin.metadata.model; import java.io.Serializable; +import java.util.ArrayDeque; import java.util.Collections; import java.util.HashMap; import java.util.LinkedHashMap; @@ -59,7 +60,7 @@ public class JoinsTree implements Serializable { } // Width-first build tree (tableChains) - Queue<Chain> chainBuff = Queues.newArrayDeque(); + Queue<Chain> chainBuff = new ArrayDeque<Chain>(); chainBuff.add(new Chain(rootTable, null, null)); int chainCount = 0; while (!chainBuff.isEmpty()) { http://git-wip-us.apache.org/repos/asf/kylin/blob/8b70fa52/examples/test_case_data/localmeta/model_desc/ci_inner_join_model.json ---------------------------------------------------------------------- diff --git a/examples/test_case_data/localmeta/model_desc/ci_inner_join_model.json b/examples/test_case_data/localmeta/model_desc/ci_inner_join_model.json index 19cf721..b79d293 100644 --- a/examples/test_case_data/localmeta/model_desc/ci_inner_join_model.json +++ b/examples/test_case_data/localmeta/model_desc/ci_inner_join_model.json @@ -31,20 +31,6 @@ } }, { - "table": "DEFAULT.TEST_ACCOUNT", - "alias": "SELLER_ACCOUNT", - "kind": "FACT", - "join": { - "type": "INNER", - "primary_key": [ - "SELLER_ACCOUNT.ACCOUNT_ID" - ], - "foreign_key": [ - "TEST_KYLIN_FACT.SELLER_ID" - ] - } - }, - { "table": "EDW.TEST_CAL_DT", "join": { "type": "INNER", @@ -119,6 +105,20 @@ "SELLER_ACCOUNT.ACCOUNT_COUNTRY" ] } + }, + { + "table": "DEFAULT.TEST_ACCOUNT", + "alias": "SELLER_ACCOUNT", + "kind": "FACT", + "join": { + "type": "INNER", + "primary_key": [ + "SELLER_ACCOUNT.ACCOUNT_ID" + ], + "foreign_key": [ + "TEST_KYLIN_FACT.SELLER_ID" + ] + } } ], "dimensions": [
