Repository: asterixdb Updated Branches: refs/heads/master 82e1105f3 -> 714cd44c4
[NO ISSUE][API][MTD] Refactor query service servlet - user model changes: no - storage format changes: no - interface changes: no Details: Pass the optional parameters when creating the query service parameters object. Change-Id: Icdfd285910f49eb1d97ccb7d2325edfe7f06ca39 Reviewed-on: https://asterix-gerrit.ics.uci.edu/3097 Tested-by: Jenkins <[email protected]> Integration-Tests: Jenkins <[email protected]> Contrib: Jenkins <[email protected]> Reviewed-by: Murtadha Hubail <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/714cd44c Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/714cd44c Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/714cd44c Branch: refs/heads/master Commit: 714cd44c42b307bd2c62bee9a05baf17011229ff Parents: 82e1105 Author: Ali Alsuliman <[email protected]> Authored: Tue Dec 25 16:55:01 2018 -0800 Committer: Ali Alsuliman <[email protected]> Committed: Fri Jan 4 22:00:51 2019 -0800 ---------------------------------------------------------------------- .../asterix/api/http/server/QueryServiceServlet.java | 14 +++++++------- .../asterix/lang/sqlpp/util/SqlppStatementUtil.java | 5 +++++ 2 files changed, 12 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/714cd44c/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/QueryServiceServlet.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/QueryServiceServlet.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/QueryServiceServlet.java index b33bba5..7e563e1 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/QueryServiceServlet.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/QueryServiceServlet.java @@ -382,8 +382,8 @@ public class QueryServiceServlet extends AbstractQueryApiServlet { return result; } - protected void setRequestParam(IServletRequest request, QueryServiceRequestParameters param) - throws IOException, AlgebricksException { + protected void setRequestParam(IServletRequest request, QueryServiceRequestParameters param, + Map<String, String> optionalParams) throws IOException, AlgebricksException { param.setHost(host(request)); param.setPath(servletPath(request)); String contentType = HttpUtil.getContentTypeOnly(request); @@ -498,7 +498,11 @@ public class QueryServiceServlet extends AbstractQueryApiServlet { sessionOutput.hold(); sessionOutput.out().print("{\n"); HttpUtil.setContentType(response, HttpUtil.ContentType.APPLICATION_JSON, HttpUtil.Encoding.UTF8); - setRequestParam(request, param); + Map<String, String> optionalParams = null; + if (optionalParamProvider != null) { + optionalParams = optionalParamProvider.apply(request); + } + setRequestParam(request, param, optionalParams); LOGGER.info("handleRequest: {}", param); ResultDelivery delivery = parseResultDelivery(param.getMode()); setSessionConfig(sessionOutput, param, delivery); @@ -513,10 +517,6 @@ public class QueryServiceServlet extends AbstractQueryApiServlet { throw new RuntimeDataException(ErrorCode.NO_STATEMENT_PROVIDED); } String statementsText = param.getStatement() + ";"; - Map<String, String> optionalParams = null; - if (optionalParamProvider != null) { - optionalParams = optionalParamProvider.apply(request); - } Map<String, byte[]> statementParams = org.apache.asterix.app.translator.RequestParameters .serializeParameterValues(param.getStatementParams()); // CORS http://git-wip-us.apache.org/repos/asf/asterixdb/blob/714cd44c/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/util/SqlppStatementUtil.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/util/SqlppStatementUtil.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/util/SqlppStatementUtil.java index f1278ec..e41b9ac 100644 --- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/util/SqlppStatementUtil.java +++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/util/SqlppStatementUtil.java @@ -44,6 +44,7 @@ public class SqlppStatementUtil { private SqlppStatementUtil() { } + @SuppressWarnings("squid:S1172") // unused variable public static StringBuilder getCreateDataverseStatement(StringBuilder stringBuilder, String dataverseName, boolean ifNotExists, int version) { stringBuilder.append(CREATE_DATAVERSE); @@ -51,6 +52,7 @@ public class SqlppStatementUtil { return ifNotExists(stringBuilder, ifNotExists).append(SEMI_COLON); } + @SuppressWarnings("squid:S1172") // unused variable public static StringBuilder getDropDatasetStatement(StringBuilder stringBuilder, String dataverseName, String datasetName, boolean ifExists, int version) { stringBuilder.append(DROP_DATASET); @@ -58,6 +60,7 @@ public class SqlppStatementUtil { return ifExists(stringBuilder, ifExists).append(SEMI_COLON); } + @SuppressWarnings("squid:S1172") // unused variable public static StringBuilder getCreateIndexStatement(StringBuilder stringBuilder, String dataverseName, String datasetName, String indexName, String fields, int version) { stringBuilder.append(CREATE_INDEX); @@ -65,6 +68,7 @@ public class SqlppStatementUtil { return enclose(stringBuilder, dataverseName, datasetName).append(fields).append(SEMI_COLON); } + @SuppressWarnings("squid:S1172") // unused variable public static StringBuilder getCreatePrimaryIndexStatement(StringBuilder stringBuilder, String dataverseName, String datasetName, String indexName, int version) { stringBuilder.append(CREATE_PRIMARY_INDEX); @@ -72,6 +76,7 @@ public class SqlppStatementUtil { return enclose(stringBuilder, dataverseName, datasetName).append(SEMI_COLON); } + @SuppressWarnings("squid:S1172") // unused variable public static StringBuilder getDropIndexStatement(StringBuilder stringBuilder, String dataverseName, String datasetName, String indexName, boolean ifExists, int version) { stringBuilder.append(DROP_INDEX);
