Repository: kylin
Updated Branches:
  refs/heads/dong-merge [created] 1d0c4d4fd


APACHE-KYLIN-2971: move OLAPContext.clearThreadLocalContexts() to the beginning 
of running a query

Signed-off-by: lidongsjtu <lid...@apache.org>

This closes #83


Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/e6bb40ae
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/e6bb40ae
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/e6bb40ae

Branch: refs/heads/dong-merge
Commit: e6bb40ae203d270fa35b964dbe5eb020f9c2ee5b
Parents: 188124f
Author: Zhong <nju_y...@apache.org>
Authored: Fri Nov 3 09:40:43 2017 +0800
Committer: lidongsjtu <lid...@apache.org>
Committed: Fri Nov 3 22:54:25 2017 +0800

----------------------------------------------------------------------
 .../main/java/org/apache/kylin/rest/service/QueryService.java   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kylin/blob/e6bb40ae/server-base/src/main/java/org/apache/kylin/rest/service/QueryService.java
----------------------------------------------------------------------
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 f8566de..26b25d2 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
@@ -400,6 +400,9 @@ public class QueryService extends BasicService {
 
             long startTime = System.currentTimeMillis();
 
+            // force clear the query context before a new query
+            OLAPContext.clearThreadLocalContexts();
+
             SQLResponse sqlResponse = null;
             boolean queryCacheEnabled = 
checkCondition(kylinConfig.isQueryCacheEnabled(),
                     "query cache disabled in KylinConfig") && //
@@ -557,8 +560,6 @@ public class QueryService extends BasicService {
             parameters.put(OLAPContext.PRM_USER_AUTHEN_INFO, userInfo);
             parameters.put(OLAPContext.PRM_ACCEPT_PARTIAL_RESULT, 
String.valueOf(sqlRequest.isAcceptPartial()));
             OLAPContext.setParameters(parameters);
-            // force clear the query context before a new query
-            OLAPContext.clearThreadLocalContexts();
 
             return execute(correctedSql, sqlRequest, conn);
 

Reply via email to