This is an automated email from the ASF dual-hosted git repository.
dlych pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git
The following commit(s) were added to refs/heads/master by this push:
new dc43ac8 [NO ISSUE][COMP] Minor QueryTranslator refactoring
dc43ac8 is described below
commit dc43ac87078f01365a71d12135240886d8f9bc25
Author: Dmitry Lychagin <[email protected]>
AuthorDate: Thu Jan 9 16:48:30 2020 -0800
[NO ISSUE][COMP] Minor QueryTranslator refactoring
- user model changes: no
- storage format changes: no
- interface changes: no
Details:
- Allow product extensions to override
QueryTranslator.validateStatements()
Change-Id: Ib04f09df6f8073ca3e146e7eb73d6cd703c01641
Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/4644
Tested-by: Jenkins <[email protected]>
Integration-Tests: Jenkins <[email protected]>
Reviewed-by: Dmitry Lychagin <[email protected]>
Reviewed-by: Michael Blow <[email protected]>
---
.../java/org/apache/asterix/app/translator/QueryTranslator.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java
index dcea54a..b35d022 100644
---
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java
+++
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java
@@ -279,8 +279,7 @@ public class QueryTranslator extends AbstractLangTranslator
implements IStatemen
@Override
public void compileAndExecute(IHyracksClientConnection hcc,
IRequestParameters requestParameters) throws Exception {
- validateStatements(statements, requestParameters.isMultiStatement(),
- requestParameters.getStatementCategoryRestrictionMask());
+ validateStatements(requestParameters);
trackRequest(requestParameters);
int resultSetIdCounter = 0;
FileSplit outputFile = null;
@@ -3087,6 +3086,11 @@ public class QueryTranslator extends
AbstractLangTranslator implements IStatemen
appCtx.getRequestTracker().track(clientRequest);
}
+ protected void validateStatements(IRequestParameters requestParameters)
throws CompilationException {
+ validateStatements(statements, requestParameters.isMultiStatement(),
+ requestParameters.getStatementCategoryRestrictionMask());
+ }
+
public static void validateStatements(List<Statement> statements, boolean
allowMultiStatement,
int stmtCategoryRestrictionMask) throws CompilationException {
if (!allowMultiStatement) {