opendev/gerrit
Code Issues Proposed changes

Remove StorageException catch clauses from Prolog predicates

Browse Source 
Change-Id: I1fbc1e51b8e6a1da09af5adb4f1aefa81e238dff
This commit is contained in:
Dave Borowitz
2019-01-15 19:26:06 -08:00
parent bd856a44ba
commit c30e1f9807
4 changed files with 19 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
java/gerrit/PRED__load_commit_labels_1.java
View File

@@ -4,11 +4,9 @@ package gerrit;
import com.google.gerrit.common.data.LabelType;
import com.google.gerrit.common.data.LabelTypes;
import com.google.gerrit.exceptions.StorageException;
import com.google.gerrit.reviewdb.client.PatchSetApproval;
import com.google.gerrit.server.query.change.ChangeData;
import com.google.gerrit.server.rules.StoredValues;
import com.googlecode.prolog_cafe.exceptions.JavaException;
import com.googlecode.prolog_cafe.exceptions.PrologException;
import com.googlecode.prolog_cafe.lang.IntegerTerm;
import com.googlecode.prolog_cafe.lang.ListTerm;
@@ -36,27 +34,22 @@ class PRED__load_commit_labels_1 extends Predicate.P1 {
Term a1 = arg1.dereference();
Term listHead = Prolog.Nil;
try {
ChangeData cd = StoredValues.CHANGE_DATA.get(engine);
LabelTypes types = cd.getLabelTypes();
ChangeData cd = StoredValues.CHANGE_DATA.get(engine);
LabelTypes types = cd.getLabelTypes();
for (PatchSetApproval a : cd.currentApprovals()) {
LabelType t = types.byLabel(a.getLabelId());
if (t == null) {
continue;
}
StructureTerm labelTerm =
new StructureTerm(
sym_label, SymbolTerm.intern(t.getName()), new IntegerTerm(a.getValue()));
StructureTerm userTerm =
new StructureTerm(sym_user, new IntegerTerm(a.getAccountId().get()));
listHead = new ListTerm(new StructureTerm(sym_commit_label, labelTerm, userTerm), listHead);
for (PatchSetApproval a : cd.currentApprovals()) {
LabelType t = types.byLabel(a.getLabelId());
if (t == null) {
continue;
}
} catch (StorageException err) {
throw new JavaException(this, 1, err);
StructureTerm labelTerm =
new StructureTerm(
sym_label, SymbolTerm.intern(t.getName()), new IntegerTerm(a.getValue()));
StructureTerm userTerm = new StructureTerm(sym_user, new IntegerTerm(a.getAccountId().get()));
listHead = new ListTerm(new StructureTerm(sym_commit_label, labelTerm, userTerm), listHead);
}
if (!a1.unify(listHead, engine.trail)) {

9
java/gerrit/PRED_get_legacy_label_types_1.java
View File

@@ -16,9 +16,7 @@ package gerrit;
import com.google.gerrit.common.data.LabelType;
import com.google.gerrit.common.data.LabelValue;
import com.google.gerrit.exceptions.StorageException;
import com.google.gerrit.server.rules.StoredValues;
import com.googlecode.prolog_cafe.exceptions.JavaException;
import com.googlecode.prolog_cafe.exceptions.PrologException;
import com.googlecode.prolog_cafe.lang.IntegerTerm;
import com.googlecode.prolog_cafe.lang.ListTerm;
@@ -53,12 +51,7 @@ class PRED_get_legacy_label_types_1 extends Predicate.P1 {
public Operation exec(Prolog engine) throws PrologException {
engine.setB0();
Term a1 = arg1.dereference();
List<LabelType> list;
try {
list = StoredValues.CHANGE_DATA.get(engine).getLabelTypes().getLabelTypes();
} catch (StorageException err) {
throw new JavaException(this, 1, err);
}
List<LabelType> list = StoredValues.CHANGE_DATA.get(engine).getLabelTypes().getLabelTypes();
Term head = Prolog.Nil;
for (int idx = list.size() - 1; 0 <= idx; idx--) {
head = new ListTerm(export(list.get(idx)), head);

9
java/gerrit/PRED_pure_revert_1.java
View File

@@ -14,9 +14,7 @@
package gerrit;
import com.google.gerrit.exceptions.StorageException;
import com.google.gerrit.server.rules.StoredValues;
import com.googlecode.prolog_cafe.exceptions.JavaException;
import com.googlecode.prolog_cafe.exceptions.PrologException;
import com.googlecode.prolog_cafe.lang.IntegerTerm;
import com.googlecode.prolog_cafe.lang.Operation;
@@ -36,12 +34,7 @@ public class PRED_pure_revert_1 extends Predicate.P1 {
engine.setB0();
Term a1 = arg1.dereference();
Boolean isPureRevert;
try {
isPureRevert = StoredValues.CHANGE_DATA.get(engine).isPureRevert();
} catch (StorageException e) {
throw new JavaException(this, 1, e);
}
Boolean isPureRevert = StoredValues.CHANGE_DATA.get(engine).isPureRevert();
if (!a1.unify(new IntegerTerm(Boolean.TRUE.equals(isPureRevert) ? 1 : 0), engine.trail)) {
return engine.fail();
}

12
java/gerrit/PRED_unresolved_comments_count_1.java
View File

@@ -14,9 +14,7 @@
package gerrit;
import com.google.gerrit.exceptions.StorageException;
import com.google.gerrit.server.rules.StoredValues;
import com.googlecode.prolog_cafe.exceptions.JavaException;
import com.googlecode.prolog_cafe.exceptions.PrologException;
import com.googlecode.prolog_cafe.lang.IntegerTerm;
import com.googlecode.prolog_cafe.lang.Operation;
@@ -35,13 +33,9 @@ public class PRED_unresolved_comments_count_1 extends Predicate.P1 {
engine.setB0();
Term a1 = arg1.dereference();
try {
Integer count = StoredValues.CHANGE_DATA.get(engine).unresolvedCommentCount();
if (!a1.unify(new IntegerTerm(count != null ? count : 0), engine.trail)) {
return engine.fail();
}
} catch (StorageException err) {
throw new JavaException(this, 1, err);
Integer count = StoredValues.CHANGE_DATA.get(engine).unresolvedCommentCount();
if (!a1.unify(new IntegerTerm(count != null ? count : 0), engine.trail)) {
return engine.fail();
}
return cont;
}