KYLIN-2622 fix tests
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/2551d489 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/2551d489 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/2551d489 Branch: refs/heads/master Commit: 2551d489ba774a1d6b67fd52b29b372557ab05ee Parents: 7530edb Author: Li Yang <liy...@apache.org> Authored: Sat Sep 23 16:42:49 2017 +0800 Committer: Li Yang <liy...@apache.org> Committed: Sat Sep 23 16:42:49 2017 +0800 ---------------------------------------------------------------------- .../dict/global/SegmentAppendTrieDictBuilder.java | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/2551d489/core-dictionary/src/main/java/org/apache/kylin/dict/global/SegmentAppendTrieDictBuilder.java ---------------------------------------------------------------------- diff --git a/core-dictionary/src/main/java/org/apache/kylin/dict/global/SegmentAppendTrieDictBuilder.java b/core-dictionary/src/main/java/org/apache/kylin/dict/global/SegmentAppendTrieDictBuilder.java index 270deee..c8bc13d 100644 --- a/core-dictionary/src/main/java/org/apache/kylin/dict/global/SegmentAppendTrieDictBuilder.java +++ b/core-dictionary/src/main/java/org/apache/kylin/dict/global/SegmentAppendTrieDictBuilder.java @@ -18,14 +18,14 @@ package org.apache.kylin.dict.global; +import java.io.IOException; +import java.util.UUID; + import org.apache.kylin.common.KylinConfig; import org.apache.kylin.common.util.Dictionary; import org.apache.kylin.dict.DictionaryInfo; import org.apache.kylin.dict.IDictionaryBuilder; -import java.io.IOException; -import java.util.UUID; - /** * SegmentAppendTrieDictBuilder based on one segment. * SegmentAppendTrieDictBuilder only used for count distinct measure that needn't rollup among segments. @@ -41,14 +41,11 @@ public class SegmentAppendTrieDictBuilder implements IDictionaryBuilder { public void init(DictionaryInfo dictInfo, int baseId) throws IOException { sourceColumn = dictInfo.getSourceTable() + "." + dictInfo.getSourceColumn(); - int maxEntriesPerSlice = KylinConfig.getInstanceFromEnv().getAppendDictEntrySize(); - if (hdfsDir == null) { - //build in Kylin job server - hdfsDir = KylinConfig.getInstanceFromEnv().getHdfsWorkingDirectory(); - } + KylinConfig config = KylinConfig.getInstanceFromEnv(); + int maxEntriesPerSlice = config.getAppendDictEntrySize(); //use UUID to make each segment dict in different HDFS dir and support concurrent build //use timestamp to make the segment dict easily to delete - String baseDir = KylinConfig.getInstanceFromEnv().getHdfsWorkingDirectory() + "resources/SegmentDict" + dictInfo.getResourceDir() + "/" + UUID.randomUUID().toString() + "_" + System.currentTimeMillis()+ "/"; + String baseDir = config.getHdfsWorkingDirectory() + "resources/SegmentDict" + dictInfo.getResourceDir() + "/" + UUID.randomUUID().toString() + "_" + System.currentTimeMillis()+ "/"; this.builder = new AppendTrieDictionaryBuilder(baseDir, maxEntriesPerSlice, false); this.baseId = baseId;
