opendev/gerrit
Code Issues Proposed changes

MergeOp: Hold onto timestamp from submissionId

Browse Source 
Although we've been moving away from instance state in MergeOp, we
still need the submissionId for logging purposes. This was already
grabbing a timestamp; hold onto that so we can later use it in
constructing BatchUpdates.

Change-Id: Ic6d52fcfea271a4c80e15528c81a10b9e06c3207
This commit is contained in:
Dave Borowitz 2016-01-12 14:15:29 -05:00
parent 519c44491f
commit 9fc3ee97a4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java
View File

@ -274,7 +274,7 @@ public class MergeOp implements AutoCloseable {
}
MACHINE_ID = id;
}
private String staticSubmissionId;
private Timestamp ts;
private String submissionId;
private ReviewDb db;
@ -467,9 +467,9 @@ public class MergeOp implements AutoCloseable {
Hasher h = Hashing.sha1().newHasher();
h.putLong(Thread.currentThread().getId())
.putUnencodedChars(MACHINE_ID);
staticSubmissionId = h.hash().toString().substring(0, 8);
submissionId = change.getId().get() + "-" + TimeUtil.nowMs() +
"-" + staticSubmissionId;
ts = TimeUtil.nowTs();
submissionId = change.getId().get() + "-" + ts.getTime() +
"-" + h.hash().toString().substring(0, 8);
}
public void merge(ReviewDb db, Change change, IdentifiedUser caller,