Repository: kylin Updated Branches: refs/heads/2.1.x aee88fe94 -> e2bd2eb75
KYLIN-2671 fix cache bug Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/8b236025 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/8b236025 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/8b236025 Branch: refs/heads/2.1.x Commit: 8b2360254e0af83b2ca00a01d8fc61d91ade0779 Parents: 4496135 Author: Hongbin Ma <mahong...@apache.org> Authored: Tue Jul 4 15:08:19 2017 +0800 Committer: Hongbin Ma <mahong...@apache.org> Committed: Tue Jul 4 15:21:40 2017 +0800 ---------------------------------------------------------------------- .../org/apache/kylin/rest/controller/QueryController.java | 7 ++++--- .../apache/kylin/rest/controller2/QueryControllerV2.java | 10 ++++++---- 2 files changed, 10 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/8b236025/server-base/src/main/java/org/apache/kylin/rest/controller/QueryController.java ---------------------------------------------------------------------- diff --git a/server-base/src/main/java/org/apache/kylin/rest/controller/QueryController.java b/server-base/src/main/java/org/apache/kylin/rest/controller/QueryController.java index 61250ea..b44f66f 100644 --- a/server-base/src/main/java/org/apache/kylin/rest/controller/QueryController.java +++ b/server-base/src/main/java/org/apache/kylin/rest/controller/QueryController.java @@ -82,9 +82,10 @@ public class QueryController extends BasicController { @RequestMapping(value = "/query/prestate", method = RequestMethod.POST, produces = "application/json") @ResponseBody public SQLResponse prepareQuery(@RequestBody PrepareSqlRequest sqlRequest) { - Map<String, String> toggles = Maps.newHashMap(); - toggles.put(BackdoorToggles.DEBUG_TOGGLE_PREPARE_ONLY, "true"); - BackdoorToggles.addToggles(toggles); + Map<String, String> newToggles = Maps.newHashMap(); + newToggles.putAll(sqlRequest.getBackdoorToggles()); + newToggles.put(BackdoorToggles.DEBUG_TOGGLE_PREPARE_ONLY, "true"); + sqlRequest.setBackdoorToggles(newToggles); return queryService.doQueryWithCache(sqlRequest); } http://git-wip-us.apache.org/repos/asf/kylin/blob/8b236025/server-base/src/main/java/org/apache/kylin/rest/controller2/QueryControllerV2.java ---------------------------------------------------------------------- diff --git a/server-base/src/main/java/org/apache/kylin/rest/controller2/QueryControllerV2.java b/server-base/src/main/java/org/apache/kylin/rest/controller2/QueryControllerV2.java index a1b65a0..9343d4f 100644 --- a/server-base/src/main/java/org/apache/kylin/rest/controller2/QueryControllerV2.java +++ b/server-base/src/main/java/org/apache/kylin/rest/controller2/QueryControllerV2.java @@ -27,7 +27,6 @@ import java.util.Map; import javax.servlet.http.HttpServletResponse; -import com.google.common.collect.Maps; import org.apache.commons.io.IOUtils; import org.apache.kylin.common.debug.BackdoorToggles; import org.apache.kylin.metadata.querymeta.SelectedColumnMeta; @@ -58,6 +57,8 @@ import org.supercsv.io.CsvListWriter; import org.supercsv.io.ICsvListWriter; import org.supercsv.prefs.CsvPreference; +import com.google.common.collect.Maps; + /** * Handle query requests. * @@ -87,9 +88,10 @@ public class QueryControllerV2 extends BasicController { "application/vnd.apache.kylin-v2+json" }) @ResponseBody public EnvelopeResponse prepareQueryV2(@RequestBody PrepareSqlRequest sqlRequest) { - Map<String, String> toggles = Maps.newHashMap(); - toggles.put(BackdoorToggles.DEBUG_TOGGLE_PREPARE_ONLY, "true"); - BackdoorToggles.addToggles(toggles); + Map<String, String> newToggles = Maps.newHashMap(); + newToggles.putAll(sqlRequest.getBackdoorToggles()); + newToggles.put(BackdoorToggles.DEBUG_TOGGLE_PREPARE_ONLY, "true"); + sqlRequest.setBackdoorToggles(newToggles); return new EnvelopeResponse(ResponseCode.CODE_SUCCESS, queryService.doQueryWithCache(sqlRequest), ""); }
