>From Michael Blow <[email protected]>:
Michael Blow has submitted this change. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18281 )
Change subject: Merge branch 'gerrit/trinity' into 'master'
......................................................................
Merge branch 'gerrit/trinity' into 'master'
Change-Id: I4408569b9d202ef120fe042781710cf04af884a1
---
M
asterixdb/asterix-common/src/main/java/org/apache/asterix/common/api/IReceptionist.java
M
asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java
M
asterixdb/asterix-app/src/main/java/org/apache/asterix/app/cc/GlobalTxManager.java
M
asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/job/listener/NodeJobTracker.java
M
hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/integration/TestJobLifecycleListener.java
6 files changed, 30 insertions(+), 23 deletions(-)
Approvals:
Jenkins: Verified
Michael Blow: Looks good to me, approved; Verified
diff --git
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/cc/GlobalTxManager.java
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/cc/GlobalTxManager.java
index 9d1e108..c85e3b0 100644
---
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/cc/GlobalTxManager.java
+++
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/cc/GlobalTxManager.java
@@ -41,6 +41,7 @@
import org.apache.hyracks.api.job.JobId;
import org.apache.hyracks.api.job.JobSpecification;
import org.apache.hyracks.api.job.JobStatus;
+import org.apache.hyracks.api.job.resource.IJobCapacityController;
import org.apache.hyracks.control.cc.ClusterControllerService;
import org.apache.hyracks.control.common.controllers.CCConfig;
import org.apache.hyracks.control.nc.io.IOManager;
@@ -223,7 +224,13 @@
}
@Override
- public void notifyJobCreation(JobId jobId, JobSpecification spec) throws
HyracksException {
+ public void notifyJobCreation(JobId jobId, JobSpecification spec,
IJobCapacityController.JobSubmissionStatus status)
+ throws HyracksException {
+
+ }
+
+ @Override
+ public void notifyJobStart(JobId jobId, JobSpecification spec) throws
HyracksException {
GlobalTxInfo globalTxInfo = (GlobalTxInfo)
spec.getProperty(GlOBAL_TX_PROPERTY_NAME);
if (globalTxInfo != null) {
beginTransaction(jobId, globalTxInfo.getNumNodes(),
globalTxInfo.getNumPartitions(),
@@ -232,11 +239,8 @@
}
@Override
- public void notifyJobStart(JobId jobId) throws HyracksException {
+ public void notifyJobFinish(JobId jobId, JobSpecification spec, JobStatus
jobStatus, List<Exception> exceptions)
+ throws HyracksException {
}
-
- @Override
- public void notifyJobFinish(JobId jobId, JobStatus jobStatus,
List<Exception> exceptions) throws HyracksException {
- }
}
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 d57835c..2ef3657 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
@@ -5412,7 +5412,7 @@
appCtx.getReceptionist().ensureSchedulable(schedulableRequest);
// ensure request not cancelled before running job
ensureNotCancelled(clientRequest);
-<<<<<<< HEAD (746e3f [ASTERIXDB-3389][STO] Support caching/eviciting columns)
+ jobSpec.setRequestId(clientRequest.getId());
if (atomicStatement != null) {
Dataset ds = metadataProvider.findDataset(((InsertStatement)
atomicStatement).getDatabaseName(),
((InsertStatement) atomicStatement).getDataverseName(),
@@ -5431,10 +5431,6 @@
}
}
jobId = JobUtils.runJob(hcc, jobSpec, jobFlags, false);
-=======
- jobSpec.setRequestId(clientRequest.getId());
- final JobId jobId = JobUtils.runJob(hcc, jobSpec, jobFlags, false);
->>>>>>> BRANCH (7c7d24 [ASTERIXDB-3343][API] Capture job state changes in
client re)
if (LOGGER.isInfoEnabled()) {
LOGGER.info("Created job {} for query uuid:{},
clientContextID:{}", jobId,
requestParameters.getRequestReference().getUuid(),
requestParameters.getClientContextId());
diff --git
a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/api/IReceptionist.java
b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/api/IReceptionist.java
index fe46589..04adce9 100644
---
a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/api/IReceptionist.java
+++
b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/api/IReceptionist.java
@@ -18,11 +18,7 @@
*/
package org.apache.asterix.common.api;
-<<<<<<< HEAD (746e3f [ASTERIXDB-3389][STO] Support caching/eviciting columns)
-import org.apache.asterix.common.dataflow.ICcApplicationContext;
import org.apache.hyracks.algebricks.core.algebra.metadata.IMetadataProvider;
-=======
->>>>>>> BRANCH (7c7d24 [ASTERIXDB-3343][API] Capture job state changes in
client re)
import org.apache.hyracks.api.exceptions.HyracksDataException;
import org.apache.hyracks.http.api.IServletRequest;
diff --git
a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/job/listener/NodeJobTracker.java
b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/job/listener/NodeJobTracker.java
index c3308c0..d8a8b1a 100644
---
a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/job/listener/NodeJobTracker.java
+++
b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/job/listener/NodeJobTracker.java
@@ -49,14 +49,9 @@
private final Map<String, Set<JobId>> nodeJobs = new HashMap<>();
@Override
-<<<<<<< HEAD (746e3f [ASTERIXDB-3389][STO] Support caching/eviciting columns)
- public synchronized void notifyJobCreation(JobId jobId, JobSpecification
spec) {
- getJobParticipatingNodes(spec,
null).stream().map(nodeJobs::get).forEach(jobsSet -> jobsSet.add(jobId));
-=======
public synchronized void notifyJobCreation(JobId jobId, JobSpecification
spec,
IJobCapacityController.JobSubmissionStatus status) {
-
getJobParticipatingNodes(spec).stream().map(nodeJobs::get).forEach(jobsSet ->
jobsSet.add(jobId));
->>>>>>> BRANCH (7c7d24 [ASTERIXDB-3343][API] Capture job state changes in
client re)
+ getJobParticipatingNodes(spec,
null).stream().map(nodeJobs::get).forEach(jobsSet -> jobsSet.add(jobId));
}
@Override
diff --git
a/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/integration/TestJobLifecycleListener.java
b/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/integration/TestJobLifecycleListener.java
index 4d4635a..19fdcfe 100644
---
a/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/integration/TestJobLifecycleListener.java
+++
b/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/integration/TestJobLifecycleListener.java
@@ -48,7 +48,8 @@
private final Set<JobId> finishWithoutStart = new HashSet<>();
@Override
- public void notifyJobCreation(JobId jobId, JobSpecification spec,
IJobCapacityController.JobSubmissionStatus status) throws HyracksException {
+ public void notifyJobCreation(JobId jobId, JobSpecification spec,
IJobCapacityController.JobSubmissionStatus status)
+ throws HyracksException {
if (created.containsKey(jobId)) {
LOGGER.log(Level.WARN, "Job " + jobId + "has been created before");
increment(doubleCreated, jobId);
@@ -76,7 +77,8 @@
}
@Override
- public void notifyJobFinish(JobId jobId, JobSpecification spec, JobStatus
jobStatus, List<Exception> exceptions) throws HyracksException {
+ public void notifyJobFinish(JobId jobId, JobSpecification spec, JobStatus
jobStatus, List<Exception> exceptions)
+ throws HyracksException {
if (!started.contains(jobId)) {
LOGGER.log(Level.WARN, "Job " + jobId + "has not been started");
finishWithoutStart.add(jobId);
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18281
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: I4408569b9d202ef120fe042781710cf04af884a1
Gerrit-Change-Number: 18281
Gerrit-PatchSet: 2
Gerrit-Owner: Michael Blow <[email protected]>
Gerrit-Reviewer: Jenkins <[email protected]>
Gerrit-Reviewer: Michael Blow <[email protected]>
Gerrit-MessageType: merged
