Repository: asterixdb Updated Branches: refs/heads/master faf08e7ce -> 0c6297c98
[NO ISSUE] Rename aqlStatements variable to statements - user model changes: no - storage format changes: no - interface changes: no Details: - Renaming "aqlStatements" variables to "statements" to be more generic, due to the support of SQL++ and deprecation of AQL, and in case of new languages in the future. Change-Id: Ic0a1f2b9dd53169b8298d516a7358f49c24f2e8a Reviewed-on: https://asterix-gerrit.ics.uci.edu/3040 Sonar-Qube: Jenkins <[email protected]> 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/0c6297c9 Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/0c6297c9 Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/0c6297c9 Branch: refs/heads/master Commit: 0c6297c98d2ee6a400baa37b659746147d4a5c29 Parents: faf08e7 Author: Hussain Towaileb <[email protected]> Authored: Thu Nov 22 13:40:43 2018 +0300 Committer: Murtadha Hubail <[email protected]> Committed: Sun Nov 25 06:49:12 2018 -0800 ---------------------------------------------------------------------- .../org/apache/asterix/api/http/server/ApiServlet.java | 4 ++-- .../apache/asterix/api/http/server/RestApiServlet.java | 10 +++++----- .../asterix/tools/translator/ADGenDmlTranslator.java | 10 +++++----- 3 files changed, 12 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/0c6297c9/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ApiServlet.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ApiServlet.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ApiServlet.java index 868e4b8..d206336 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ApiServlet.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ApiServlet.java @@ -136,7 +136,7 @@ public class ApiServlet extends AbstractServlet { IHyracksClientConnection hcc = (IHyracksClientConnection) ctx.get(HYRACKS_CONNECTION_ATTR); IResultSet resultSet = ServletUtil.getResultSet(hcc, appCtx, ctx); IParser parser = parserFactory.createParser(query); - List<Statement> aqlStatements = parser.parse(); + List<Statement> statements = parser.parse(); SessionConfig sessionConfig = new SessionConfig(format, true, isSet(executeQuery), true, planFormat); sessionConfig.set(SessionConfig.FORMAT_HTML, true); sessionConfig.set(SessionConfig.FORMAT_CSV_HEADER, csvAndHeader); @@ -145,7 +145,7 @@ public class ApiServlet extends AbstractServlet { isSet(printLogicalPlanParam), isSet(printOptimizedLogicalPlanParam), isSet(printJob)); SessionOutput sessionOutput = new SessionOutput(sessionConfig, out); MetadataManager.INSTANCE.init(); - IStatementExecutor translator = statementExectorFactory.create(appCtx, aqlStatements, sessionOutput, + IStatementExecutor translator = statementExectorFactory.create(appCtx, statements, sessionOutput, compilationProvider, componentProvider); double duration; long startTime = System.currentTimeMillis(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/0c6297c9/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/RestApiServlet.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/RestApiServlet.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/RestApiServlet.java index 99c7308..0aa2211 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/RestApiServlet.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/RestApiServlet.java @@ -190,10 +190,10 @@ public abstract class RestApiServlet extends AbstractServlet { response.setStatus(HttpResponseStatus.OK); IHyracksClientConnection hcc = (IHyracksClientConnection) ctx.get(HYRACKS_CONNECTION_ATTR); IParser parser = parserFactory.createParser(query); - List<Statement> aqlStatements = parser.parse(); - validate(aqlStatements); + List<Statement> statements = parser.parse(); + validate(statements); MetadataManager.INSTANCE.init(); - IStatementExecutor translator = statementExecutorFactory.create(appCtx, aqlStatements, sessionOutput, + IStatementExecutor translator = statementExecutorFactory.create(appCtx, statements, sessionOutput, compilationProvider, componentProvider); final IResultSet resultSet = ServletUtil.getResultSet(hcc, appCtx, ctx); final IRequestParameters requestParameters = new RequestParameters(resultSet, @@ -222,8 +222,8 @@ public abstract class RestApiServlet extends AbstractServlet { } } - private void validate(List<Statement> aqlStatements) throws AsterixException { - for (Statement st : aqlStatements) { + private void validate(List<Statement> statements) throws AsterixException { + for (Statement st : statements) { if ((st.getCategory() & getAllowedCategories()) == 0) { throw new AsterixException(String.format(getErrorMessage(), st.getKind())); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/0c6297c9/asterixdb/asterix-tools/src/test/java/org/apache/asterix/tools/translator/ADGenDmlTranslator.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-tools/src/test/java/org/apache/asterix/tools/translator/ADGenDmlTranslator.java b/asterixdb/asterix-tools/src/test/java/org/apache/asterix/tools/translator/ADGenDmlTranslator.java index c6095bd..9f886b5 100644 --- a/asterixdb/asterix-tools/src/test/java/org/apache/asterix/tools/translator/ADGenDmlTranslator.java +++ b/asterixdb/asterix-tools/src/test/java/org/apache/asterix/tools/translator/ADGenDmlTranslator.java @@ -36,13 +36,13 @@ import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; public class ADGenDmlTranslator extends AbstractLangTranslator { private final MetadataTransactionContext mdTxnCtx; - private final List<Statement> aqlStatements; + private final List<Statement> statements; private Map<TypeSignature, IAType> types; private Map<TypeSignature, TypeDataGen> typeDataGenMap; - public ADGenDmlTranslator(MetadataTransactionContext mdTxnCtx, List<Statement> aqlStatements) { + public ADGenDmlTranslator(MetadataTransactionContext mdTxnCtx, List<Statement> statements) { this.mdTxnCtx = mdTxnCtx; - this.aqlStatements = aqlStatements; + this.statements = statements; } public void translate() throws AlgebricksException { @@ -50,7 +50,7 @@ public class ADGenDmlTranslator extends AbstractLangTranslator { types = new HashMap<>(); typeDataGenMap = new HashMap<>(); - for (Statement stmt : aqlStatements) { + for (Statement stmt : statements) { if (stmt.getKind() == Statement.Kind.TYPE_DECL) { TypeDecl td = (TypeDecl) stmt; String typeDataverse = @@ -70,7 +70,7 @@ public class ADGenDmlTranslator extends AbstractLangTranslator { } private String getDefaultDataverse() { - for (Statement stmt : aqlStatements) { + for (Statement stmt : statements) { if (stmt.getKind() == Statement.Kind.DATAVERSE_DECL) { return ((DataverseDecl) stmt).getDataverseName().getValue(); }
