Repository: kylin Updated Branches: refs/heads/1.5.x-CDH5.7 3d82553ff -> 319d4ae98 (forced update)
minor changes Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/58f3af3b Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/58f3af3b Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/58f3af3b Branch: refs/heads/1.5.x-CDH5.7 Commit: 58f3af3b33d7d581811e1854a4c14e4f2c6edaf8 Parents: 407fbd0 Author: Hongbin Ma <mahong...@apache.org> Authored: Fri May 13 09:55:15 2016 +0800 Committer: Hongbin Ma <mahong...@apache.org> Committed: Fri May 13 13:54:10 2016 +0800 ---------------------------------------------------------------------- .../apache/kylin/common/util/NumberIterators.java | 16 ++++++++++++++++ .../apache/kylin/rest/model/SelectedColumnMeta.java | 4 +++- .../org/apache/kylin/rest/response/SQLResponse.java | 8 ++++++++ 3 files changed, 27 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/58f3af3b/core-common/src/main/java/org/apache/kylin/common/util/NumberIterators.java ---------------------------------------------------------------------- diff --git a/core-common/src/main/java/org/apache/kylin/common/util/NumberIterators.java b/core-common/src/main/java/org/apache/kylin/common/util/NumberIterators.java index 5bfbac7..4ce317d 100644 --- a/core-common/src/main/java/org/apache/kylin/common/util/NumberIterators.java +++ b/core-common/src/main/java/org/apache/kylin/common/util/NumberIterators.java @@ -19,6 +19,9 @@ package org.apache.kylin.common.util; import java.util.Iterator; +import java.util.Set; + +import com.google.common.collect.Sets; public class NumberIterators { @@ -31,4 +34,17 @@ public class NumberIterators { return ret; } + public static <T extends Number> long checkSame(Iterator<T> iterator) { + Set<Long> values = Sets.newHashSet(); + while (iterator.hasNext()) { + Number element = iterator.next(); + values.add(element.longValue()); + } + + if (values.size() > 1) { + throw new IllegalStateException("more than one distinct values exist in the collection:" + values); + } + + return values.iterator().next(); + } } http://git-wip-us.apache.org/repos/asf/kylin/blob/58f3af3b/server/src/main/java/org/apache/kylin/rest/model/SelectedColumnMeta.java ---------------------------------------------------------------------- diff --git a/server/src/main/java/org/apache/kylin/rest/model/SelectedColumnMeta.java b/server/src/main/java/org/apache/kylin/rest/model/SelectedColumnMeta.java index 00b01db..fc8d723 100644 --- a/server/src/main/java/org/apache/kylin/rest/model/SelectedColumnMeta.java +++ b/server/src/main/java/org/apache/kylin/rest/model/SelectedColumnMeta.java @@ -18,9 +18,11 @@ package org.apache.kylin.rest.model; +import java.io.Serializable; + /** */ -public class SelectedColumnMeta { +public class SelectedColumnMeta implements Serializable{ public SelectedColumnMeta(boolean isAutoIncrement, boolean isCaseSensitive, boolean isSearchable, boolean isCurrency, int isNullalbe, boolean isSigned, int displaySize, String label, String name, String schemaName, String catelogName, String tableName, int precision, int scale, int columnType, String columnTypeName, boolean isReadOnly, boolean isWritable, boolean isDefinitelyWritable) { super(); this.isAutoIncrement = isAutoIncrement; http://git-wip-us.apache.org/repos/asf/kylin/blob/58f3af3b/server/src/main/java/org/apache/kylin/rest/response/SQLResponse.java ---------------------------------------------------------------------- diff --git a/server/src/main/java/org/apache/kylin/rest/response/SQLResponse.java b/server/src/main/java/org/apache/kylin/rest/response/SQLResponse.java index 75b6ce8..353dd7e 100644 --- a/server/src/main/java/org/apache/kylin/rest/response/SQLResponse.java +++ b/server/src/main/java/org/apache/kylin/rest/response/SQLResponse.java @@ -113,10 +113,18 @@ public class SQLResponse implements Serializable { return isException; } + public void setIsException(boolean v) { + isException = v; + } + public String getExceptionMessage() { return exceptionMessage; } + public void setExceptionMessage(String msg) { + exceptionMessage = msg; + } + public long getDuration() { return duration; }
