opendev/gerrit
Code Issues Proposed changes

ChangeField: Include starred changes in ref state for non-NoteDb

Browse Source 
Change-Id: I078d37898ac65701b385605926e9e27828a5479a
This commit is contained in:
Dave Borowitz
2016-12-07 14:16:44 -05:00
parent 27d3f29137
commit f056428d3e
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gerrit-server/src/main/java/com/google/gerrit/server/index/change/ChangeField.java
View File

@@ -1009,11 +1009,11 @@ public class ChangeField {
result.add(RefStatePattern.create( result.add(RefStatePattern.create(
RefNames.REFS_USERS + "*/" + RefNames.EDIT_PREFIX + id + "/*") RefNames.REFS_USERS + "*/" + RefNames.EDIT_PREFIX + id + "/*")
.toByteArray(project)); .toByteArray(project));
if (PrimaryStorage.of(input.change()) == PrimaryStorage.NOTE_DB) {
result.add( result.add(
RefStatePattern.create( RefStatePattern.create(
RefNames.refsStarredChangesPrefix(id) + "*") RefNames.refsStarredChangesPrefix(id) + "*")
.toByteArray(args.allUsers)); .toByteArray(args.allUsers));
if (PrimaryStorage.of(input.change()) == PrimaryStorage.NOTE_DB) {
result.add(RefStatePattern.create( result.add(RefStatePattern.create(
RefNames.refsDraftCommentsPrefix(id) + "*") RefNames.refsDraftCommentsPrefix(id) + "*")
.toByteArray(args.allUsers)); .toByteArray(args.allUsers));

2
gerrit-server/src/test/java/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java
View File

@@ -1728,8 +1728,8 @@ public abstract class AbstractQueryChangesTest extends GerritServerTests {
List<String> expectedPatterns = Lists.newArrayList( List<String> expectedPatterns = Lists.newArrayList(
"repo:refs/users/*/edit-" + c + "/*"); "repo:refs/users/*/edit-" + c + "/*");
if (notesMigration.readChanges()) {
expectedPatterns.add("All-Users:refs/starred-changes/" + cs + "/*"); expectedPatterns.add("All-Users:refs/starred-changes/" + cs + "/*");
if (notesMigration.readChanges()) {
expectedPatterns.add("All-Users:refs/draft-comments/" + cs + "/*"); expectedPatterns.add("All-Users:refs/draft-comments/" + cs + "/*");
} }
assertThat( assertThat(