This is an automated email from the ASF dual-hosted git repository. mblow pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit 9e332736965c8ab7e3252f5ee28e403945a33cb1 Author: Ali Alsuliman <[email protected]> AuthorDate: Sat Feb 12 02:47:21 2022 +0300 [NO ISSUE][API] Add ensureOptionalParameters for extension - user model changes: no - storage format changes: no - interface changes: no Details: Change-Id: Id7e9c5aa9c5a4356d1c7279f10c5602059f550f0 Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/15227 Integration-Tests: Jenkins <[email protected]> Reviewed-by: Ali Alsuliman <[email protected]> Reviewed-by: Michael Blow <[email protected]> Tested-by: Jenkins <[email protected]> --- .../org/apache/asterix/api/http/server/NCQueryServiceServlet.java | 6 ++++++ .../java/org/apache/asterix/api/http/server/NCUdfApiServlet.java | 7 +++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/NCQueryServiceServlet.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/NCQueryServiceServlet.java index 5bcde3d..1ec7405 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/NCQueryServiceServlet.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/NCQueryServiceServlet.java @@ -45,6 +45,7 @@ import org.apache.asterix.translator.IStatementExecutor; import org.apache.asterix.translator.ResultProperties; import org.apache.asterix.translator.SessionOutput; import org.apache.hyracks.api.application.INCServiceContext; +import org.apache.hyracks.api.exceptions.HyracksDataException; import org.apache.hyracks.api.exceptions.Warning; import org.apache.hyracks.api.util.ExceptionUtils; import org.apache.hyracks.http.api.IChannelClosedHandler; @@ -76,6 +77,7 @@ public class NCQueryServiceServlet extends QueryServiceServlet { QueryServiceRequestParameters param, RequestExecutionState executionState, Map<String, String> optionalParameters, Map<String, byte[]> statementParameters, ResponsePrinter responsePrinter, List<Warning> warnings) throws Exception { + ensureOptionalParameters(optionalParameters); // Running on NC -> send 'execute' message to CC INCServiceContext ncCtx = (INCServiceContext) serviceCtx; INCMessageBroker ncMb = (INCMessageBroker) ncCtx.getMessageBroker(); @@ -134,6 +136,10 @@ public class NCQueryServiceServlet extends QueryServiceServlet { buildResponseResults(responsePrinter, sessionOutput, responseMsg.getExecutionPlans(), warnings); } + protected void ensureOptionalParameters(Map<String, String> optionalParameters) throws HyracksDataException { + + } + protected ExecuteStatementRequestMessage createRequestMessage(IServletRequest request, IRequestReference requestReference, String statementsText, SessionOutput sessionOutput, ResultProperties resultProperties, QueryServiceRequestParameters param, diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/NCUdfApiServlet.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/NCUdfApiServlet.java index 8cf70b2..3d0f7fc 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/NCUdfApiServlet.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/NCUdfApiServlet.java @@ -295,8 +295,7 @@ public class NCUdfApiServlet extends AbstractNCUdfServlet { responseWriter.flush(); } - protected boolean isRequestPermittedForWrite(IServletRequest request, IServletResponse response) - throws IOException { + protected boolean isRequestPermitted(IServletRequest request, IServletResponse response) throws IOException { if (!isRequestOnLoopback(request)) { rejectForbidden(response); return false; @@ -322,14 +321,14 @@ public class NCUdfApiServlet extends AbstractNCUdfServlet { @Override protected void post(IServletRequest request, IServletResponse response) throws IOException { - if (isRequestPermittedForWrite(request, response)) { + if (isRequestPermitted(request, response)) { handleModification(request, response, LibraryOperation.UPSERT); } } @Override protected void delete(IServletRequest request, IServletResponse response) throws IOException { - if (isRequestPermittedForWrite(request, response)) { + if (isRequestPermitted(request, response)) { handleModification(request, response, LibraryOperation.DELETE); } }
