You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by mh...@apache.org on 2016/01/11 18:05:42 UTC
incubator-asterixdb git commit: ASTERIXDB-1256: wait for job
completion on SYNC results delivery
Repository: incubator-asterixdb
Updated Branches:
refs/heads/master 4053f390a -> 192c7b65a
ASTERIXDB-1256: wait for job completion on SYNC results delivery
Change-Id: Ib8a214ba4ff636d12927720c2311a9a5ca247d9e
Reviewed-on: https://asterix-gerrit.ics.uci.edu/580
Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
Reviewed-by: Till Westmann <ti...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/commit/192c7b65
Tree: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/tree/192c7b65
Diff: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/diff/192c7b65
Branch: refs/heads/master
Commit: 192c7b65a32164c79759af5cb651b3b2346c41df
Parents: 4053f39
Author: Murtadha Hubail <mh...@uci.edu>
Authored: Sun Jan 10 00:45:01 2016 -0800
Committer: Murtadha Hubail <hu...@gmail.com>
Committed: Mon Jan 11 09:01:26 2016 -0800
----------------------------------------------------------------------
.../org/apache/asterix/aql/translator/QueryTranslator.java | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/192c7b65/asterix-app/src/main/java/org/apache/asterix/aql/translator/QueryTranslator.java
----------------------------------------------------------------------
diff --git a/asterix-app/src/main/java/org/apache/asterix/aql/translator/QueryTranslator.java b/asterix-app/src/main/java/org/apache/asterix/aql/translator/QueryTranslator.java
index 7c055e2..01b0514 100644
--- a/asterix-app/src/main/java/org/apache/asterix/aql/translator/QueryTranslator.java
+++ b/asterix-app/src/main/java/org/apache/asterix/aql/translator/QueryTranslator.java
@@ -218,7 +218,7 @@ public class QueryTranslator extends AbstractLangTranslator {
private final IRewriterFactory rewriterFactory;
public QueryTranslator(List<Statement> aqlStatements, SessionConfig conf,
- ILangCompilationProvider compliationProvider) throws MetadataException, AsterixException {
+ ILangCompilationProvider compliationProvider) {
this.statements = aqlStatements;
this.sessionConfig = conf;
this.declaredFunctions = getDeclaredFunctions(aqlStatements);
@@ -414,8 +414,7 @@ public class QueryTranslator extends AbstractLangTranslator {
}
}
- private void handleSetStatement(AqlMetadataProvider metadataProvider, Statement stmt, Map<String, String> config)
- throws RemoteException, ACIDException {
+ private void handleSetStatement(AqlMetadataProvider metadataProvider, Statement stmt, Map<String, String> config) {
SetStatement ss = (SetStatement) stmt;
String pname = ss.getPropName();
String pvalue = ss.getPropValue();
@@ -2487,6 +2486,7 @@ public class QueryTranslator extends AbstractLangTranslator {
hcc.waitForCompletion(jobId);
break;
case SYNC:
+ hcc.waitForCompletion(jobId);
ResultReader resultReader = new ResultReader(hcc, hdc);
resultReader.open(jobId, metadataProvider.getResultSetId());
@@ -2498,8 +2498,6 @@ public class QueryTranslator extends AbstractLangTranslator {
ResultUtils.displayCSVHeader(metadataProvider.findOutputRecordType(), sessionConfig);
}
ResultUtils.displayResults(resultReader, sessionConfig);
-
- hcc.waitForCompletion(jobId);
break;
case ASYNC_DEFERRED:
handle = new JSONArray();