opendev/gerrit
Code Issues Proposed changes

Run /abandon and /restore in a single database operation

Browse Source 
On the backend behind gerrit-review each database call is expensive,
unless we do something crazy like wrap a block of database operations
into a single mock transaction with the beginTransaction/commit idiom.

Simplify both of these tasks by getting rid of the ugly helper
function from ChangeUtil and explicitly perform all database
operations before sending email to interested parties.

Change-Id: I63cbbc7ac47d20f202b042740abb204e040e7c65
This commit is contained in:
Shawn O. Pearce
2012-11-26 14:55:56 -08:00
parent 327048b612
commit 36d8e06482
4 changed files with 139 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
gerrit-server/src/main/java/com/google/gerrit/server/ChangeUtil.java
View File

@@ -30,7 +30,6 @@ import com.google.gerrit.server.extensions.events.GitReferenceUpdated;
import com.google.gerrit.server.git.GitRepositoryManager;
import com.google.gerrit.server.git.MergeOp;
import com.google.gerrit.server.mail.EmailException;
import com.google.gerrit.server.mail.ReplyToChangeSender;
import com.google.gerrit.server.mail.RevertedSender;
import com.google.gerrit.server.patch.PatchSetInfoFactory;
import com.google.gerrit.server.patch.PatchSetInfoNotAvailableException;
@@ -56,8 +55,6 @@ import org.eclipse.jgit.revwalk.RevWalk;
import org.eclipse.jgit.util.Base64;
import org.eclipse.jgit.util.ChangeIdUtil;
import org.eclipse.jgit.util.NB;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.sql.Timestamp;
@@ -70,8 +67,6 @@ import java.util.Set;
import java.util.regex.Matcher;
public class ChangeUtil {
private static final Logger log = LoggerFactory.getLogger(ChangeUtil.class);
private static int uuidPrefix;
private static int uuidSeq;
@@ -513,25 +508,6 @@ public class ChangeUtil {
db.patchSets().delete(Collections.singleton(patch));
}
public static <T extends ReplyToChangeSender> void updatedChange(
final ReviewDb db, final IdentifiedUser user, final Change change,
final ChangeMessage cmsg, ReplyToChangeSender.Factory<T> senderFactory)
throws OrmException {
db.changeMessages().insert(Collections.singleton(cmsg));
new ApprovalsUtil(db, null).syncChangeStatus(change);
// Email the reviewers
try {
final ReplyToChangeSender cm = senderFactory.create(change);
cm.setFrom(user.getAccountId());
cm.setChangeMessage(cmsg);
cm.send();
} catch (Exception e) {
log.error("Cannot email update for change " + change.getChangeId(), e);
}
}
public static String sortKey(long lastUpdated, int id){
// The encoding uses minutes since Wed Oct 1 00:00:00 2008 UTC.
// We overrun approximately 4,085 years later, so ~6093.