Repository: incubator-kylin Updated Branches: refs/heads/2.x-staging 36d6907d7 -> 3ad572849
minor, fix warnings in dictionary Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/86a2b6ea Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/86a2b6ea Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/86a2b6ea Branch: refs/heads/2.x-staging Commit: 86a2b6ea0426f1b5c4c22790de5653001b74b7cf Parents: 36d6907 Author: Li, Yang <yang...@ebay.com> Authored: Thu Nov 12 14:43:58 2015 +0800 Committer: Li, Yang <yang...@ebay.com> Committed: Thu Nov 12 14:43:58 2015 +0800 ---------------------------------------------------------------------- .../src/main/java/org/apache/kylin/dict/DateStrDictionary.java | 1 + .../src/main/java/org/apache/kylin/dict/Dictionary.java | 1 + .../src/main/java/org/apache/kylin/dict/DictionaryInfo.java | 1 + .../src/main/java/org/apache/kylin/dict/TimeStrDictionary.java | 6 ++++-- 4 files changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/86a2b6ea/core-dictionary/src/main/java/org/apache/kylin/dict/DateStrDictionary.java ---------------------------------------------------------------------- diff --git a/core-dictionary/src/main/java/org/apache/kylin/dict/DateStrDictionary.java b/core-dictionary/src/main/java/org/apache/kylin/dict/DateStrDictionary.java index 5045eca..b882e58 100644 --- a/core-dictionary/src/main/java/org/apache/kylin/dict/DateStrDictionary.java +++ b/core-dictionary/src/main/java/org/apache/kylin/dict/DateStrDictionary.java @@ -41,6 +41,7 @@ import org.apache.commons.lang.StringUtils; * * @author yangli9 */ +@SuppressWarnings("serial") public class DateStrDictionary extends Dictionary<String> { static final int ID_9999_12_31 = 3652426; // assume 0 based http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/86a2b6ea/core-dictionary/src/main/java/org/apache/kylin/dict/Dictionary.java ---------------------------------------------------------------------- diff --git a/core-dictionary/src/main/java/org/apache/kylin/dict/Dictionary.java b/core-dictionary/src/main/java/org/apache/kylin/dict/Dictionary.java index a163f52..d1fc6f9 100644 --- a/core-dictionary/src/main/java/org/apache/kylin/dict/Dictionary.java +++ b/core-dictionary/src/main/java/org/apache/kylin/dict/Dictionary.java @@ -40,6 +40,7 @@ import org.apache.kylin.common.util.BytesUtil; * * @author yangli9 */ +@SuppressWarnings("serial") abstract public class Dictionary<T> implements Writable, Serializable { public static final byte NULL = (byte) 0xff; http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/86a2b6ea/core-dictionary/src/main/java/org/apache/kylin/dict/DictionaryInfo.java ---------------------------------------------------------------------- diff --git a/core-dictionary/src/main/java/org/apache/kylin/dict/DictionaryInfo.java b/core-dictionary/src/main/java/org/apache/kylin/dict/DictionaryInfo.java index 1b8ab1b..f482002 100644 --- a/core-dictionary/src/main/java/org/apache/kylin/dict/DictionaryInfo.java +++ b/core-dictionary/src/main/java/org/apache/kylin/dict/DictionaryInfo.java @@ -26,6 +26,7 @@ import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility; import com.fasterxml.jackson.annotation.JsonProperty; +@SuppressWarnings("serial") @JsonAutoDetect(fieldVisibility = Visibility.NONE, getterVisibility = Visibility.NONE, isGetterVisibility = Visibility.NONE, setterVisibility = Visibility.NONE) public class DictionaryInfo extends RootPersistentEntity { http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/86a2b6ea/core-dictionary/src/main/java/org/apache/kylin/dict/TimeStrDictionary.java ---------------------------------------------------------------------- diff --git a/core-dictionary/src/main/java/org/apache/kylin/dict/TimeStrDictionary.java b/core-dictionary/src/main/java/org/apache/kylin/dict/TimeStrDictionary.java index 9608265..6bae129 100644 --- a/core-dictionary/src/main/java/org/apache/kylin/dict/TimeStrDictionary.java +++ b/core-dictionary/src/main/java/org/apache/kylin/dict/TimeStrDictionary.java @@ -10,9 +10,11 @@ import org.apache.kylin.common.util.DateFormat; /** */ +@SuppressWarnings("serial") public class TimeStrDictionary extends Dictionary<String> { - private static final long MAX_ID = Integer.MAX_VALUE; + // Integer.MAX_VALUE - 1 to avoid cardinality (max_id - min_id + 1) overflow + private static final int MAX_ID = Integer.MAX_VALUE - 1; private static final int MAX_LENGTH_OF_POSITIVE_LONG = 19; @Override @@ -22,7 +24,7 @@ public class TimeStrDictionary extends Dictionary<String> { @Override public int getMaxId() { - return Integer.MAX_VALUE; + return MAX_ID; } @Override
