This is an automated email from the ASF dual-hosted git repository.
mhubail 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 5e79ec0 [NO ISSUE][OTH] Skip Result Metadata Updates on No Result
5e79ec0 is described below
commit 5e79ec0b895b28af74bbc9edd4f397b77ff22db4
Author: Murtadha Hubail <[email protected]>
AuthorDate: Sat May 25 07:08:38 2019 +0300
[NO ISSUE][OTH] Skip Result Metadata Updates on No Result
- user model changes: no
- storage format changes: no
- interface changes: no
Details:
- Do not attempt to update the result metadata when a job
has no result to avoid NPE.
Change-Id: I1ccae6003048f45344a5b7843a25c61d6a7bd366
Reviewed-on: https://asterix-gerrit.ics.uci.edu/3408
Sonar-Qube: Jenkins <[email protected]>
Tested-by: Jenkins <[email protected]>
Integration-Tests: Jenkins <[email protected]>
Reviewed-by: Hussain Towaileb <[email protected]>
---
.../main/java/org/apache/asterix/app/result/JobResultCallback.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/result/JobResultCallback.java
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/result/JobResultCallback.java
index 30814c6..ecf92a0 100644
---
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/result/JobResultCallback.java
+++
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/result/JobResultCallback.java
@@ -25,6 +25,7 @@ import
org.apache.asterix.common.dataflow.ICcApplicationContext;
import org.apache.hyracks.api.job.JobId;
import org.apache.hyracks.api.result.IJobResultCallback;
import org.apache.hyracks.api.result.ResultJobRecord;
+import org.apache.hyracks.api.result.ResultSetMetaData;
import org.apache.hyracks.control.cc.ClusterControllerService;
import org.apache.hyracks.control.cc.job.IJobManager;
import org.apache.hyracks.control.cc.job.JobRun;
@@ -53,7 +54,11 @@ public class JobResultCallback implements IJobResultCallback
{
}
private void updateResultMetadata(JobId jobId, ResultJobRecord
resultJobRecord) {
- final ResultMetadata metadata = (ResultMetadata)
resultJobRecord.getResultSetMetaData().getMetadata();
+ final ResultSetMetaData resultSetMetaData =
resultJobRecord.getResultSetMetaData();
+ if (resultSetMetaData == null) {
+ return;
+ }
+ final ResultMetadata metadata = (ResultMetadata)
resultSetMetaData.getMetadata();
metadata.setJobDuration(resultJobRecord.getJobDuration());
metadata.setProcessedObjects(getJobProccssedObjects(jobId));
}
