minor changes
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/2359a75e Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/2359a75e Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/2359a75e Branch: refs/heads/1.5.x-HBase1.x Commit: 2359a75e3ca9d1a9c5f06331ab02edce1385b66d Parents: 32a9c67 Author: Hongbin Ma <mahong...@apache.org> Authored: Thu Sep 22 10:45:08 2016 +0800 Committer: Hongbin Ma <mahong...@apache.org> Committed: Thu Sep 22 10:45:15 2016 +0800 ---------------------------------------------------------------------- .../java/org/apache/kylin/metadata/datatype/BooleanSerializer.java | 2 +- .../kylin/storage/gtrecord/SortedIteratorMergerWithLimit.java | 1 + .../java/org/apache/kylin/rest/controller/QueryController.java | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/2359a75e/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/BooleanSerializer.java ---------------------------------------------------------------------- diff --git a/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/BooleanSerializer.java b/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/BooleanSerializer.java index e843247..acb6de1 100644 --- a/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/BooleanSerializer.java +++ b/core-metadata/src/main/java/org/apache/kylin/metadata/datatype/BooleanSerializer.java @@ -25,7 +25,7 @@ import org.apache.commons.lang.BooleanUtils; public class BooleanSerializer extends DataTypeSerializer<LongMutable> { - final String[] TRUE_VALUE_SET = { "true", "t", "on", "yes" }; + public final static String[] TRUE_VALUE_SET = { "true", "t", "on", "yes" }; // be thread-safe and avoid repeated obj creation private ThreadLocal<LongMutable> current = new ThreadLocal<LongMutable>(); http://git-wip-us.apache.org/repos/asf/kylin/blob/2359a75e/core-storage/src/main/java/org/apache/kylin/storage/gtrecord/SortedIteratorMergerWithLimit.java ---------------------------------------------------------------------- diff --git a/core-storage/src/main/java/org/apache/kylin/storage/gtrecord/SortedIteratorMergerWithLimit.java b/core-storage/src/main/java/org/apache/kylin/storage/gtrecord/SortedIteratorMergerWithLimit.java index 0e40150..2f2691e 100644 --- a/core-storage/src/main/java/org/apache/kylin/storage/gtrecord/SortedIteratorMergerWithLimit.java +++ b/core-storage/src/main/java/org/apache/kylin/storage/gtrecord/SortedIteratorMergerWithLimit.java @@ -94,6 +94,7 @@ public class SortedIteratorMergerWithLimit<E extends Cloneable> extends SortedIt PeekingImpl<E> first = heap.poll(); E current = first.next(); try { + //clone is protected on Object, have to use reflection to call the overwritten clone method in subclasses current = (E) current.getClass().getMethod("clone").invoke(current); } catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException e) { throw new RuntimeException(e); http://git-wip-us.apache.org/repos/asf/kylin/blob/2359a75e/server-base/src/main/java/org/apache/kylin/rest/controller/QueryController.java ---------------------------------------------------------------------- diff --git a/server-base/src/main/java/org/apache/kylin/rest/controller/QueryController.java b/server-base/src/main/java/org/apache/kylin/rest/controller/QueryController.java index 5cf6492..62cb0a7 100644 --- a/server-base/src/main/java/org/apache/kylin/rest/controller/QueryController.java +++ b/server-base/src/main/java/org/apache/kylin/rest/controller/QueryController.java @@ -205,7 +205,7 @@ public class QueryController extends BasicController { checkQueryAuth(sqlResponse); } catch (Throwable e) { // calcite may throw AssertError - //logger.error("Exception when execute sql", e); + logger.error("Exception when execute sql", e); String errMsg = QueryUtil.makeErrorMsgUserFriendly(e); sqlResponse = new SQLResponse(null, null, 0, true, errMsg);
