[kylin] branch master updated: KYLIN-4606 throw olap exception msg and pushdown exception msg when olap query and pushdown both error

[xxyu]

This is an automated email from the ASF dual-hosted git repository.

xxyu 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 cc101ce  KYLIN-4606 throw olap exception msg and pushdown exception 
msg  when olap query and pushdown both error
cc101ce is described below

commit cc101ce3cb518c5c3647360c01eceb4b97c3bd57
Author: chuxiao <chux...@didichuxing.com>
AuthorDate: Mon Jun 29 22:13:19 2020 +0800

    KYLIN-4606 throw olap exception msg and pushdown exception msg  when olap 
query and pushdown both error
---
 .../src/main/java/org/apache/kylin/rest/service/QueryService.java      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git 
a/server-base/src/main/java/org/apache/kylin/rest/service/QueryService.java 
b/server-base/src/main/java/org/apache/kylin/rest/service/QueryService.java
index 5a832ff..6667be1 100644
--- a/server-base/src/main/java/org/apache/kylin/rest/service/QueryService.java
+++ b/server-base/src/main/java/org/apache/kylin/rest/service/QueryService.java
@@ -1054,7 +1054,8 @@ public class QueryService extends BasicService {
         } catch (Exception e2) {
             logger.error("pushdown engine failed current query too", e2);
             //exception in pushdown, throw it instead of exception in calcite
-            throw e2;
+            throw new Exception(sqlException != null ? ("olap exception : " + 
sqlException.getMessage()) : ("")
+                    + " pushdown exception : " + e2.getMessage(), e2);
         }
     }