abdullah alamoudi has submitted this change and it was merged. Change subject: [NO ISSUE][TEST] Enable setting HTTP parameters in test queries ......................................................................
[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> --- M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/NCQueryCancellationServlet.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/QueryCancellationServlet.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestExecutor.java 3 files changed, 8 insertions(+), 3 deletions(-) Approvals: Anon. E. Moose #1000171: Jenkins: Verified; No violations found; ; Verified Murtadha Hubail: Looks good to me, approved 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 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 @@ @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; 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 @@ 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 @@ */ 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 @@ @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; 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 @@ 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 -- To view, visit https://asterix-gerrit.ics.uci.edu/2593 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: merged Gerrit-Change-Id: I82721bd7b2702f0e3d294996764b03ff4738a457 Gerrit-PatchSet: 3 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: abdullah alamoudi <bamou...@gmail.com> Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Ian Maxon <ima...@apache.org> Gerrit-Reviewer: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Gerrit-Reviewer: Michael Blow <mb...@apache.org> Gerrit-Reviewer: Murtadha Hubail <mhub...@apache.org> Gerrit-Reviewer: Till Westmann <ti...@apache.org> Gerrit-Reviewer: abdullah alamoudi <bamou...@gmail.com>
