opendev/gerrit
Code Issues Proposed changes

Expose the commit to Prolog

Browse Source 
Expose the commit to allow for more granular control over what needs to
be loaded by Gerrit, and keep the parsed commit in memory. This allows
removal of the PATCH_SET_INFO and COMMIT_MESSAGE StoredValues.

Change-Id: I81649c9b976ca8750f28cb39c58051594b781c9a
This commit is contained in:
Maxime Guerreiro
2018-06-27 13:11:53 +00:00
parent bbb1765ebd
commit 20282d6879
9 changed files with 49 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
java/gerrit/AbstractCommitUserIdentityPredicate.java
View File

@@ -14,9 +14,13 @@
package gerrit;
import com.google.common.collect.ImmutableSet;
import com.google.gerrit.reviewdb.client.Account;
import com.google.gerrit.reviewdb.client.UserIdentity;
import com.google.gerrit.server.account.Emails;
import com.google.gerrit.server.rules.PrologEnvironment;
import com.google.gwtorm.server.OrmException;
import com.googlecode.prolog_cafe.exceptions.PrologException;
import com.googlecode.prolog_cafe.exceptions.SystemException;
import com.googlecode.prolog_cafe.lang.IntegerTerm;
import com.googlecode.prolog_cafe.lang.Operation;
import com.googlecode.prolog_cafe.lang.Predicate;
@@ -24,6 +28,8 @@ import com.googlecode.prolog_cafe.lang.Prolog;
import com.googlecode.prolog_cafe.lang.StructureTerm;
import com.googlecode.prolog_cafe.lang.SymbolTerm;
import com.googlecode.prolog_cafe.lang.Term;
import java.io.IOException;
import org.eclipse.jgit.lib.PersonIdent;
abstract class AbstractCommitUserIdentityPredicate extends Predicate.P3 {
private static final SymbolTerm user = SymbolTerm.intern("user", 1);
@@ -36,7 +42,7 @@ abstract class AbstractCommitUserIdentityPredicate extends Predicate.P3 {
cont = n;
}
protected Operation exec(Prolog engine, UserIdentity userId) throws PrologException {
protected Operation exec(Prolog engine, PersonIdent userId) throws PrologException {
engine.setB0();
Term a1 = arg1.dereference();
Term a2 = arg2.dereference();
@@ -46,7 +52,18 @@ abstract class AbstractCommitUserIdentityPredicate extends Predicate.P3 {
Term nameTerm = Prolog.Nil;
Term emailTerm = Prolog.Nil;
Account.Id id = userId.getAccount();
PrologEnvironment env = (PrologEnvironment) engine.control;
Emails emails = env.getArgs().getEmails();
Account.Id id = null;
try {
ImmutableSet<Account.Id> ids = emails.getAccountFor(userId.getEmailAddress());
if (ids.size() == 1) {
id = ids.iterator().next();
}
} catch (IOException | OrmException e) {
throw new SystemException(e.getMessage());
}
if (id == null) {
idTerm = anonymous;
} else {
@@ -58,7 +75,7 @@ abstract class AbstractCommitUserIdentityPredicate extends Predicate.P3 {
nameTerm = SymbolTerm.create(name);
}
String email = userId.getEmail();
String email = userId.getEmailAddress();
if (email != null && !email.equals("")) {
emailTerm = SymbolTerm.create(email);
}