minor, remove kylin.dictionary.max.cardinality
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/2d87faec Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/2d87faec Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/2d87faec Branch: refs/heads/yang21-hbase1.x Commit: 2d87faec4d04e842ea73bb0493209b661305a4ee Parents: b502a17 Author: Li Yang <liy...@apache.org> Authored: Thu Oct 27 14:34:40 2016 +0800 Committer: Li Yang <liy...@apache.org> Committed: Thu Oct 27 14:35:43 2016 +0800 ---------------------------------------------------------------------- .../java/org/apache/kylin/common/KylinConfigBase.java | 4 ---- .../org/apache/kylin/dict/DictionaryGenerator.java | 14 -------------- 2 files changed, 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/2d87faec/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 5d92aef..53074fd 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 @@ -448,10 +448,6 @@ abstract public class KylinConfigBase implements Serializable { return getPropertiesByPrefix("kylin.cube.measure.customMeasureType."); } - public int getDictionaryMaxCardinality() { - return Integer.parseInt(getOptional("kylin.dictionary.max.cardinality", "30000000")); - } - public int getTableSnapshotMaxMB() { return Integer.parseInt(getOptional("kylin.table.snapshot.max_mb", "300")); } http://git-wip-us.apache.org/repos/asf/kylin/blob/2d87faec/core-dictionary/src/main/java/org/apache/kylin/dict/DictionaryGenerator.java ---------------------------------------------------------------------- diff --git a/core-dictionary/src/main/java/org/apache/kylin/dict/DictionaryGenerator.java b/core-dictionary/src/main/java/org/apache/kylin/dict/DictionaryGenerator.java index ba848c6..0adf40e 100644 --- a/core-dictionary/src/main/java/org/apache/kylin/dict/DictionaryGenerator.java +++ b/core-dictionary/src/main/java/org/apache/kylin/dict/DictionaryGenerator.java @@ -25,7 +25,6 @@ import java.util.ArrayList; import java.util.List; import org.apache.commons.lang.StringUtils; -import org.apache.kylin.common.KylinConfig; import org.apache.kylin.common.util.Bytes; import org.apache.kylin.common.util.Dictionary; import org.apache.kylin.metadata.datatype.DataType; @@ -40,20 +39,10 @@ import com.google.common.base.Preconditions; @SuppressWarnings({ "rawtypes", "unchecked" }) public class DictionaryGenerator { - private static final int DICT_MAX_CARDINALITY = getDictionaryMaxCardinality(); - private static final Logger logger = LoggerFactory.getLogger(DictionaryGenerator.class); private static final String[] DATE_PATTERNS = new String[] { "yyyy-MM-dd", "yyyyMMdd" }; - private static int getDictionaryMaxCardinality() { - try { - return KylinConfig.getInstanceFromEnv().getDictionaryMaxCardinality(); - } catch (Throwable e) { - return 30000000; // some test case does not have KylinConfig setup properly - } - } - public static Dictionary<String> buildDictionary(DataType dataType, IDictionaryValueEnumerator valueEnumerator) throws IOException { Preconditions.checkNotNull(dataType, "dataType cannot be null"); @@ -92,9 +81,6 @@ public class DictionaryGenerator { logger.debug("Dictionary cardinality: " + dict.getSize()); logger.debug("Dictionary builder class: " + builder.getClass().getName()); logger.debug("Dictionary class: " + dict.getClass().getName()); - if (dict instanceof TrieDictionary && dict.getSize() > DICT_MAX_CARDINALITY) { - throw new IllegalArgumentException("Too high cardinality is not suitable for dictionary -- cardinality: " + dict.getSize()); - } return dict; }
