Repository: kylin Updated Branches: refs/heads/master a006c9824 -> fbb7ed921
Revert "MTHDP-984 AppendTrieDictionary refine equals hashCode toString" This reverts commit a006c98244ec21fbbbba71ed4b63d56059278e1d. Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/19a61395 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/19a61395 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/19a61395 Branch: refs/heads/master Commit: 19a613958701b5a15210bc3e680e6d82c2d6d02e Parents: a006c98 Author: gaodayue <gaoda...@meituan.com> Authored: Fri Dec 9 22:48:52 2016 +0800 Committer: gaodayue <gaoda...@meituan.com> Committed: Fri Dec 9 22:48:52 2016 +0800 ---------------------------------------------------------------------- .../apache/kylin/dict/AppendTrieDictionary.java | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/19a61395/core-dictionary/src/main/java/org/apache/kylin/dict/AppendTrieDictionary.java ---------------------------------------------------------------------- diff --git a/core-dictionary/src/main/java/org/apache/kylin/dict/AppendTrieDictionary.java b/core-dictionary/src/main/java/org/apache/kylin/dict/AppendTrieDictionary.java index 35aa9a5..84060a7 100644 --- a/core-dictionary/src/main/java/org/apache/kylin/dict/AppendTrieDictionary.java +++ b/core-dictionary/src/main/java/org/apache/kylin/dict/AppendTrieDictionary.java @@ -36,7 +36,6 @@ import java.util.IdentityHashMap; import java.util.LinkedList; import java.util.List; import java.util.NavigableSet; -import java.util.Objects; import java.util.TreeMap; import java.util.concurrent.ConcurrentHashMap; @@ -892,7 +891,7 @@ public class AppendTrieDictionary<T> extends Dictionary<T> { logger.info("GlobalDict {} is empty, create new one", resourcePath); builder = new Builder<>(resourcePath, null, dictDir, 0, 0, 0, new StringBytesConverter(), null); } else { - logger.info("GlobalDict {} exist, append value", resourcePath); + logger.info("GlobalDict {} exist, append value", dictToUse); builder = new Builder<>(resourcePath, dictToUse, dictToUse.baseDir, dictToUse.maxId, dictToUse.maxValueLength, dictToUse.nValues, dictToUse.bytesConverter, dictToUse.writeDictMap()); } @@ -1265,7 +1264,11 @@ public class AppendTrieDictionary<T> extends Dictionary<T> { @Override public int hashCode() { - return Objects.hashCode(baseDir); + int hashCode = 31; + for (DictSlice slice : dictSliceMap.values()) { + hashCode += 31 * slice.hashCode(); + } + return hashCode; } @Override @@ -1273,19 +1276,10 @@ public class AppendTrieDictionary<T> extends Dictionary<T> { if (this == o) { return true; } - if (o instanceof AppendTrieDictionary) { - AppendTrieDictionary that = (AppendTrieDictionary) o; - return Objects.equals(this.baseDir, that.baseDir); - } return false; } @Override - public String toString() { - return String.format("AppendTrieDictionary(%s)", baseDir); - } - - @Override public boolean contains(Dictionary other) { return false; }
