opendev/gerrit
Code Issues Proposed changes

Merge changes Ib468eb4b,I3dfd8f91

Browse Source 
* changes:
  Unmark DETAILED_LABELS as requiring lazy load
  Obsolete PermissionBackend#indexedChange
This commit is contained in:
Patrick Hiesel
2020-04-27 13:30:07 +00:00
committed by Gerrit Code Review
parent 0ae759604a 43fee50c12
commit 229395ac03
15 changed files with 109 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
java/com/google/gerrit/server/query/change/ChangeData.java
View File

@@ -674,7 +674,9 @@ public class ChangeData {
public ReviewerSet reviewers() {
if (reviewers == null) {
if (!lazyLoad) {
return ReviewerSet.empty();
// We are not allowed to load values from NoteDb. Reviewers were not populated with values
// from the index. However, we need these values for permission checks.
throw new IllegalStateException("reviewers not populated");
}
reviewers = approvalsUtil.getReviewers(notes(), approvals().values());
}
@@ -685,10 +687,6 @@ public class ChangeData {
this.reviewers = reviewers;
}
public ReviewerSet getReviewers() {
return reviewers;
}
public ReviewerByEmailSet reviewersByEmail() {
if (reviewersByEmail == null) {
if (!lazyLoad) {

3
java/com/google/gerrit/server/query/change/ChangeIsVisibleToPredicate.java
View File

@@ -72,7 +72,6 @@ public class ChangeIsVisibleToPredicate extends IsVisibleToPredicate<ChangeData>
return false;
}
ChangeNotes notes = notesFactory.createFromIndexedChange(change);
Optional<ProjectState> projectState = projectCache.get(cd.project());
if (!projectState.isPresent()) {
logger.atFine().log("Filter out change %s of non-existing project %s", cd, cd.project());
@@ -88,7 +87,7 @@ public class ChangeIsVisibleToPredicate extends IsVisibleToPredicate<ChangeData>
? permissionBackend.absentUser(user.getAccountId())
: permissionBackend.user(anonymousUserProvider.get());
try {
withUser.indexedChange(cd, notes).check(ChangePermission.READ);
withUser.change(cd).check(ChangePermission.READ);
} catch (PermissionBackendException e) {
Throwable cause = e.getCause();
if (cause instanceof RepositoryNotFoundException) {