minor changes
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/181890e5 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/181890e5 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/181890e5 Branch: refs/heads/KYLIN-2360 Commit: 181890e542783e66078ad707f37dcb273abae596 Parents: 7eb9969 Author: Hongbin Ma <mahong...@apache.org> Authored: Thu Mar 9 21:19:26 2017 +0800 Committer: Hongbin Ma <mahong...@apache.org> Committed: Thu Mar 9 21:19:30 2017 +0800 ---------------------------------------------------------------------- .../main/java/org/apache/kylin/common/QueryContext.java | 3 +++ .../org/apache/kylin/rest/service/QueryService.java | 12 ++++-------- 2 files changed, 7 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/181890e5/core-common/src/main/java/org/apache/kylin/common/QueryContext.java ---------------------------------------------------------------------- diff --git a/core-common/src/main/java/org/apache/kylin/common/QueryContext.java b/core-common/src/main/java/org/apache/kylin/common/QueryContext.java index 5457aa5..0b8d519 100644 --- a/core-common/src/main/java/org/apache/kylin/common/QueryContext.java +++ b/core-common/src/main/java/org/apache/kylin/common/QueryContext.java @@ -18,6 +18,7 @@ package org.apache.kylin.common; +import java.util.UUID; import java.util.concurrent.atomic.AtomicLong; /** @@ -38,6 +39,8 @@ public class QueryContext { private QueryContext() { // use QueryContext.current() instead + + queryId = UUID.randomUUID().toString(); } public static QueryContext current() { http://git-wip-us.apache.org/repos/asf/kylin/blob/181890e5/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 122b823..6a38638 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 @@ -41,7 +41,6 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.UUID; import javax.annotation.PostConstruct; import javax.sql.DataSource; @@ -237,7 +236,7 @@ public class QueryService extends BasicService { public void logQuery(final SQLRequest request, final SQLResponse response) { final String user = SecurityContextHolder.getContext().getAuthentication().getName(); - final Set<String> realizationNames = new HashSet<String>(); + final List<String> realizationNames = new LinkedList<>(); final Set<Long> cuboidIds = new HashSet<Long>(); float duration = response.getDuration() / (float) 1000; boolean storageCacheUsed = response.isStorageCacheUsed(); @@ -251,8 +250,7 @@ public class QueryService extends BasicService { } if (ctx.realization != null) { - String realizationName = ctx.realization.getName(); - realizationNames.add(realizationName); + realizationNames.add(ctx.realization.getCanonicalName()); } } @@ -332,10 +330,8 @@ public class QueryService extends BasicService { BackdoorToggles.addToggles(sqlRequest.getBackdoorToggles()); final QueryContext queryContext = QueryContext.current(); - final String queryId = UUID.randomUUID().toString(); - queryContext.setQueryId(queryId); - try (SetThreadName ignored = new SetThreadName("Query %s", queryId)) { + try (SetThreadName ignored = new SetThreadName("Query %s", queryContext.getQueryId())) { String sql = sqlRequest.getSql(); String project = sqlRequest.getProject(); logger.info("Using project: " + project); @@ -431,7 +427,7 @@ public class QueryService extends BasicService { return response; } - private void checkQueryAuth(SQLResponse sqlResponse) throws AccessDeniedException { + protected void checkQueryAuth(SQLResponse sqlResponse) throws AccessDeniedException { if (!sqlResponse.getIsException() && KylinConfig.getInstanceFromEnv().isQuerySecureEnabled()) { checkAuthorization(sqlResponse.getCube()); }