opendev/gerrit
Code Issues Proposed changes

Change PatchSetImporter to rely upon OrmDuplicateKeyException

Browse Source 
If a patch content already exists in the database gwtorm will now
throw a OrmDuplicateKeyException back to the caller.  When that is
the case we know its already been handled.

Signed-off-by: Shawn O. Pearce <sop@google.com>
This commit is contained in:
Shawn O. Pearce
2009-01-14 09:48:50 -08:00
parent e0d90c3248
commit f95b9e0ba7
1 changed files with 10 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
appjar/src/main/java/com/google/gerrit/git/PatchSetImporter.java
View File

@@ -22,6 +22,7 @@ import com.google.gerrit.client.reviewdb.PatchSetInfo;
import com.google.gerrit.client.reviewdb.RevId; import com.google.gerrit.client.reviewdb.RevId;
import com.google.gerrit.client.reviewdb.ReviewDb; import com.google.gerrit.client.reviewdb.ReviewDb;
import com.google.gerrit.client.reviewdb.UserIdentity; import com.google.gerrit.client.reviewdb.UserIdentity;
import com.google.gwtorm.client.OrmDuplicateKeyException;
import com.google.gwtorm.client.OrmException; import com.google.gwtorm.client.OrmException;
import com.google.gwtorm.client.Transaction; import com.google.gwtorm.client.Transaction;
@@ -49,7 +50,6 @@ import java.util.Map;
/** Imports a {@link PatchSet} from a {@link Commit}. */ /** Imports a {@link PatchSet} from a {@link Commit}. */
public class PatchSetImporter { public class PatchSetImporter {
private static final int MAX_TRIES = 10;
private final ReviewDb db; private final ReviewDb db;
private final Repository repo; private final Repository repo;
private final RevCommit src; private final RevCommit src;
@@ -242,30 +242,16 @@ public class PatchSetImporter {
} }
private void putPatchContent() throws OrmException { private void putPatchContent() throws OrmException {
OrmException contentPutError = null; for (final Iterator<Map.Entry<PatchContent.Key, String>> i =
for (int attempts = 0; !content.isEmpty() && ++attempts < MAX_TRIES;) { content.entrySet().iterator(); i.hasNext();) {
for (final PatchContent pc : db.patchContents().get(content.keySet())) { final Map.Entry<PatchContent.Key, String> e = i.next();
content.remove(pc.getKey()); final PatchContent pc = new PatchContent(e.getKey(), e.getValue());
try {
db.patchContents().insert(Collections.singleton(pc));
} catch (OrmDuplicateKeyException err) {
// Should be fine; someone else beat us to the insertion.
} }
i.remove();
for (final Iterator<Map.Entry<PatchContent.Key, String>> i =
content.entrySet().iterator(); i.hasNext();) {
final Map.Entry<PatchContent.Key, String> e = i.next();
final PatchContent pc = new PatchContent(e.getKey(), e.getValue());
try {
db.patchContents().insert(Collections.singleton(pc));
i.remove();
} catch (OrmException err) {
contentPutError = err;
}
}
if (!content.isEmpty()) {
GitMetaUtil.randomSleep();
}
}
if (!content.isEmpty() && contentPutError != null) {
throw contentPutError;
} }
} }