You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by sh...@apache.org on 2015/06/16 08:00:05 UTC
incubator-kylin git commit: KYLIN-830 Cube merge failed after
migrating from v0.6 to v0.7
Repository: incubator-kylin
Updated Branches:
refs/heads/0.7-staging 8d5484563 -> a64cc1391
KYLIN-830 Cube merge failed after migrating from v0.6 to v0.7
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/a64cc139
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/a64cc139
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/a64cc139
Branch: refs/heads/0.7-staging
Commit: a64cc1391d9d7300dd47fad01a75933182424689
Parents: 8d54845
Author: shaofengshi <sh...@apache.org>
Authored: Tue Jun 16 13:59:44 2015 +0800
Committer: shaofengshi <sh...@apache.org>
Committed: Tue Jun 16 13:59:44 2015 +0800
----------------------------------------------------------------------
.../src/main/java/org/apache/kylin/dict/DictionaryManager.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/a64cc139/dictionary/src/main/java/org/apache/kylin/dict/DictionaryManager.java
----------------------------------------------------------------------
diff --git a/dictionary/src/main/java/org/apache/kylin/dict/DictionaryManager.java b/dictionary/src/main/java/org/apache/kylin/dict/DictionaryManager.java
index 08e8f35..6560a51 100644
--- a/dictionary/src/main/java/org/apache/kylin/dict/DictionaryManager.java
+++ b/dictionary/src/main/java/org/apache/kylin/dict/DictionaryManager.java
@@ -124,7 +124,8 @@ public class DictionaryManager {
firstDictInfo = info;
} else {
if (!firstDictInfo.isDictOnSameColumn(info)) {
- throw new IllegalArgumentException("Merging dictionaries are not structurally equal(regardless of signature).");
+ // don't throw exception, just output warning as legacy cube segment may build dict on PK
+ logger.warn("Merging dictionaries are not structurally equal : " + firstDictInfo.getResourcePath() + " and " + info.getResourcePath());
}
}
totalSize += info.getInput().getSize();