From 6c45b1c602c0f558a463e891d6560ad5c4d86f7e Mon Sep 17 00:00:00 2001 From: Zhong Date: Fri, 3 Nov 2017 09:40:43 +0800 Subject: [PATCH] APACHE-KYLIN-2971: move OLAPContext.clearThreadLocalContexts() to the beginning of running a query --- .../src/main/java/org/apache/kylin/rest/service/QueryService.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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); -- 2.5.4 (Apple Git-61)