>From Peeyush Gupta <[email protected]>:
Peeyush Gupta has uploaded this change for review. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17994 )
Change subject: [ASTERIXDB-3326][OTH] COPY FROM request shown as received while
running
......................................................................
[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
---
M
asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java
1 file changed, 30 insertions(+), 6 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/94/17994/1
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 74f5305..1f69339 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
@@ -466,7 +466,7 @@
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()));
@@ -493,7 +493,7 @@
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);
@@ -3900,7 +3900,7 @@
}
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());
@@ -3967,7 +3967,10 @@
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);
@@ -4132,6 +4135,10 @@
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);
@@ -4155,8 +4162,8 @@
}
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());
@@ -4197,6 +4204,10 @@
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);
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17994
To unsubscribe, or for help writing mail filters, visit
https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Change-Id: Ia5bb8a031a2c451616c004cddd34d451d87199a6
Gerrit-Change-Number: 17994
Gerrit-PatchSet: 1
Gerrit-Owner: Peeyush Gupta <[email protected]>
Gerrit-MessageType: newchange
