Liran Zelkha has posted comments on this change. Change subject: core: Move Job, Step to JPA ......................................................................
Patch Set 49: (8 comments) https://gerrit.ovirt.org/#/c/34553/49/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/job/Job.java File backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/job/Job.java: Line 47: @NamedQuery(name = "Job.GetJobsNotInStatus", Line 48: query = "select j from Job j where j.status not in (:status) order by lastUpdateTime DESC"), Line 49: @NamedQuery( Line 50: name = "Job.DeleteCompletedJobs", Line 51: query = "delete from Job j where j.autoCleared = true and ((j.endTime < :failedEndTime and j.status in (:failStatus)) or (j.endTime < :successEndTime and j.status = :successStatus))"), > IMHO this line is too long. Pls format that so it'll be more readable. Done Line 52: @NamedQuery( Line 53: name = "Job.deleteJobOlderThanDateWithStatus", Line 54: query = "delete from Job j where j.autoCleared = true and j.endTime < :sinceDate and j.status in (:statuses)") Line 55: }) Line 51: query = "delete from Job j where j.autoCleared = true and ((j.endTime < :failedEndTime and j.status in (:failStatus)) or (j.endTime < :successEndTime and j.status = :successStatus))"), Line 52: @NamedQuery( Line 53: name = "Job.deleteJobOlderThanDateWithStatus", Line 54: query = "delete from Job j where j.autoCleared = true and j.endTime < :sinceDate and j.status in (:statuses)") Line 55: }) > +1 Done Line 56: public class Job extends IVdcQueryable implements BusinessEntity<Guid> { Line 57: Line 58: /** Line 59: * Automatic generated serial version ID Line 360: public int hashCode() { : final int prime = 31; : int result = 1; : result = prime * result + ((actionType == null) ? 0 : actionType.hashCode()); : result = prime * result + ((correlationId == null) ? 0 : correlationId.hashCode()); : result = prime * result + ((endTime == null) ? 0 : endTime.hashCode()); : result = prime * result + ((id == null) ? 0 : id.hashCode()); : result = prime * result + (isVisible ? 1231 : 1237); : result = prime * result + ((jobSubjectEntities == null) ? 0 : jobSubjectEntities.hashCode()); : result = prime * result + ((lastUpdateTime == null) ? 0 : lastUpdateTime.hashCode()); : result = prime * result + ((ownerId == null) ? 0 : ownerId.hashCode()); : result = prime * result + ((startTime == null) ? 0 : startTime.hashCode()); : result = prime * result + ((status == null) ? 0 : status.hashCode()); : result = prime * result + ((steps == null) ? 0 : steps.hashCode()); : result = prime * result + (external ? 1231 : 1237); : result = prime * result + (autoCleared ? 1231 : 1237); : return result; : } > I know that isn't your code, but IIUC we agreed on using the immutable busi Done Line 376: return result; Line 377: } Line 378: Line 379: @Override Line 380: public boolean equals(Object obj) { > pls see my comment on hashCode method. Done Line 381: if (this == obj) { Line 382: return true; Line 383: } Line 384: if (obj == null) { https://gerrit.ovirt.org/#/c/34553/49/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/job/JobSubjectEntity.java File backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/job/JobSubjectEntity.java: Line 115: if (getClass() != obj.getClass()) { : return false; : } > Can't agree more :-) Done https://gerrit.ovirt.org/#/c/34553/49/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/job/JobSubjectEntityId.java File backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/job/JobSubjectEntityId.java: Line 25: this.jobId = jobId; Line 26: } Line 27: Line 28: @Override Line 29: public int hashCode() { > return Objects.hash(entityId, jobId); Done Line 30: final int prime = 31; Line 31: int result = 1; Line 32: result = prime * result + ((entityId == null) ? 0 : entityId.hashCode()); Line 33: result = prime * result + ((jobId == null) ? 0 : jobId.hashCode()); Line 34: return result; Line 35: } Line 36: Line 37: @Override Line 38: public boolean equals(Object obj) { > @Override Done Line 39: if (this == obj) Line 40: return true; Line 41: if (obj == null) Line 42: return false; https://gerrit.ovirt.org/#/c/34553/49/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/JobDaoDbFacadeImpl.java File backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/JobDaoDbFacadeImpl.java: Line 91: @Override Line 92: public boolean checkIfJobHasTasks(Guid jobId) { Line 93: List<Step> steps = step.getStepsByJobIdForVdsmAndGluster(jobId); Line 94: Line 95: return steps.size() > 0; > Please use: Done Line 96: } -- To view, visit https://gerrit.ovirt.org/34553 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ifcfda7b055d37c92c1346b100101c27d594d21fb Gerrit-PatchSet: 49 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Liran Zelkha <[email protected]> Gerrit-Reviewer: Eli Mesika <[email protected]> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Liran Zelkha <[email protected]> Gerrit-Reviewer: Martin Mucha <[email protected]> Gerrit-Reviewer: Martin Peřina <[email protected]> Gerrit-Reviewer: Moti Asayag <[email protected]> Gerrit-Reviewer: Oved Ourfali <[email protected]> Gerrit-Reviewer: Roy Golan <[email protected]> Gerrit-Reviewer: Yevgeny Zaspitsky <[email protected]> Gerrit-Reviewer: [email protected] Gerrit-HasComments: Yes _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
