This is an automated email from the ASF dual-hosted git repository. nic pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/kylin.git
The following commit(s) were added to refs/heads/master by this push: new 8b3a268 Minor fix KYLIN-4084 KYLIN-4047 8b3a268 is described below commit 8b3a2685369ce24366c2caca2039c3a450723c58 Author: XiaoxiangYu <hit_la...@126.com> AuthorDate: Thu Jul 18 14:07:31 2019 +0800 Minor fix KYLIN-4084 KYLIN-4047 --- build/bin/kylin-port-replace-util.sh | 4 ++++ query/src/main/java/org/apache/kylin/query/util/PushDownUtil.java | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/build/bin/kylin-port-replace-util.sh b/build/bin/kylin-port-replace-util.sh index 45777da..e52d808 100755 --- a/build/bin/kylin-port-replace-util.sh +++ b/build/bin/kylin-port-replace-util.sh @@ -92,6 +92,10 @@ then #replace kylin.stream.node for Streaming Coordinator stream_node="kylin.stream.node=`hostname -f`:$new_kylin_port" echo "Using new kylin.stream.node: $stream_node" + line_count=$(awk '$0 ~ /kylin.stream.node/ {print $0}' ${KYLIN_CONFIG_FILE} | wc -l) + if [[ $line_count -eq 0 ]]; then + echo "kylin.stream.node=`hostname -f`:7070" >> ${KYLIN_CONFIG_FILE} + fi sed -i "s/^kylin\.stream\.node=.*$/$stream_node/g" ${KYLIN_CONFIG_FILE} sed -i "s/#*kylin.server.cluster-servers=\(.*\).*:\(.*\)/kylin.server.cluster-servers=\1:${new_kylin_port}/g" ${KYLIN_CONFIG_FILE} diff --git a/query/src/main/java/org/apache/kylin/query/util/PushDownUtil.java b/query/src/main/java/org/apache/kylin/query/util/PushDownUtil.java index c5e8d68..e0d15cd 100644 --- a/query/src/main/java/org/apache/kylin/query/util/PushDownUtil.java +++ b/query/src/main/java/org/apache/kylin/query/util/PushDownUtil.java @@ -139,7 +139,8 @@ public class PushDownUtil { if (!isPushDownUpdateEnabled) { return rootCause != null // && (rootCause instanceof NoRealizationFoundException // - || rootCause instanceof RoutingIndicatorException); // + || rootCause instanceof RoutingIndicatorException + || rootCause instanceof QueryOnCubeException); } else { return (rootCause != null // && (rootCause instanceof NoRealizationFoundException //