This is an automated email from the ASF dual-hosted git repository.
peeyush 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 a3e285a7bc [ASTERIXDB-3326][OTH] COPY FROM request shown as received
while running
a3e285a7bc is described below
commit a3e285a7bc5ec078d9e7c7c42065fd87aec38da0
Author: Peeyush Gupta <[email protected]>
AuthorDate: Mon Dec 4 16:09:40 2023 -0800
[ASTERIXDB-3326][OTH] COPY FROM request shown as received while running
- user model changes: no
- storage format changes: no
- interface changes: no
Change-Id: Ia5bb8a031a2c451616c004cddd34d451d87199a6
Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17994
Integration-Tests: Jenkins <[email protected]>
Reviewed-by: Peeyush Gupta <[email protected]>
Reviewed-by: Wail Alkowaileet <[email protected]>
Tested-by: Jenkins <[email protected]>
---
.../asterix/app/translator/QueryTranslator.java | 23 ++++++++++++++++------
.../sugar-01-negative.3.query.sqlpp | 2 +-
2 files changed, 18 insertions(+), 7 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 2f8b391751..20da442fd0 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
@@ -468,7 +468,7 @@ public class QueryTranslator extends AbstractLangTranslator
implements IStatemen
if (stats.getProfileType() == Stats.ProfileType.FULL) {
this.jobFlags.add(JobFlag.PROFILE_RUNTIME);
}
- handleCopyFromStatement(metadataProvider, stmt, hcc);
+ handleCopyFromStatement(metadataProvider, stmt, hcc,
requestParameters);
break;
case COPY_TO:
metadataProvider.setResultSetId(new
ResultSetId(resultSetIdCounter.getAndInc()));
@@ -495,7 +495,7 @@ public class QueryTranslator extends AbstractLangTranslator
implements IStatemen
stats, requestParameters, stmtParams,
stmtRewriter);
break;
case DELETE:
- handleDeleteStatement(metadataProvider, stmt, hcc,
stmtParams, stmtRewriter);
+ handleDeleteStatement(metadataProvider, stmt, hcc,
stmtParams, stmtRewriter, requestParameters);
break;
case CREATE_FEED:
handleCreateFeedStatement(metadataProvider, stmt);
@@ -3926,7 +3926,7 @@ public class QueryTranslator extends
AbstractLangTranslator implements IStatemen
}
protected void handleCopyFromStatement(MetadataProvider metadataProvider,
Statement stmt,
- IHyracksClientConnection hcc) throws Exception {
+ IHyracksClientConnection hcc, IRequestParameters
requestParameters) throws Exception {
CopyFromStatement copyStmt = (CopyFromStatement) stmt;
String datasetName = copyStmt.getDatasetName();
metadataProvider.validateDatabaseObjectName(copyStmt.getNamespace(),
datasetName, copyStmt.getSourceLocation());
@@ -3993,7 +3993,10 @@ public class QueryTranslator extends
AbstractLangTranslator implements IStatemen
numParticipatingNodes,
numParticipatingPartitions));
}
jobId = JobUtils.runJob(hcc, spec, jobFlags, false);
-
+ final IRequestTracker requestTracker =
appCtx.getRequestTracker();
+ final ClientRequest clientRequest =
+ (ClientRequest)
requestTracker.get(requestParameters.getRequestReference().getUuid());
+ clientRequest.setJobId(jobId);
String nameBefore = Thread.currentThread().getName();
try {
Thread.currentThread().setName(nameBefore + " :
WaitForCompletionForJobId: " + jobId);
@@ -4158,6 +4161,10 @@ public class QueryTranslator extends
AbstractLangTranslator implements IStatemen
participatingDatasetIds, numParticipatingNodes,
numParticipatingPartitions));
}
jobId = JobUtils.runJob(hcc, jobSpec, jobFlags, false);
+ final IRequestTracker requestTracker =
appCtx.getRequestTracker();
+ final ClientRequest clientRequest =
+ (ClientRequest)
requestTracker.get(requestParameters.getRequestReference().getUuid());
+ clientRequest.setJobId(jobId);
String nameBefore = Thread.currentThread().getName();
try {
Thread.currentThread().setName(nameBefore + " :
WaitForCompletionForJobId: " + jobId);
@@ -4181,8 +4188,8 @@ public class QueryTranslator extends
AbstractLangTranslator implements IStatemen
}
public JobSpecification handleDeleteStatement(MetadataProvider
metadataProvider, Statement stmt,
- IHyracksClientConnection hcc, Map<String, IAObject> stmtParams,
IStatementRewriter stmtRewriter)
- throws Exception {
+ IHyracksClientConnection hcc, Map<String, IAObject> stmtParams,
IStatementRewriter stmtRewriter,
+ IRequestParameters requestParameters) throws Exception {
DeleteStatement stmtDelete = (DeleteStatement) stmt;
String datasetName = stmtDelete.getDatasetName();
metadataProvider.validateDatabaseObjectName(stmtDelete.getNamespace(),
datasetName, stmt.getSourceLocation());
@@ -4223,6 +4230,10 @@ public class QueryTranslator extends
AbstractLangTranslator implements IStatemen
participatingDatasetIds, numParticipatingNodes,
numParticipatingPartitions));
}
jobId = JobUtils.runJob(hcc, jobSpec, jobFlags, false);
+ final IRequestTracker requestTracker =
appCtx.getRequestTracker();
+ final ClientRequest clientRequest =
+ (ClientRequest)
requestTracker.get(requestParameters.getRequestReference().getUuid());
+ clientRequest.setJobId(jobId);
String nameBefore = Thread.currentThread().getName();
try {
Thread.currentThread().setName(nameBefore + " :
WaitForCompletionForJobId: " + jobId);
diff --git
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/sugar-01-negative/sugar-01-negative.3.query.sqlpp
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/sugar-01-negative/sugar-01-negative.3.query.sqlpp
index 523e8edee8..11b2909152 100644
---
a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/sugar-01-negative/sugar-01-negative.3.query.sqlpp
+++
b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/group-by/sugar-01-negative/sugar-01-negative.3.query.sqlpp
@@ -24,4 +24,4 @@ USE gby;
FROM Employee e
GROUP BY e.deptno AS deptno GROUP AS g
SELECT deptno AS deptno, STRICT_AVG(g[0].e.salary) AS avgpay,
- (SELECT i.e.name AS name, i.e.salary AS salary FROM g AS i) AS workers;
+ (SELECT i.e.name AS name, i.e.salary AS salary FROM g AS i order by
i.e.name) AS workers;
