Repository: asterixdb Updated Branches: refs/heads/master 33a656d1d -> 95c55f750
[NO ISSUE][TEST] Enable setting HTTP parameters in test queries - user model changes: no - storage format changes: no - interface changes: no Change-Id: I82721bd7b2702f0e3d294996764b03ff4738a457 Reviewed-on: https://asterix-gerrit.ics.uci.edu/2593 Sonar-Qube: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Tested-by: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Contrib: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Reviewed-by: Murtadha Hubail <mhub...@apache.org> Integration-Tests: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/95c55f75 Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/95c55f75 Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/95c55f75 Branch: refs/heads/master Commit: 95c55f750f1881f86ea3a5a4db25b62dff8da139 Parents: 33a656d Author: Abdullah Alamoudi <bamou...@gmail.com> Authored: Fri Apr 13 19:00:48 2018 -0700 Committer: abdullah alamoudi <bamou...@gmail.com> Committed: Sat Apr 14 21:29:37 2018 -0700 ---------------------------------------------------------------------- .../asterix/api/http/server/NCQueryCancellationServlet.java | 3 ++- .../apache/asterix/api/http/server/QueryCancellationServlet.java | 4 ++-- .../test/java/org/apache/asterix/test/common/TestExecutor.java | 4 ++++ 3 files changed, 8 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/95c55f75/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/NCQueryCancellationServlet.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/NCQueryCancellationServlet.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/NCQueryCancellationServlet.java index da621d2..5ad451f 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/NCQueryCancellationServlet.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/NCQueryCancellationServlet.java @@ -23,6 +23,7 @@ import static org.apache.asterix.app.message.ExecuteStatementRequestMessage.DEFA import java.util.concurrent.ConcurrentMap; import java.util.concurrent.TimeUnit; +import org.apache.asterix.api.http.server.QueryServiceServlet.Parameter; import org.apache.asterix.app.message.CancelQueryRequest; import org.apache.asterix.app.message.CancelQueryResponse; import org.apache.asterix.common.messaging.api.INCMessageBroker; @@ -54,7 +55,7 @@ public class NCQueryCancellationServlet extends QueryCancellationServlet { @Override protected void delete(IServletRequest request, IServletResponse response) { // gets the parameter client_context_id from the request. - String clientContextId = request.getParameter(CLIENT_CONTEXT_ID); + String clientContextId = request.getParameter(Parameter.CLIENT_ID.str()); if (clientContextId == null) { response.setStatus(HttpResponseStatus.BAD_REQUEST); return; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/95c55f75/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/QueryCancellationServlet.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/QueryCancellationServlet.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/QueryCancellationServlet.java index f8655ad..a8b3aef 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/QueryCancellationServlet.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/QueryCancellationServlet.java @@ -21,6 +21,7 @@ package org.apache.asterix.api.http.server; import java.io.IOException; import java.util.concurrent.ConcurrentMap; +import org.apache.asterix.api.http.server.QueryServiceServlet.Parameter; import org.apache.asterix.translator.IStatementExecutorContext; import org.apache.hyracks.api.client.IHyracksClientConnection; import org.apache.hyracks.api.job.JobId; @@ -38,7 +39,6 @@ import io.netty.handler.codec.http.HttpResponseStatus; */ public class QueryCancellationServlet extends AbstractServlet { private static final Logger LOGGER = LogManager.getLogger(); - protected static final String CLIENT_CONTEXT_ID = "client_context_id"; public QueryCancellationServlet(ConcurrentMap<String, Object> ctx, String... paths) { super(ctx, paths); @@ -46,7 +46,7 @@ public class QueryCancellationServlet extends AbstractServlet { @Override protected void delete(IServletRequest request, IServletResponse response) throws IOException { - String clientContextId = request.getParameter(CLIENT_CONTEXT_ID); + String clientContextId = request.getParameter(Parameter.CLIENT_ID.str()); if (clientContextId == null) { response.setStatus(HttpResponseStatus.BAD_REQUEST); return; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/95c55f75/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestExecutor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestExecutor.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestExecutor.java index c28d8ba..f204340 100644 --- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestExecutor.java +++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestExecutor.java @@ -585,6 +585,10 @@ public class TestExecutor { newParams = upsertParam(newParams, QueryServiceServlet.Parameter.MAX_RESULT_READS.str(), maxReadsOptional.get()); } + final List<Parameter> additionalParams = extractParameters(str); + for (Parameter param : additionalParams) { + newParams = upsertParam(newParams, param.getName(), param.getValue()); + } HttpUriRequest method = jsonEncoded ? constructPostMethodJson(str, uri, "statement", newParams) : constructPostMethodUrl(str, uri, "statement", newParams); // Set accepted output response type
