Merge changes Ic0bf6c01,I4e86d944,Iba29f161,I453023b1,Ibad90931, ...
* changes:
Remove unused PatchSetUtil.publish method
ChangeMessagesUtil: Remove ReviewDb-specific logic
CommentsUtil: Remove ReviewDb-specific logic
AppovalsUtil: Remove ReviewDb-specific logic
Remove assume checks from tests to verify that changes are read from NoteDb
Remove ReviewDb-specific test assertions
Remove more ReviewDb-only tests
ChangeNotes: Remove logic to scan changes from ReviewDb
RetryHelper: Remove ReviewDb logic
Remove ReviewDb-specific logic from tests
Remove ReviewDb-only submit tests
Remove assume checks from tests to verify that change ReviewDb is disabled
Remove obsolete H2 class
Remove unused ScriptRunner
diff --git a/java/com/google/gerrit/acceptance/PushOneCommit.java b/java/com/google/gerrit/acceptance/PushOneCommit.java
index 5e45df2..d0735c8 100644
--- a/java/com/google/gerrit/acceptance/PushOneCommit.java
+++ b/java/com/google/gerrit/acceptance/PushOneCommit.java
@@ -16,7 +16,6 @@
import static com.google.common.truth.Truth.assertThat;
import static com.google.gerrit.acceptance.GitUtil.pushHead;
-import static java.util.stream.Collectors.toList;
import static org.junit.Assert.assertEquals;
import com.google.common.base.Strings;
@@ -31,7 +30,6 @@
import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gerrit.server.ApprovalsUtil;
import com.google.gerrit.server.notedb.ChangeNotes;
-import com.google.gerrit.server.notedb.NotesMigration;
import com.google.gerrit.server.notedb.ReviewerStateInternal;
import com.google.gerrit.server.query.change.ChangeData;
import com.google.gerrit.server.query.change.InternalChangeQuery;
@@ -43,7 +41,6 @@
import java.util.List;
import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
-import java.util.stream.Stream;
import org.eclipse.jgit.api.TagCommand;
import org.eclipse.jgit.junit.TestRepository;
import org.eclipse.jgit.lib.PersonIdent;
@@ -144,7 +141,6 @@
private final ChangeNotes.Factory notesFactory;
private final ApprovalsUtil approvalsUtil;
private final Provider<InternalChangeQuery> queryProvider;
- private final NotesMigration notesMigration;
private final ReviewDb db;
private final TestRepository<?> testRepo;
@@ -162,7 +158,6 @@
ChangeNotes.Factory notesFactory,
ApprovalsUtil approvalsUtil,
Provider<InternalChangeQuery> queryProvider,
- NotesMigration notesMigration,
@Assisted ReviewDb db,
@Assisted PersonIdent i,
@Assisted TestRepository<?> testRepo)
@@ -171,7 +166,6 @@
notesFactory,
approvalsUtil,
queryProvider,
- notesMigration,
db,
i,
testRepo,
@@ -185,7 +179,6 @@
ChangeNotes.Factory notesFactory,
ApprovalsUtil approvalsUtil,
Provider<InternalChangeQuery> queryProvider,
- NotesMigration notesMigration,
@Assisted ReviewDb db,
@Assisted PersonIdent i,
@Assisted TestRepository<?> testRepo,
@@ -195,7 +188,6 @@
notesFactory,
approvalsUtil,
queryProvider,
- notesMigration,
db,
i,
testRepo,
@@ -210,7 +202,6 @@
ChangeNotes.Factory notesFactory,
ApprovalsUtil approvalsUtil,
Provider<InternalChangeQuery> queryProvider,
- NotesMigration notesMigration,
@Assisted ReviewDb db,
@Assisted PersonIdent i,
@Assisted TestRepository<?> testRepo,
@@ -222,7 +213,6 @@
notesFactory,
approvalsUtil,
queryProvider,
- notesMigration,
db,
i,
testRepo,
@@ -237,24 +227,13 @@
ChangeNotes.Factory notesFactory,
ApprovalsUtil approvalsUtil,
Provider<InternalChangeQuery> queryProvider,
- NotesMigration notesMigration,
@Assisted ReviewDb db,
@Assisted PersonIdent i,
@Assisted TestRepository<?> testRepo,
@Assisted String subject,
@Assisted Map<String, String> files)
throws Exception {
- this(
- notesFactory,
- approvalsUtil,
- queryProvider,
- notesMigration,
- db,
- i,
- testRepo,
- subject,
- files,
- null);
+ this(notesFactory, approvalsUtil, queryProvider, db, i, testRepo, subject, files, null);
}
@AssistedInject
@@ -262,7 +241,6 @@
ChangeNotes.Factory notesFactory,
ApprovalsUtil approvalsUtil,
Provider<InternalChangeQuery> queryProvider,
- NotesMigration notesMigration,
@Assisted ReviewDb db,
@Assisted PersonIdent i,
@Assisted TestRepository<?> testRepo,
@@ -275,7 +253,6 @@
notesFactory,
approvalsUtil,
queryProvider,
- notesMigration,
db,
i,
testRepo,
@@ -288,7 +265,6 @@
ChangeNotes.Factory notesFactory,
ApprovalsUtil approvalsUtil,
Provider<InternalChangeQuery> queryProvider,
- NotesMigration notesMigration,
ReviewDb db,
PersonIdent i,
TestRepository<?> testRepo,
@@ -301,7 +277,6 @@
this.notesFactory = notesFactory;
this.approvalsUtil = approvalsUtil;
this.queryProvider = queryProvider;
- this.notesMigration = notesMigration;
this.subject = subject;
this.files = files;
this.changeId = changeId;
@@ -436,22 +411,15 @@
assertThat(c.getSubject()).isEqualTo(resSubj);
assertThat(c.getStatus()).isEqualTo(expectedStatus);
assertThat(Strings.emptyToNull(c.getTopic())).isEqualTo(expectedTopic);
- if (notesMigration.readChanges()) {
- assertReviewers(c, ReviewerStateInternal.REVIEWER, expectedReviewers);
- assertReviewers(c, ReviewerStateInternal.CC, expectedCcs);
- } else {
- assertReviewers(
- c,
- ReviewerStateInternal.REVIEWER,
- Stream.concat(expectedReviewers.stream(), expectedCcs.stream()).collect(toList()));
- }
+ assertReviewers(c, ReviewerStateInternal.REVIEWER, expectedReviewers);
+ assertReviewers(c, ReviewerStateInternal.CC, expectedCcs);
}
private void assertReviewers(
Change c, ReviewerStateInternal state, List<TestAccount> expectedReviewers)
throws OrmException {
Iterable<Account.Id> actualIds =
- approvalsUtil.getReviewers(db, notesFactory.createChecked(db, c)).byState(state);
+ approvalsUtil.getReviewers(notesFactory.createChecked(db, c)).byState(state);
assertThat(actualIds)
.containsExactlyElementsIn(Sets.newHashSet(TestAccount.ids(expectedReviewers)));
}
diff --git a/java/com/google/gerrit/server/ApprovalsUtil.java b/java/com/google/gerrit/server/ApprovalsUtil.java
index 3625de6..95b92af 100644
--- a/java/com/google/gerrit/server/ApprovalsUtil.java
+++ b/java/com/google/gerrit/server/ApprovalsUtil.java
@@ -21,7 +21,6 @@
import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableListMultimap;
import com.google.common.collect.Iterables;
import com.google.common.collect.ListMultimap;
import com.google.common.collect.Lists;
@@ -44,7 +43,6 @@
import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gerrit.server.notedb.ChangeNotes;
import com.google.gerrit.server.notedb.ChangeUpdate;
-import com.google.gerrit.server.notedb.NotesMigration;
import com.google.gerrit.server.notedb.ReviewerStateInternal;
import com.google.gerrit.server.permissions.ChangePermission;
import com.google.gerrit.server.permissions.LabelPermission;
@@ -106,7 +104,6 @@
return Iterables.filter(psas, a -> Objects.equals(a.getAccountId(), accountId));
}
- private final NotesMigration migration;
private final ApprovalCopier copier;
private final PermissionBackend permissionBackend;
private final ProjectCache projectCache;
@@ -114,11 +111,7 @@
@VisibleForTesting
@Inject
public ApprovalsUtil(
- NotesMigration migration,
- ApprovalCopier copier,
- PermissionBackend permissionBackend,
- ProjectCache projectCache) {
- this.migration = migration;
+ ApprovalCopier copier, PermissionBackend permissionBackend, ProjectCache projectCache) {
this.copier = copier;
this.permissionBackend = permissionBackend;
this.projectCache = projectCache;
@@ -127,15 +120,11 @@
/**
* Get all reviewers for a change.
*
- * @param db review database.
* @param notes change notes.
* @return reviewers for the change.
* @throws OrmException if reviewers for the change could not be read.
*/
- public ReviewerSet getReviewers(ReviewDb db, ChangeNotes notes) throws OrmException {
- if (!migration.readChanges()) {
- return ReviewerSet.fromApprovals(db.patchSetApprovals().byChange(notes.getChangeId()));
- }
+ public ReviewerSet getReviewers(ChangeNotes notes) throws OrmException {
return notes.load().getReviewers();
}
@@ -148,23 +137,17 @@
*/
public ReviewerSet getReviewers(ChangeNotes notes, Iterable<PatchSetApproval> allApprovals)
throws OrmException {
- if (!migration.readChanges()) {
- return ReviewerSet.fromApprovals(allApprovals);
- }
return notes.load().getReviewers();
}
/**
- * Get updates to reviewer set. Always returns empty list for ReviewDb.
+ * Get updates to reviewer set.
*
* @param notes change notes.
* @return reviewer updates for the change.
* @throws OrmException if reviewer updates for the change could not be read.
*/
public List<ReviewerStatusUpdate> getReviewerUpdates(ChangeNotes notes) throws OrmException {
- if (!migration.readChanges()) {
- return ImmutableList.of();
- }
return notes.load().getReviewerUpdates();
}
@@ -200,13 +183,7 @@
throws OrmException {
PatchSet.Id psId = change.currentPatchSetId();
Collection<Account.Id> existingReviewers;
- if (migration.readChanges()) {
- // If using NoteDB, we only want reviewers in the REVIEWER state.
- existingReviewers = notes.load().getReviewers().byState(REVIEWER);
- } else {
- // Prior to NoteDB, we gather all reviewers regardless of state.
- existingReviewers = getReviewers(db, notes).all();
- }
+ existingReviewers = notes.load().getReviewers().byState(REVIEWER);
// Existing reviewers should include pending additions in the REVIEWER
// state, taken from ChangeUpdate.
existingReviewers = Lists.newArrayList(existingReviewers);
@@ -308,7 +285,7 @@
}
/**
- * Adds approvals to ChangeUpdate for a new patch set, and writes to ReviewDb.
+ * Adds approvals to ChangeUpdate for a new patch set, and writes to NoteDb.
*
* @param db review database.
* @param update change update.
@@ -346,7 +323,6 @@
for (PatchSetApproval psa : cells) {
update.putApproval(psa.getLabel(), psa.getValue());
}
- db.patchSetApprovals().insert(cells);
return cells;
}
@@ -377,16 +353,8 @@
}
}
- public ListMultimap<PatchSet.Id, PatchSetApproval> byChange(ReviewDb db, ChangeNotes notes)
+ public ListMultimap<PatchSet.Id, PatchSetApproval> byChange(ChangeNotes notes)
throws OrmException {
- if (!migration.readChanges()) {
- ImmutableListMultimap.Builder<PatchSet.Id, PatchSetApproval> result =
- ImmutableListMultimap.builder();
- for (PatchSetApproval psa : db.patchSetApprovals().byChange(notes.getChangeId())) {
- result.put(psa.getPatchSetId(), psa);
- }
- return result.build();
- }
return notes.load().getApprovals();
}
@@ -397,9 +365,6 @@
@Nullable RevWalk rw,
@Nullable Config repoConfig)
throws OrmException {
- if (!migration.readChanges()) {
- return sortApprovals(db.patchSetApprovals().byPatchSet(psId));
- }
return copier.getForPatchSet(db, notes, psId, rw, repoConfig);
}
@@ -411,19 +376,16 @@
@Nullable RevWalk rw,
@Nullable Config repoConfig)
throws OrmException {
- if (!migration.readChanges()) {
- return sortApprovals(db.patchSetApprovals().byPatchSetUser(psId, accountId));
- }
return filterApprovals(byPatchSet(db, notes, psId, rw, repoConfig), accountId);
}
- public PatchSetApproval getSubmitter(ReviewDb db, ChangeNotes notes, PatchSet.Id c) {
+ public PatchSetApproval getSubmitter(ChangeNotes notes, PatchSet.Id c) {
if (c == null) {
return null;
}
try {
// Submit approval is never copied, so bypass expensive byPatchSet call.
- return getSubmitter(c, byChange(db, notes).get(c));
+ return getSubmitter(c, byChange(notes).get(c));
} catch (OrmException e) {
return null;
}
diff --git a/java/com/google/gerrit/server/ChangeMessagesUtil.java b/java/com/google/gerrit/server/ChangeMessagesUtil.java
index 969cf38..c2b6b23 100644
--- a/java/com/google/gerrit/server/ChangeMessagesUtil.java
+++ b/java/com/google/gerrit/server/ChangeMessagesUtil.java
@@ -15,37 +15,24 @@
package com.google.gerrit.server;
import static com.google.common.base.Preconditions.checkState;
-import static com.google.gerrit.reviewdb.server.ReviewDbUtil.unwrapDb;
import static java.util.Objects.requireNonNull;
-import com.google.common.annotations.VisibleForTesting;
import com.google.gerrit.common.Nullable;
import com.google.gerrit.extensions.common.ChangeMessageInfo;
import com.google.gerrit.reviewdb.client.Account;
import com.google.gerrit.reviewdb.client.ChangeMessage;
import com.google.gerrit.reviewdb.client.PatchSet;
-import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gerrit.server.account.AccountLoader;
import com.google.gerrit.server.notedb.ChangeNotes;
import com.google.gerrit.server.notedb.ChangeUpdate;
-import com.google.gerrit.server.notedb.NoteDbChangeState.PrimaryStorage;
-import com.google.gerrit.server.notedb.NotesMigration;
-import com.google.gerrit.server.update.BatchUpdateReviewDb;
import com.google.gerrit.server.update.ChangeContext;
import com.google.gwtorm.server.OrmException;
-import com.google.inject.Inject;
import com.google.inject.Singleton;
import java.sql.Timestamp;
-import java.util.Collections;
import java.util.List;
import java.util.Objects;
-/**
- * Utility functions to manipulate ChangeMessages.
- *
- * <p>These methods either query for and update ChangeMessages in the NoteDb or ReviewDb, depending
- * on the state of the NotesMigration.
- */
+/** Utility functions to manipulate ChangeMessages. */
@Singleton
public class ChangeMessagesUtil {
public static final String AUTOGENERATED_TAG_PREFIX = "autogenerated:";
@@ -100,27 +87,11 @@
return workInProgress ? TAG_UPLOADED_WIP_PATCH_SET : TAG_UPLOADED_PATCH_SET;
}
- private static List<ChangeMessage> sortChangeMessages(Iterable<ChangeMessage> changeMessage) {
- return ChangeNotes.MESSAGE_BY_TIME.sortedCopy(changeMessage);
- }
-
- private final NotesMigration migration;
-
- @VisibleForTesting
- @Inject
- public ChangeMessagesUtil(NotesMigration migration) {
- this.migration = migration;
- }
-
- public List<ChangeMessage> byChange(ReviewDb db, ChangeNotes notes) throws OrmException {
- if (!migration.readChanges()) {
- return sortChangeMessages(db.changeMessages().byChange(notes.getChangeId()));
- }
+ public List<ChangeMessage> byChange(ChangeNotes notes) throws OrmException {
return notes.load().getChangeMessages();
}
- public void addChangeMessage(ReviewDb db, ChangeUpdate update, ChangeMessage changeMessage)
- throws OrmException {
+ public void addChangeMessage(ChangeUpdate update, ChangeMessage changeMessage) {
checkState(
Objects.equals(changeMessage.getAuthor(), update.getNullableAccountId()),
"cannot store change message by %s in update by %s",
@@ -128,7 +99,6 @@
update.getNullableAccountId());
update.setChangeMessage(changeMessage.getMessage());
update.setTag(changeMessage.getTag());
- db.changeMessages().insert(Collections.singleton(changeMessage));
}
/**
@@ -139,63 +109,14 @@
* deleted from both NoteDb and ReviewDb, the index of the change message must be used rather than
* its ID.
*
- * @param db the {@code ReviewDb} instance to update.
* @param update change update.
* @param targetMessageIdx the index of the target change message.
* @param newMessage the new message which is going to replace the old.
- * @throws OrmException
*/
- public void replaceChangeMessage(
- ReviewDb db, ChangeUpdate update, int targetMessageIdx, String newMessage)
- throws OrmException {
- if (PrimaryStorage.of(update.getChange()).equals(PrimaryStorage.REVIEW_DB)) {
- if (db instanceof BatchUpdateReviewDb) {
- db = ((BatchUpdateReviewDb) db).unsafeGetDelegate();
- }
- db = unwrapDb(db);
-
- List<ChangeMessage> messagesInReviewDb =
- sortChangeMessages(db.changeMessages().byChange(update.getId()));
- if (migration.readChanges()) {
- sanityCheckForChangeMessages(messagesInReviewDb, update.getNotes().getChangeMessages());
- }
- ChangeMessage targetMessage = messagesInReviewDb.get(targetMessageIdx);
- targetMessage.setMessage(newMessage);
- db.changeMessages().upsert(Collections.singleton(targetMessage));
- }
-
+ public void replaceChangeMessage(ChangeUpdate update, int targetMessageIdx, String newMessage) {
update.deleteChangeMessageByRewritingHistory(targetMessageIdx, newMessage);
}
- private static void sanityCheckForChangeMessages(
- List<ChangeMessage> messagesInReviewDb, List<ChangeMessage> messagesInNoteDb) {
- String message =
- String.format(
- "Change messages in ReivewDb and NoteDb don't match: NoteDb %s; ReviewDb %s",
- messagesInNoteDb, messagesInReviewDb);
- if (messagesInReviewDb.size() != messagesInNoteDb.size()) {
- throw new IllegalStateException(message);
- }
-
- for (int i = 0; i < messagesInReviewDb.size(); i++) {
- ChangeMessage messageInReviewDb = messagesInReviewDb.get(i);
- ChangeMessage messageInNoteDb = messagesInNoteDb.get(i);
-
- // Don't compare the keys because they are different for the same change message in NoteDb and
- // ReviewDb.
- boolean isEqual =
- Objects.equals(messageInReviewDb.getAuthor(), messageInNoteDb.getAuthor())
- && Objects.equals(messageInReviewDb.getWrittenOn(), messageInNoteDb.getWrittenOn())
- && Objects.equals(messageInReviewDb.getMessage(), messageInNoteDb.getMessage())
- && Objects.equals(messageInReviewDb.getPatchSetId(), messageInNoteDb.getPatchSetId())
- && Objects.equals(messageInReviewDb.getTag(), messageInNoteDb.getTag())
- && Objects.equals(messageInReviewDb.getRealAuthor(), messageInNoteDb.getRealAuthor());
- if (!isEqual) {
- throw new IllegalStateException(message);
- }
- }
- }
-
/**
* @param tag value of a tag, or null.
* @return whether the tag starts with the autogenerated prefix.
diff --git a/java/com/google/gerrit/server/CommentsUtil.java b/java/com/google/gerrit/server/CommentsUtil.java
index 99dfbbb..b3812a0 100644
--- a/java/com/google/gerrit/server/CommentsUtil.java
+++ b/java/com/google/gerrit/server/CommentsUtil.java
@@ -16,16 +16,12 @@
import static com.google.common.base.MoreObjects.firstNonNull;
import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.gerrit.reviewdb.client.PatchLineComment.Status.PUBLISHED;
import static java.util.stream.Collectors.toList;
import com.google.common.collect.ComparisonChain;
import com.google.common.collect.FluentIterable;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import com.google.common.collect.Ordering;
-import com.google.common.collect.Streams;
import com.google.gerrit.common.Nullable;
import com.google.gerrit.extensions.client.Side;
import com.google.gerrit.extensions.common.CommentInfo;
@@ -35,31 +31,23 @@
import com.google.gerrit.reviewdb.client.Comment;
import com.google.gerrit.reviewdb.client.Patch;
import com.google.gerrit.reviewdb.client.PatchLineComment;
-import com.google.gerrit.reviewdb.client.PatchLineComment.Status;
import com.google.gerrit.reviewdb.client.PatchSet;
import com.google.gerrit.reviewdb.client.RefNames;
import com.google.gerrit.reviewdb.client.RobotComment;
-import com.google.gerrit.reviewdb.server.ReviewDb;
-import com.google.gerrit.reviewdb.server.ReviewDbUtil;
import com.google.gerrit.server.config.AllUsersName;
import com.google.gerrit.server.config.GerritServerId;
import com.google.gerrit.server.git.GitRepositoryManager;
import com.google.gerrit.server.notedb.ChangeNotes;
import com.google.gerrit.server.notedb.ChangeUpdate;
-import com.google.gerrit.server.notedb.NoteDbChangeState.PrimaryStorage;
-import com.google.gerrit.server.notedb.NotesMigration;
import com.google.gerrit.server.patch.PatchListCache;
import com.google.gerrit.server.patch.PatchListNotAvailableException;
-import com.google.gerrit.server.update.BatchUpdateReviewDb;
import com.google.gerrit.server.update.ChangeContext;
import com.google.gwtorm.server.OrmException;
-import com.google.gwtorm.server.ResultSet;
import com.google.inject.Inject;
import com.google.inject.Singleton;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Collections;
import java.util.List;
import java.util.Optional;
import org.eclipse.jgit.lib.BatchRefUpdate;
@@ -70,12 +58,7 @@
import org.eclipse.jgit.revwalk.RevWalk;
import org.eclipse.jgit.transport.ReceiveCommand;
-/**
- * Utility functions to manipulate Comments.
- *
- * <p>These methods either query for and update Comments in the NoteDb or ReviewDb, depending on the
- * state of the NotesMigration.
- */
+/** Utility functions to manipulate Comments. */
@Singleton
public class CommentsUtil {
public static final Ordering<Comment> COMMENT_ORDER =
@@ -127,18 +110,13 @@
private final GitRepositoryManager repoManager;
private final AllUsersName allUsers;
- private final NotesMigration migration;
private final String serverId;
@Inject
CommentsUtil(
- GitRepositoryManager repoManager,
- AllUsersName allUsers,
- NotesMigration migration,
- @GerritServerId String serverId) {
+ GitRepositoryManager repoManager, AllUsersName allUsers, @GerritServerId String serverId) {
this.repoManager = repoManager;
this.allUsers = allUsers;
- this.migration = migration;
this.serverId = serverId;
}
@@ -158,7 +136,7 @@
} else {
// Inherit unresolved value from inReplyTo comment if not specified.
Comment.Key key = new Comment.Key(parentUuid, path, psId.patchSetId);
- Optional<Comment> parent = getPublished(ctx.getDb(), ctx.getNotes(), key);
+ Optional<Comment> parent = getPublished(ctx.getNotes(), key);
if (!parent.isPresent()) {
throw new UnprocessableEntityException("Invalid parentUuid supplied for comment");
}
@@ -201,119 +179,64 @@
return c;
}
- public Optional<Comment> getPublished(ReviewDb db, ChangeNotes notes, Comment.Key key)
- throws OrmException {
- if (!migration.readChanges()) {
- return getReviewDb(db, notes, key);
- }
- return publishedByChange(db, notes).stream().filter(c -> key.equals(c.key)).findFirst();
+ public Optional<Comment> getPublished(ChangeNotes notes, Comment.Key key) throws OrmException {
+ return publishedByChange(notes).stream().filter(c -> key.equals(c.key)).findFirst();
}
- public Optional<Comment> getDraft(
- ReviewDb db, ChangeNotes notes, IdentifiedUser user, Comment.Key key) throws OrmException {
- if (!migration.readChanges()) {
- Optional<Comment> c = getReviewDb(db, notes, key);
- if (c.isPresent() && !c.get().author.getId().equals(user.getAccountId())) {
- throw new OrmException(
- String.format(
- "Expected draft %s to belong to account %s, but it belongs to %s",
- key, user.getAccountId(), c.get().author.getId()));
- }
- return c;
- }
- return draftByChangeAuthor(db, notes, user.getAccountId())
+ public Optional<Comment> getDraft(ChangeNotes notes, IdentifiedUser user, Comment.Key key)
+ throws OrmException {
+ return draftByChangeAuthor(notes, user.getAccountId())
.stream()
.filter(c -> key.equals(c.key))
.findFirst();
}
- private Optional<Comment> getReviewDb(ReviewDb db, ChangeNotes notes, Comment.Key key)
- throws OrmException {
- return Optional.ofNullable(
- db.patchComments().get(PatchLineComment.Key.from(notes.getChangeId(), key)))
- .map(plc -> plc.asComment(serverId));
- }
-
- public List<Comment> publishedByChange(ReviewDb db, ChangeNotes notes) throws OrmException {
- if (!migration.readChanges()) {
- return sort(byCommentStatus(db.patchComments().byChange(notes.getChangeId()), PUBLISHED));
- }
-
+ public List<Comment> publishedByChange(ChangeNotes notes) throws OrmException {
notes.load();
return sort(Lists.newArrayList(notes.getComments().values()));
}
public List<RobotComment> robotCommentsByChange(ChangeNotes notes) throws OrmException {
- if (!migration.readChanges()) {
- return ImmutableList.of();
- }
-
notes.load();
return sort(Lists.newArrayList(notes.getRobotComments().values()));
}
- public List<Comment> draftByChange(ReviewDb db, ChangeNotes notes) throws OrmException {
- if (!migration.readChanges()) {
- return sort(byCommentStatus(db.patchComments().byChange(notes.getChangeId()), Status.DRAFT));
- }
-
+ public List<Comment> draftByChange(ChangeNotes notes) throws OrmException {
List<Comment> comments = new ArrayList<>();
for (Ref ref : getDraftRefs(notes.getChangeId())) {
Account.Id account = Account.Id.fromRefSuffix(ref.getName());
if (account != null) {
- comments.addAll(draftByChangeAuthor(db, notes, account));
+ comments.addAll(draftByChangeAuthor(notes, account));
}
}
return sort(comments);
}
- private List<Comment> byCommentStatus(
- ResultSet<PatchLineComment> comments, PatchLineComment.Status status) {
- return toComments(
- serverId, Lists.newArrayList(Iterables.filter(comments, c -> c.getStatus() == status)));
- }
-
- public List<Comment> byPatchSet(ReviewDb db, ChangeNotes notes, PatchSet.Id psId)
- throws OrmException {
- if (!migration.readChanges()) {
- return sort(toComments(serverId, db.patchComments().byPatchSet(psId).toList()));
- }
+ public List<Comment> byPatchSet(ChangeNotes notes, PatchSet.Id psId) throws OrmException {
List<Comment> comments = new ArrayList<>();
- comments.addAll(publishedByPatchSet(db, notes, psId));
+ comments.addAll(publishedByPatchSet(notes, psId));
for (Ref ref : getDraftRefs(notes.getChangeId())) {
Account.Id account = Account.Id.fromRefSuffix(ref.getName());
if (account != null) {
- comments.addAll(draftByPatchSetAuthor(db, psId, account, notes));
+ comments.addAll(draftByPatchSetAuthor(psId, account, notes));
}
}
return sort(comments);
}
- public List<Comment> publishedByChangeFile(
- ReviewDb db, ChangeNotes notes, Change.Id changeId, String file) throws OrmException {
- if (!migration.readChanges()) {
- return sort(
- toComments(serverId, db.patchComments().publishedByChangeFile(changeId, file).toList()));
- }
+ public List<Comment> publishedByChangeFile(ChangeNotes notes, String file) throws OrmException {
return commentsOnFile(notes.load().getComments().values(), file);
}
- public List<Comment> publishedByPatchSet(ReviewDb db, ChangeNotes notes, PatchSet.Id psId)
+ public List<Comment> publishedByPatchSet(ChangeNotes notes, PatchSet.Id psId)
throws OrmException {
- if (!migration.readChanges()) {
- return removeCommentsOnAncestorOfCommitMessage(
- sort(toComments(serverId, db.patchComments().publishedByPatchSet(psId).toList())));
- }
return removeCommentsOnAncestorOfCommitMessage(
commentsOnPatchSet(notes.load().getComments().values(), psId));
}
public List<RobotComment> robotCommentsByPatchSet(ChangeNotes notes, PatchSet.Id psId)
throws OrmException {
- if (!migration.readChanges()) {
- return ImmutableList.of();
- }
return commentsOnPatchSet(notes.load().getRobotComments().values(), psId);
}
@@ -330,49 +253,28 @@
.collect(toList());
}
- public List<Comment> draftByPatchSetAuthor(
- ReviewDb db, PatchSet.Id psId, Account.Id author, ChangeNotes notes) throws OrmException {
- if (!migration.readChanges()) {
- return sort(
- toComments(serverId, db.patchComments().draftByPatchSetAuthor(psId, author).toList()));
- }
+ public List<Comment> draftByPatchSetAuthor(PatchSet.Id psId, Account.Id author, ChangeNotes notes)
+ throws OrmException {
return commentsOnPatchSet(notes.load().getDraftComments(author).values(), psId);
}
- public List<Comment> draftByChangeFileAuthor(
- ReviewDb db, ChangeNotes notes, String file, Account.Id author) throws OrmException {
- if (!migration.readChanges()) {
- return sort(
- toComments(
- serverId,
- db.patchComments()
- .draftByChangeFileAuthor(notes.getChangeId(), file, author)
- .toList()));
- }
+ public List<Comment> draftByChangeFileAuthor(ChangeNotes notes, String file, Account.Id author)
+ throws OrmException {
return commentsOnFile(notes.load().getDraftComments(author).values(), file);
}
- public List<Comment> draftByChangeAuthor(ReviewDb db, ChangeNotes notes, Account.Id author)
+ public List<Comment> draftByChangeAuthor(ChangeNotes notes, Account.Id author)
throws OrmException {
- if (!migration.readChanges()) {
- return Streams.stream(db.patchComments().draftByAuthor(author))
- .filter(c -> c.getPatchSetId().getParentKey().equals(notes.getChangeId()))
- .map(plc -> plc.asComment(serverId))
- .sorted(COMMENT_ORDER)
- .collect(toList());
- }
List<Comment> comments = new ArrayList<>();
comments.addAll(notes.getDraftComments(author).values());
return sort(comments);
}
public void putComments(
- ReviewDb db, ChangeUpdate update, PatchLineComment.Status status, Iterable<Comment> comments)
- throws OrmException {
+ ChangeUpdate update, PatchLineComment.Status status, Iterable<Comment> comments) {
for (Comment c : comments) {
update.putComment(status, c);
}
- db.patchComments().upsert(toPatchLineComments(update.getId(), status, comments));
}
public void putRobotComments(ChangeUpdate update, Iterable<RobotComment> comments) {
@@ -381,37 +283,14 @@
}
}
- public void deleteComments(ReviewDb db, ChangeUpdate update, Iterable<Comment> comments)
- throws OrmException {
+ public void deleteComments(ChangeUpdate update, Iterable<Comment> comments) {
for (Comment c : comments) {
update.deleteComment(c);
}
- db.patchComments()
- .delete(toPatchLineComments(update.getId(), PatchLineComment.Status.DRAFT, comments));
}
public void deleteCommentByRewritingHistory(
- ReviewDb db, ChangeUpdate update, Comment.Key commentKey, PatchSet.Id psId, String newMessage)
- throws OrmException {
- if (PrimaryStorage.of(update.getChange()).equals(PrimaryStorage.REVIEW_DB)) {
- PatchLineComment.Key key =
- new PatchLineComment.Key(new Patch.Key(psId, commentKey.filename), commentKey.uuid);
-
- if (db instanceof BatchUpdateReviewDb) {
- db = ((BatchUpdateReviewDb) db).unsafeGetDelegate();
- }
- db = ReviewDbUtil.unwrapDb(db);
-
- PatchLineComment patchLineComment = db.patchComments().get(key);
-
- if (!patchLineComment.getStatus().equals(PUBLISHED)) {
- throw new OrmException(String.format("comment %s is not published", key));
- }
-
- patchLineComment.setMessage(newMessage);
- db.patchComments().upsert(Collections.singleton(patchLineComment));
- }
-
+ ChangeUpdate update, Comment.Key commentKey, String newMessage) {
update.deleteCommentByRewritingHistory(commentKey.uuid, newMessage);
}
diff --git a/java/com/google/gerrit/server/PatchSetUtil.java b/java/com/google/gerrit/server/PatchSetUtil.java
index f6c7abc..8f26082 100644
--- a/java/com/google/gerrit/server/PatchSetUtil.java
+++ b/java/com/google/gerrit/server/PatchSetUtil.java
@@ -17,7 +17,6 @@
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.collect.ImmutableMap.toImmutableMap;
import static com.google.gerrit.server.ChangeUtil.PS_ID_ORDER;
-import static com.google.gerrit.server.notedb.PatchSetState.PUBLISHED;
import static java.util.Objects.requireNonNull;
import static java.util.function.Function.identity;
@@ -149,12 +148,6 @@
return ps;
}
- public void publish(ReviewDb db, ChangeUpdate update, PatchSet ps) throws OrmException {
- ensurePatchSetMatches(ps.getId(), update);
- update.setPatchSetState(PUBLISHED);
- db.patchSets().update(Collections.singleton(ps));
- }
-
private static void ensurePatchSetMatches(PatchSet.Id psId, ChangeUpdate update) {
Change.Id changeId = update.getChange().getId();
checkArgument(
diff --git a/java/com/google/gerrit/server/PublishCommentUtil.java b/java/com/google/gerrit/server/PublishCommentUtil.java
index a90f3e7..9d5ecb4 100644
--- a/java/com/google/gerrit/server/PublishCommentUtil.java
+++ b/java/com/google/gerrit/server/PublishCommentUtil.java
@@ -74,7 +74,7 @@
throw new OrmException(e);
}
}
- commentsUtil.putComments(ctx.getDb(), ctx.getUpdate(psId), PUBLISHED, drafts);
+ commentsUtil.putComments(ctx.getUpdate(psId), PUBLISHED, drafts);
}
private static PatchSet.Id psId(ChangeNotes notes, Comment c) {
diff --git a/java/com/google/gerrit/server/change/AbandonOp.java b/java/com/google/gerrit/server/change/AbandonOp.java
index 5affd5c..874f5e4 100644
--- a/java/com/google/gerrit/server/change/AbandonOp.java
+++ b/java/com/google/gerrit/server/change/AbandonOp.java
@@ -105,7 +105,7 @@
update.setStatus(change.getStatus());
message = newMessage(ctx);
- cmUtil.addChangeMessage(ctx.getDb(), update, message);
+ cmUtil.addChangeMessage(update, message);
return true;
}
diff --git a/java/com/google/gerrit/server/change/ChangeInserter.java b/java/com/google/gerrit/server/change/ChangeInserter.java
index 33c7f73..1eb1dc3 100644
--- a/java/com/google/gerrit/server/change/ChangeInserter.java
+++ b/java/com/google/gerrit/server/change/ChangeInserter.java
@@ -459,7 +459,7 @@
patchSet.getCreatedOn(),
message,
ChangeMessagesUtil.uploadedPatchSetTag(workInProgress));
- cmUtil.addChangeMessage(db, update, changeMessage);
+ cmUtil.addChangeMessage(update, changeMessage);
}
return true;
}
diff --git a/java/com/google/gerrit/server/change/ChangeJson.java b/java/com/google/gerrit/server/change/ChangeJson.java
index b7049a7..889a20c 100644
--- a/java/com/google/gerrit/server/change/ChangeJson.java
+++ b/java/com/google/gerrit/server/change/ChangeJson.java
@@ -667,7 +667,7 @@
}
private Collection<ChangeMessageInfo> messages(ChangeData cd) throws OrmException {
- List<ChangeMessage> messages = cmUtil.byChange(db.get(), cd.notes());
+ List<ChangeMessage> messages = cmUtil.byChange(cd.notes());
if (messages.isEmpty()) {
return Collections.emptyList();
}
diff --git a/java/com/google/gerrit/server/change/ChangeResource.java b/java/com/google/gerrit/server/change/ChangeResource.java
index ef8b2f9..1131e94 100644
--- a/java/com/google/gerrit/server/change/ChangeResource.java
+++ b/java/com/google/gerrit/server/change/ChangeResource.java
@@ -167,7 +167,7 @@
// set of accounts that posted a message is too expensive. However everyone who posts a
// message is automatically added as reviewer. Hence if we include removed reviewers we can
// be sure that we have all accounts that posted messages on the change.
- accounts.addAll(approvalUtil.getReviewers(db.get(), notes).all());
+ accounts.addAll(approvalUtil.getReviewers(notes).all());
} catch (OrmException e) {
// This ETag will be invalidated if it loads next time.
}
diff --git a/java/com/google/gerrit/server/change/PatchSetInserter.java b/java/com/google/gerrit/server/change/PatchSetInserter.java
index 24c4237..a906d6a 100644
--- a/java/com/google/gerrit/server/change/PatchSetInserter.java
+++ b/java/com/google/gerrit/server/change/PatchSetInserter.java
@@ -250,7 +250,7 @@
description);
if (notify != NotifyHandling.NONE) {
- oldReviewers = approvalsUtil.getReviewers(db, ctx.getNotes());
+ oldReviewers = approvalsUtil.getReviewers(ctx.getNotes());
}
if (message != null) {
@@ -275,7 +275,7 @@
db, ctx.getNotes(), patchSet, ctx.getRevWalk(), ctx.getRepoView().getConfig());
}
if (changeMessage != null) {
- cmUtil.addChangeMessage(db, update, changeMessage);
+ cmUtil.addChangeMessage(update, changeMessage);
}
return true;
}
diff --git a/java/com/google/gerrit/server/change/SetAssigneeOp.java b/java/com/google/gerrit/server/change/SetAssigneeOp.java
index f61e95f..dd24ff6 100644
--- a/java/com/google/gerrit/server/change/SetAssigneeOp.java
+++ b/java/com/google/gerrit/server/change/SetAssigneeOp.java
@@ -99,7 +99,7 @@
return true;
}
- private void addMessage(ChangeContext ctx, ChangeUpdate update) throws OrmException {
+ private void addMessage(ChangeContext ctx, ChangeUpdate update) {
StringBuilder msg = new StringBuilder();
msg.append("Assignee ");
if (oldAssignee == null) {
@@ -113,7 +113,7 @@
}
ChangeMessage cmsg =
ChangeMessagesUtil.newMessage(ctx, msg.toString(), ChangeMessagesUtil.TAG_SET_ASSIGNEE);
- cmUtil.addChangeMessage(ctx.getDb(), update, cmsg);
+ cmUtil.addChangeMessage(update, cmsg);
}
@Override
diff --git a/java/com/google/gerrit/server/change/SetHashtagsOp.java b/java/com/google/gerrit/server/change/SetHashtagsOp.java
index d11b2df..2c180ed 100644
--- a/java/com/google/gerrit/server/change/SetHashtagsOp.java
+++ b/java/com/google/gerrit/server/change/SetHashtagsOp.java
@@ -125,13 +125,13 @@
}
}
- private void addMessage(ChangeContext ctx, ChangeUpdate update) throws OrmException {
+ private void addMessage(ChangeContext ctx, ChangeUpdate update) {
StringBuilder msg = new StringBuilder();
appendHashtagMessage(msg, "added", toAdd);
appendHashtagMessage(msg, "removed", toRemove);
ChangeMessage cmsg =
ChangeMessagesUtil.newMessage(ctx, msg.toString(), ChangeMessagesUtil.TAG_SET_HASHTAGS);
- cmUtil.addChangeMessage(ctx.getDb(), update, cmsg);
+ cmUtil.addChangeMessage(update, cmsg);
}
private void appendHashtagMessage(StringBuilder b, String action, Set<String> hashtags) {
diff --git a/java/com/google/gerrit/server/change/WorkInProgressOp.java b/java/com/google/gerrit/server/change/WorkInProgressOp.java
index 35b4e6e..bc3be51 100644
--- a/java/com/google/gerrit/server/change/WorkInProgressOp.java
+++ b/java/com/google/gerrit/server/change/WorkInProgressOp.java
@@ -135,7 +135,7 @@
return true;
}
- private void addMessage(ChangeContext ctx, ChangeUpdate update) throws OrmException {
+ private void addMessage(ChangeContext ctx, ChangeUpdate update) {
Change c = ctx.getChange();
StringBuilder buf =
new StringBuilder(c.isWorkInProgress() ? "Set Work In Progress" : "Set Ready For Review");
@@ -154,7 +154,7 @@
? ChangeMessagesUtil.TAG_SET_WIP
: ChangeMessagesUtil.TAG_SET_READY);
- cmUtil.addChangeMessage(ctx.getDb(), update, cmsg);
+ cmUtil.addChangeMessage(update, cmsg);
}
@Override
diff --git a/java/com/google/gerrit/server/events/EventFactory.java b/java/com/google/gerrit/server/events/EventFactory.java
index 40ad144..25b96c8 100644
--- a/java/com/google/gerrit/server/events/EventFactory.java
+++ b/java/com/google/gerrit/server/events/EventFactory.java
@@ -222,9 +222,8 @@
* @param a
* @param notes
*/
- public void addAllReviewers(ReviewDb db, ChangeAttribute a, ChangeNotes notes)
- throws OrmException {
- Collection<Account.Id> reviewers = approvalsUtil.getReviewers(db, notes).all();
+ public void addAllReviewers(ChangeAttribute a, ChangeNotes notes) throws OrmException {
+ Collection<Account.Id> reviewers = approvalsUtil.getReviewers(notes).all();
if (!reviewers.isEmpty()) {
a.allReviewers = Lists.newArrayListWithCapacity(reviewers.size());
for (Account.Id id : reviewers) {
diff --git a/java/com/google/gerrit/server/git/MergedByPushOp.java b/java/com/google/gerrit/server/git/MergedByPushOp.java
index b3a1d72..03a93f1 100644
--- a/java/com/google/gerrit/server/git/MergedByPushOp.java
+++ b/java/com/google/gerrit/server/git/MergedByPushOp.java
@@ -151,7 +151,7 @@
ChangeMessage msg =
ChangeMessagesUtil.newMessage(
psId, ctx.getUser(), ctx.getWhen(), msgBuf.toString(), ChangeMessagesUtil.TAG_MERGED);
- cmUtil.addChangeMessage(ctx.getDb(), update, msg);
+ cmUtil.addChangeMessage(update, msg);
PatchSetApproval submitter =
ApprovalsUtil.newApproval(
diff --git a/java/com/google/gerrit/server/git/receive/ReplaceOp.java b/java/com/google/gerrit/server/git/receive/ReplaceOp.java
index a580cf6..cedc167 100644
--- a/java/com/google/gerrit/server/git/receive/ReplaceOp.java
+++ b/java/com/google/gerrit/server/git/receive/ReplaceOp.java
@@ -353,7 +353,7 @@
}
msg = createChangeMessage(ctx, reviewMessage);
- cmUtil.addChangeMessage(ctx.getDb(), update, msg);
+ cmUtil.addChangeMessage(update, msg);
if (mergedByPushOp == null) {
resetChange(ctx);
@@ -512,7 +512,7 @@
private List<Comment> publishComments(ChangeContext ctx, boolean workInProgress)
throws OrmException {
List<Comment> comments =
- commentsUtil.draftByChangeAuthor(ctx.getDb(), ctx.getNotes(), ctx.getUser().getAccountId());
+ commentsUtil.draftByChangeAuthor(ctx.getNotes(), ctx.getUser().getAccountId());
publishCommentUtil.publish(
ctx, patchSetId, comments, ChangeMessagesUtil.uploadedPatchSetTag(workInProgress));
return comments;
diff --git a/java/com/google/gerrit/server/index/change/AllChangesIndexer.java b/java/com/google/gerrit/server/index/change/AllChangesIndexer.java
index 37e288c..8f1433e 100644
--- a/java/com/google/gerrit/server/index/change/AllChangesIndexer.java
+++ b/java/com/google/gerrit/server/index/change/AllChangesIndexer.java
@@ -224,7 +224,7 @@
// It does mean that reindexing after invalidating the DiffSummary cache will be expensive,
// but the goal is to invalidate that cache as infrequently as we possibly can. And besides,
// we don't have concrete proof that improving packfile locality would help.
- notesFactory.scan(repo, db, project).forEach(r -> index(db, r));
+ notesFactory.scan(repo, project).forEach(r -> index(db, r));
} catch (RepositoryNotFoundException rnfe) {
logger.atSevere().log(rnfe.getMessage());
}
diff --git a/java/com/google/gerrit/server/mail/receive/MailProcessor.java b/java/com/google/gerrit/server/mail/receive/MailProcessor.java
index 262e82b..6d6f043 100644
--- a/java/com/google/gerrit/server/mail/receive/MailProcessor.java
+++ b/java/com/google/gerrit/server/mail/receive/MailProcessor.java
@@ -290,7 +290,7 @@
}
changeMessage = generateChangeMessage(ctx);
- changeMessagesUtil.addChangeMessage(ctx.getDb(), ctx.getUpdate(psId), changeMessage);
+ changeMessagesUtil.addChangeMessage(ctx.getUpdate(psId), changeMessage);
comments = new ArrayList<>();
for (MailComment c : parsedComments) {
@@ -301,10 +301,7 @@
persistentCommentFromMailComment(ctx, c, targetPatchSetForComment(ctx, c, patchSet)));
}
commentsUtil.putComments(
- ctx.getDb(),
- ctx.getUpdate(ctx.getChange().currentPatchSetId()),
- Status.PUBLISHED,
- comments);
+ ctx.getUpdate(ctx.getChange().currentPatchSetId()), Status.PUBLISHED, comments);
return true;
}
diff --git a/java/com/google/gerrit/server/mail/send/CommentSender.java b/java/com/google/gerrit/server/mail/send/CommentSender.java
index e810397..c8aa259 100644
--- a/java/com/google/gerrit/server/mail/send/CommentSender.java
+++ b/java/com/google/gerrit/server/mail/send/CommentSender.java
@@ -316,7 +316,7 @@
Comment.Key key = new Comment.Key(child.parentUuid, child.key.filename, child.key.patchSetId);
try {
- return commentsUtil.getPublished(args.db.get(), changeData.notes(), key);
+ return commentsUtil.getPublished(changeData.notes(), key);
} catch (OrmException e) {
logger.atWarning().log("Could not find the parent of this comment: %s", child);
return Optional.empty();
diff --git a/java/com/google/gerrit/server/notedb/ChangeNotes.java b/java/com/google/gerrit/server/notedb/ChangeNotes.java
index 257aebb..e5e0d51 100644
--- a/java/com/google/gerrit/server/notedb/ChangeNotes.java
+++ b/java/com/google/gerrit/server/notedb/ChangeNotes.java
@@ -27,14 +27,12 @@
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.ImmutableSortedMap;
import com.google.common.collect.ImmutableSortedSet;
-import com.google.common.collect.Iterators;
import com.google.common.collect.ListMultimap;
import com.google.common.collect.MultimapBuilder;
import com.google.common.collect.Multimaps;
import com.google.common.collect.Ordering;
import com.google.common.collect.Sets;
import com.google.common.collect.Sets.SetView;
-import com.google.common.collect.Streams;
import com.google.common.flogger.FluentLogger;
import com.google.gerrit.common.Nullable;
import com.google.gerrit.common.data.SubmitRecord;
@@ -72,7 +70,6 @@
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
-import java.util.Set;
import java.util.function.Predicate;
import java.util.stream.Stream;
import org.eclipse.jgit.errors.ConfigInvalidException;
@@ -273,7 +270,7 @@
if (args.migration.readChanges()) {
for (Project.NameKey project : projectCache.all()) {
try (Repository repo = args.repoManager.openRepository(project)) {
- scanNoteDb(repo, db, project)
+ scan(repo, project)
.filter(r -> !r.error().isPresent())
.map(ChangeNotesResult::notes)
.filter(predicate)
@@ -291,79 +288,23 @@
return ImmutableListMultimap.copyOf(m);
}
- public Stream<ChangeNotesResult> scan(Repository repo, ReviewDb db, Project.NameKey project)
+ public Stream<ChangeNotesResult> scan(Repository repo, Project.NameKey project)
throws IOException {
- return args.migration.readChanges() ? scanNoteDb(repo, db, project) : scanReviewDb(repo, db);
- }
-
- private Stream<ChangeNotesResult> scanReviewDb(Repository repo, ReviewDb db)
- throws IOException {
- // Scan IDs that might exist in ReviewDb, assuming that each change has at least one patch set
- // ref. Not all changes might exist: some patch set refs might have been written where the
- // corresponding ReviewDb write failed. These will be silently filtered out by the batch get
- // call below, which is intended.
- Set<Change.Id> ids = scanChangeIds(repo).fromPatchSetRefs();
-
- // A batch size of N may overload get(Iterable), so use something smaller, but still >1.
- return Streams.stream(Iterators.partition(ids.iterator(), 30))
- .flatMap(
- batch -> {
- try {
- return Streams.stream(ReviewDbUtil.unwrapDb(db).changes().get(batch))
- .map(this::toResult)
- .filter(Objects::nonNull);
- } catch (OrmException e) {
- // Return this error for each Id in the input batch.
- return batch.stream().map(id -> ChangeNotesResult.error(id, e));
- }
- });
- }
-
- private Stream<ChangeNotesResult> scanNoteDb(
- Repository repo, ReviewDb db, Project.NameKey project) throws IOException {
ScanResult sr = scanChangeIds(repo);
- PrimaryStorage defaultStorage = args.migration.changePrimaryStorage();
- return sr.all()
- .stream()
- .map(id -> scanOneNoteDbChange(db, project, sr, defaultStorage, id))
- .filter(Objects::nonNull);
+ return sr.all().stream().map(id -> scanOneChange(project, sr, id)).filter(Objects::nonNull);
}
- private ChangeNotesResult scanOneNoteDbChange(
- ReviewDb db,
- Project.NameKey project,
- ScanResult sr,
- PrimaryStorage defaultStorage,
- Change.Id id) {
- Change change;
- try {
- change = readOneReviewDbChange(db, id);
- } catch (OrmException e) {
- return ChangeNotesResult.error(id, e);
- }
-
- if (change == null) {
- if (!sr.fromMetaRefs().contains(id)) {
- // Stray patch set refs can happen due to normal error conditions, e.g. failed
- // push processing, so aren't worth even a warning.
- return null;
- }
- if (defaultStorage == PrimaryStorage.REVIEW_DB) {
- // If changes should exist in ReviewDb, it's worth warning about a meta ref with
- // no corresponding ReviewDb data.
- logger.atWarning().log(
- "skipping change %s found in project %s but not in ReviewDb", id, project);
- return null;
- }
- // TODO(dborowitz): See discussion in NoteDbBatchUpdate#newChangeContext.
- change = ChangeNotes.Factory.newNoteDbOnlyChange(project, id);
- } else if (!change.getProject().equals(project)) {
- logger.atSevere().log(
- "skipping change %s found in project %s because ReviewDb change has project %s",
- id, project, change.getProject());
+ private ChangeNotesResult scanOneChange(Project.NameKey project, ScanResult sr, Change.Id id) {
+ if (!sr.fromMetaRefs().contains(id)) {
+ // Stray patch set refs can happen due to normal error conditions, e.g. failed
+ // push processing, so aren't worth even a warning.
return null;
}
+
+ // TODO(dborowitz): See discussion in NoteDbBatchUpdate#newChangeContext.
+ Change change = ChangeNotes.Factory.newNoteDbOnlyChange(project, id);
+
logger.atFine().log("adding change %s found in project %s", id, project);
return toResult(change);
}
@@ -379,7 +320,7 @@
return ChangeNotesResult.notes(n);
}
- /** Result of {@link #scan(Repository, ReviewDb, Project.NameKey)}. */
+ /** Result of {@link #scan(Repository,Project.NameKey)}. */
@AutoValue
public abstract static class ChangeNotesResult {
static ChangeNotesResult error(Change.Id id, OrmException e) {
diff --git a/java/com/google/gerrit/server/patch/PatchScriptFactory.java b/java/com/google/gerrit/server/patch/PatchScriptFactory.java
index b1e0e3c..dca5098 100644
--- a/java/com/google/gerrit/server/patch/PatchScriptFactory.java
+++ b/java/com/google/gerrit/server/patch/PatchScriptFactory.java
@@ -391,7 +391,7 @@
}
private void loadPublished(Map<Patch.Key, Patch> byKey, String file) throws OrmException {
- for (Comment c : commentsUtil.publishedByChangeFile(db, notes, changeId, file)) {
+ for (Comment c : commentsUtil.publishedByChangeFile(notes, file)) {
comments.include(notes.getChangeId(), c);
PatchSet.Id psId = new PatchSet.Id(notes.getChangeId(), c.key.patchSetId);
Patch.Key pKey = new Patch.Key(psId, c.key.filename);
@@ -404,7 +404,7 @@
private void loadDrafts(Map<Patch.Key, Patch> byKey, Account.Id me, String file)
throws OrmException {
- for (Comment c : commentsUtil.draftByChangeFileAuthor(db, notes, file, me)) {
+ for (Comment c : commentsUtil.draftByChangeFileAuthor(notes, file, me)) {
comments.include(notes.getChangeId(), c);
PatchSet.Id psId = new PatchSet.Id(notes.getChangeId(), c.key.patchSetId);
Patch.Key pKey = new Patch.Key(psId, c.key.filename);
diff --git a/java/com/google/gerrit/server/permissions/DefaultRefFilter.java b/java/com/google/gerrit/server/permissions/DefaultRefFilter.java
index 47be6e3..249c872 100644
--- a/java/com/google/gerrit/server/permissions/DefaultRefFilter.java
+++ b/java/com/google/gerrit/server/permissions/DefaultRefFilter.java
@@ -345,7 +345,7 @@
Project.NameKey p = projectState.getNameKey();
Stream<ChangeNotesResult> s;
try {
- s = changeNotesFactory.scan(repo, db.get(), p);
+ s = changeNotesFactory.scan(repo, p);
} catch (IOException e) {
logger.atSevere().withCause(e).log(
"Cannot load changes for project %s, assuming no changes are visible", p);
diff --git a/java/com/google/gerrit/server/query/change/ChangeData.java b/java/com/google/gerrit/server/query/change/ChangeData.java
index 0f5d938..8864de1 100644
--- a/java/com/google/gerrit/server/query/change/ChangeData.java
+++ b/java/com/google/gerrit/server/query/change/ChangeData.java
@@ -750,7 +750,7 @@
if (!lazyLoad) {
return ImmutableListMultimap.of();
}
- allApprovals = approvalsUtil.byChange(db, notes());
+ allApprovals = approvalsUtil.byChange(notes());
}
return allApprovals;
}
@@ -858,7 +858,7 @@
if (!lazyLoad) {
return Collections.emptyList();
}
- publishedComments = commentsUtil.publishedByChange(db, notes());
+ publishedComments = commentsUtil.publishedByChange(notes());
}
return publishedComments;
}
@@ -949,7 +949,7 @@
if (!lazyLoad) {
return Collections.emptyList();
}
- messages = cmUtil.byChange(db, notes());
+ messages = cmUtil.byChange(notes());
}
return messages;
}
@@ -1097,7 +1097,7 @@
}
}
} else {
- for (Comment sc : commentsUtil.draftByChange(db, notes())) {
+ for (Comment sc : commentsUtil.draftByChange(notes())) {
draftsByUser.put(sc.author.getId(), null);
}
}
diff --git a/java/com/google/gerrit/server/query/change/OutputStreamQuery.java b/java/com/google/gerrit/server/query/change/OutputStreamQuery.java
index 17c23b6..a190ac5 100644
--- a/java/com/google/gerrit/server/query/change/OutputStreamQuery.java
+++ b/java/com/google/gerrit/server/query/change/OutputStreamQuery.java
@@ -250,7 +250,7 @@
}
if (includeAllReviewers) {
- eventFactory.addAllReviewers(db, c, d.notes());
+ eventFactory.addAllReviewers(c, d.notes());
}
if (includeSubmitRecords) {
diff --git a/java/com/google/gerrit/server/restapi/account/DeleteDraftComments.java b/java/com/google/gerrit/server/restapi/account/DeleteDraftComments.java
index 108ee0e..3c553a1 100644
--- a/java/com/google/gerrit/server/restapi/account/DeleteDraftComments.java
+++ b/java/com/google/gerrit/server/restapi/account/DeleteDraftComments.java
@@ -184,12 +184,12 @@
throws OrmException, PatchListNotAvailableException, PermissionBackendException {
ImmutableList.Builder<CommentInfo> comments = ImmutableList.builder();
boolean dirty = false;
- for (Comment c : commentsUtil.draftByChangeAuthor(ctx.getDb(), ctx.getNotes(), accountId)) {
+ for (Comment c : commentsUtil.draftByChangeAuthor(ctx.getNotes(), accountId)) {
dirty = true;
PatchSet.Id psId = new PatchSet.Id(ctx.getChange().getId(), c.key.patchSetId);
setCommentRevId(
c, patchListCache, ctx.getChange(), psUtil.get(ctx.getDb(), ctx.getNotes(), psId));
- commentsUtil.deleteComments(ctx.getDb(), ctx.getUpdate(psId), Collections.singleton(c));
+ commentsUtil.deleteComments(ctx.getUpdate(psId), Collections.singleton(c));
comments.add(commentFormatter.format(c));
}
if (dirty) {
diff --git a/java/com/google/gerrit/server/restapi/change/CherryPickChange.java b/java/com/google/gerrit/server/restapi/change/CherryPickChange.java
index 6399cde..c7a8a96 100644
--- a/java/com/google/gerrit/server/restapi/change/CherryPickChange.java
+++ b/java/com/google/gerrit/server/restapi/change/CherryPickChange.java
@@ -361,7 +361,7 @@
if (input.keepReviewers && sourceChange != null) {
ReviewerSet reviewerSet =
approvalsUtil.getReviewers(
- dbProvider.get(), changeNotesFactory.createChecked(dbProvider.get(), sourceChange));
+ changeNotesFactory.createChecked(dbProvider.get(), sourceChange));
Set<Account.Id> reviewers =
new HashSet<>(reviewerSet.byState(ReviewerStateInternal.REVIEWER));
reviewers.add(sourceChange.getOwner());
diff --git a/java/com/google/gerrit/server/restapi/change/Comments.java b/java/com/google/gerrit/server/restapi/change/Comments.java
index f563cc6..22f376b 100644
--- a/java/com/google/gerrit/server/restapi/change/Comments.java
+++ b/java/com/google/gerrit/server/restapi/change/Comments.java
@@ -20,32 +20,27 @@
import com.google.gerrit.extensions.restapi.ResourceNotFoundException;
import com.google.gerrit.extensions.restapi.RestView;
import com.google.gerrit.reviewdb.client.Comment;
-import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gerrit.server.CommentsUtil;
import com.google.gerrit.server.change.CommentResource;
import com.google.gerrit.server.change.RevisionResource;
import com.google.gerrit.server.notedb.ChangeNotes;
import com.google.gwtorm.server.OrmException;
import com.google.inject.Inject;
-import com.google.inject.Provider;
import com.google.inject.Singleton;
@Singleton
public class Comments implements ChildCollection<RevisionResource, CommentResource> {
private final DynamicMap<RestView<CommentResource>> views;
private final ListRevisionComments list;
- private final Provider<ReviewDb> dbProvider;
private final CommentsUtil commentsUtil;
@Inject
Comments(
DynamicMap<RestView<CommentResource>> views,
ListRevisionComments list,
- Provider<ReviewDb> dbProvider,
CommentsUtil commentsUtil) {
this.views = views;
this.list = list;
- this.dbProvider = dbProvider;
this.commentsUtil = commentsUtil;
}
@@ -65,8 +60,7 @@
String uuid = id.get();
ChangeNotes notes = rev.getNotes();
- for (Comment c :
- commentsUtil.publishedByPatchSet(dbProvider.get(), notes, rev.getPatchSet().getId())) {
+ for (Comment c : commentsUtil.publishedByPatchSet(notes, rev.getPatchSet().getId())) {
if (uuid.equals(c.key.uuid)) {
return new CommentResource(rev, c);
}
diff --git a/java/com/google/gerrit/server/restapi/change/CreateDraftComment.java b/java/com/google/gerrit/server/restapi/change/CreateDraftComment.java
index 0e93c55..773b914 100644
--- a/java/com/google/gerrit/server/restapi/change/CreateDraftComment.java
+++ b/java/com/google/gerrit/server/restapi/change/CreateDraftComment.java
@@ -126,8 +126,7 @@
setCommentRevId(comment, patchListCache, ctx.getChange(), ps);
- commentsUtil.putComments(
- ctx.getDb(), ctx.getUpdate(psId), Status.DRAFT, Collections.singleton(comment));
+ commentsUtil.putComments(ctx.getUpdate(psId), Status.DRAFT, Collections.singleton(comment));
ctx.dontBumpLastUpdatedOn();
return true;
}
diff --git a/java/com/google/gerrit/server/restapi/change/DeleteAssignee.java b/java/com/google/gerrit/server/restapi/change/DeleteAssignee.java
index 7d68022..1e9b695 100644
--- a/java/com/google/gerrit/server/restapi/change/DeleteAssignee.java
+++ b/java/com/google/gerrit/server/restapi/change/DeleteAssignee.java
@@ -114,14 +114,14 @@
return deletedAssignee != null ? deletedAssignee.getAccount().getId() : null;
}
- private void addMessage(ChangeContext ctx, ChangeUpdate update, IdentifiedUser deletedAssignee)
- throws OrmException {
+ private void addMessage(
+ ChangeContext ctx, ChangeUpdate update, IdentifiedUser deletedAssignee) {
ChangeMessage cmsg =
ChangeMessagesUtil.newMessage(
ctx,
"Assignee deleted: " + deletedAssignee.getNameEmail(),
ChangeMessagesUtil.TAG_DELETE_ASSIGNEE);
- cmUtil.addChangeMessage(ctx.getDb(), update, cmsg);
+ cmUtil.addChangeMessage(update, cmsg);
}
@Override
diff --git a/java/com/google/gerrit/server/restapi/change/DeleteChangeMessage.java b/java/com/google/gerrit/server/restapi/change/DeleteChangeMessage.java
index 881d106..c57f9ec 100644
--- a/java/com/google/gerrit/server/restapi/change/DeleteChangeMessage.java
+++ b/java/com/google/gerrit/server/restapi/change/DeleteChangeMessage.java
@@ -109,8 +109,7 @@
private ChangeMessageInfo createUpdatedChangeMessageInfo(Change.Id id, int targetIdx)
throws OrmException, PermissionBackendException {
- List<ChangeMessage> messages =
- changeMessagesUtil.byChange(dbProvider.get(), notesFactory.createChecked(id));
+ List<ChangeMessage> messages = changeMessagesUtil.byChange(notesFactory.createChecked(id));
ChangeMessage updatedChangeMessage = messages.get(targetIdx);
AccountLoader accountLoader = accountLoaderFactory.create(true);
ChangeMessageInfo info = createChangeMessageInfo(updatedChangeMessage, accountLoader);
@@ -145,10 +144,9 @@
}
@Override
- public boolean updateChange(ChangeContext ctx) throws OrmException {
+ public boolean updateChange(ChangeContext ctx) {
PatchSet.Id psId = ctx.getChange().currentPatchSetId();
- changeMessagesUtil.replaceChangeMessage(
- ctx.getDb(), ctx.getUpdate(psId), targetMessageIdx, newMessage);
+ changeMessagesUtil.replaceChangeMessage(ctx.getUpdate(psId), targetMessageIdx, newMessage);
return true;
}
}
diff --git a/java/com/google/gerrit/server/restapi/change/DeleteComment.java b/java/com/google/gerrit/server/restapi/change/DeleteComment.java
index 2ddf359..6279357 100644
--- a/java/com/google/gerrit/server/restapi/change/DeleteComment.java
+++ b/java/com/google/gerrit/server/restapi/change/DeleteComment.java
@@ -97,7 +97,7 @@
ChangeNotes updatedNotes =
notesFactory.createChecked(rsrc.getRevisionResource().getChange().getId());
- List<Comment> changeComments = commentsUtil.publishedByChange(dbProvider.get(), updatedNotes);
+ List<Comment> changeComments = commentsUtil.publishedByChange(updatedNotes);
Optional<Comment> updatedComment =
changeComments.stream().filter(c -> c.key.equals(rsrc.getComment().key)).findFirst();
if (!updatedComment.isPresent()) {
@@ -127,14 +127,10 @@
@Override
public boolean updateChange(ChangeContext ctx)
- throws ResourceConflictException, OrmException, ResourceNotFoundException {
+ throws ResourceConflictException, ResourceNotFoundException {
PatchSet.Id psId = ctx.getChange().currentPatchSetId();
commentsUtil.deleteCommentByRewritingHistory(
- ctx.getDb(),
- ctx.getUpdate(psId),
- rsrc.getComment().key,
- rsrc.getPatchSet().getId(),
- newMessage);
+ ctx.getUpdate(psId), rsrc.getComment().key, newMessage);
return true;
}
}
diff --git a/java/com/google/gerrit/server/restapi/change/DeleteDraftComment.java b/java/com/google/gerrit/server/restapi/change/DeleteDraftComment.java
index f8e3add..0d9629f 100644
--- a/java/com/google/gerrit/server/restapi/change/DeleteDraftComment.java
+++ b/java/com/google/gerrit/server/restapi/change/DeleteDraftComment.java
@@ -91,7 +91,7 @@
public boolean updateChange(ChangeContext ctx)
throws ResourceNotFoundException, OrmException, PatchListNotAvailableException {
Optional<Comment> maybeComment =
- commentsUtil.getDraft(ctx.getDb(), ctx.getNotes(), ctx.getIdentifiedUser(), key);
+ commentsUtil.getDraft(ctx.getNotes(), ctx.getIdentifiedUser(), key);
if (!maybeComment.isPresent()) {
return false; // Nothing to do.
}
@@ -102,7 +102,7 @@
}
Comment c = maybeComment.get();
setCommentRevId(c, patchListCache, ctx.getChange(), ps);
- commentsUtil.deleteComments(ctx.getDb(), ctx.getUpdate(psId), Collections.singleton(c));
+ commentsUtil.deleteComments(ctx.getUpdate(psId), Collections.singleton(c));
ctx.dontBumpLastUpdatedOn();
return true;
}
diff --git a/java/com/google/gerrit/server/restapi/change/DeleteReviewerOp.java b/java/com/google/gerrit/server/restapi/change/DeleteReviewerOp.java
index 2cc4ce4..b130e62 100644
--- a/java/com/google/gerrit/server/restapi/change/DeleteReviewerOp.java
+++ b/java/com/google/gerrit/server/restapi/change/DeleteReviewerOp.java
@@ -125,7 +125,7 @@
// Check of removing this reviewer (even if there is no vote processed by the loop below) is OK
removeReviewerControl.checkRemoveReviewer(ctx.getNotes(), ctx.getUser(), reviewerId);
- if (!approvalsUtil.getReviewers(ctx.getDb(), ctx.getNotes()).all().contains(reviewerId)) {
+ if (!approvalsUtil.getReviewers(ctx.getNotes()).all().contains(reviewerId)) {
throw new ResourceNotFoundException();
}
currChange = ctx.getChange();
@@ -171,7 +171,7 @@
changeMessage =
ChangeMessagesUtil.newMessage(ctx, msg.toString(), ChangeMessagesUtil.TAG_DELETE_REVIEWER);
- cmUtil.addChangeMessage(ctx.getDb(), update, changeMessage);
+ cmUtil.addChangeMessage(update, changeMessage);
return true;
}
@@ -217,7 +217,7 @@
db = ReviewDbUtil.unwrapDb(db);
approvals = db.patchSetApprovals().byChange(changeId);
} else {
- approvals = approvalsUtil.byChange(ctx.getDb(), ctx.getNotes()).values();
+ approvals = approvalsUtil.byChange(ctx.getNotes()).values();
}
return Iterables.filter(approvals, psa -> accountId.equals(psa.getAccountId()));
diff --git a/java/com/google/gerrit/server/restapi/change/DeleteVote.java b/java/com/google/gerrit/server/restapi/change/DeleteVote.java
index 57649fad..e4d067b 100644
--- a/java/com/google/gerrit/server/restapi/change/DeleteVote.java
+++ b/java/com/google/gerrit/server/restapi/change/DeleteVote.java
@@ -218,7 +218,7 @@
msg.append(" by ").append(userFactory.create(accountId).getNameEmail()).append("\n");
changeMessage =
ChangeMessagesUtil.newMessage(ctx, msg.toString(), ChangeMessagesUtil.TAG_DELETE_VOTE);
- cmUtil.addChangeMessage(ctx.getDb(), ctx.getUpdate(psId), changeMessage);
+ cmUtil.addChangeMessage(ctx.getUpdate(psId), changeMessage);
return true;
}
diff --git a/java/com/google/gerrit/server/restapi/change/DraftComments.java b/java/com/google/gerrit/server/restapi/change/DraftComments.java
index b8e24a5..9f06252 100644
--- a/java/com/google/gerrit/server/restapi/change/DraftComments.java
+++ b/java/com/google/gerrit/server/restapi/change/DraftComments.java
@@ -21,7 +21,6 @@
import com.google.gerrit.extensions.restapi.ResourceNotFoundException;
import com.google.gerrit.extensions.restapi.RestView;
import com.google.gerrit.reviewdb.client.Comment;
-import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gerrit.server.CommentsUtil;
import com.google.gerrit.server.CurrentUser;
import com.google.gerrit.server.change.DraftCommentResource;
@@ -36,7 +35,6 @@
private final DynamicMap<RestView<DraftCommentResource>> views;
private final Provider<CurrentUser> user;
private final ListRevisionDrafts list;
- private final Provider<ReviewDb> dbProvider;
private final CommentsUtil commentsUtil;
@Inject
@@ -44,12 +42,10 @@
DynamicMap<RestView<DraftCommentResource>> views,
Provider<CurrentUser> user,
ListRevisionDrafts list,
- Provider<ReviewDb> dbProvider,
CommentsUtil commentsUtil) {
this.views = views;
this.user = user;
this.list = list;
- this.dbProvider = dbProvider;
this.commentsUtil = commentsUtil;
}
@@ -71,7 +67,7 @@
String uuid = id.get();
for (Comment c :
commentsUtil.draftByPatchSetAuthor(
- dbProvider.get(), rev.getPatchSet().getId(), rev.getAccountId(), rev.getNotes())) {
+ rev.getPatchSet().getId(), rev.getAccountId(), rev.getNotes())) {
if (uuid.equals(c.key.uuid)) {
return new DraftCommentResource(rev, c);
}
diff --git a/java/com/google/gerrit/server/restapi/change/ListChangeComments.java b/java/com/google/gerrit/server/restapi/change/ListChangeComments.java
index 40f4642..42af722 100644
--- a/java/com/google/gerrit/server/restapi/change/ListChangeComments.java
+++ b/java/com/google/gerrit/server/restapi/change/ListChangeComments.java
@@ -57,6 +57,6 @@
.setFillAccounts(true)
.setFillPatchSet(true)
.newCommentFormatter()
- .format(commentsUtil.publishedByChange(db.get(), cd.notes()));
+ .format(commentsUtil.publishedByChange(cd.notes()));
}
}
diff --git a/java/com/google/gerrit/server/restapi/change/ListChangeDrafts.java b/java/com/google/gerrit/server/restapi/change/ListChangeDrafts.java
index a524f6d..280277c 100644
--- a/java/com/google/gerrit/server/restapi/change/ListChangeDrafts.java
+++ b/java/com/google/gerrit/server/restapi/change/ListChangeDrafts.java
@@ -57,7 +57,7 @@
}
ChangeData cd = changeDataFactory.create(db.get(), rsrc.getNotes());
List<Comment> drafts =
- commentsUtil.draftByChangeAuthor(db.get(), cd.notes(), rsrc.getUser().getAccountId());
+ commentsUtil.draftByChangeAuthor(cd.notes(), rsrc.getUser().getAccountId());
return commentJson
.get()
.setFillAccounts(false)
diff --git a/java/com/google/gerrit/server/restapi/change/ListChangeMessages.java b/java/com/google/gerrit/server/restapi/change/ListChangeMessages.java
index 39c12f7..ba09281 100644
--- a/java/com/google/gerrit/server/restapi/change/ListChangeMessages.java
+++ b/java/com/google/gerrit/server/restapi/change/ListChangeMessages.java
@@ -19,30 +19,24 @@
import com.google.gerrit.extensions.common.ChangeMessageInfo;
import com.google.gerrit.extensions.restapi.RestReadView;
import com.google.gerrit.reviewdb.client.ChangeMessage;
-import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gerrit.server.ChangeMessagesUtil;
import com.google.gerrit.server.account.AccountLoader;
import com.google.gerrit.server.change.ChangeResource;
import com.google.gerrit.server.permissions.PermissionBackendException;
import com.google.gwtorm.server.OrmException;
import com.google.inject.Inject;
-import com.google.inject.Provider;
import com.google.inject.Singleton;
import java.util.List;
import java.util.stream.Collectors;
@Singleton
public class ListChangeMessages implements RestReadView<ChangeResource> {
- private final Provider<ReviewDb> dbProvider;
private final ChangeMessagesUtil changeMessagesUtil;
private final AccountLoader accountLoader;
@Inject
public ListChangeMessages(
- Provider<ReviewDb> dbProvider,
- ChangeMessagesUtil changeMessagesUtil,
- AccountLoader.Factory accountLoaderFactory) {
- this.dbProvider = dbProvider;
+ ChangeMessagesUtil changeMessagesUtil, AccountLoader.Factory accountLoaderFactory) {
this.changeMessagesUtil = changeMessagesUtil;
this.accountLoader = accountLoaderFactory.create(true);
}
@@ -50,8 +44,7 @@
@Override
public List<ChangeMessageInfo> apply(ChangeResource resource)
throws OrmException, PermissionBackendException {
- List<ChangeMessage> messages =
- changeMessagesUtil.byChange(dbProvider.get(), resource.getNotes());
+ List<ChangeMessage> messages = changeMessagesUtil.byChange(resource.getNotes());
List<ChangeMessageInfo> messageInfos =
messages
.stream()
diff --git a/java/com/google/gerrit/server/restapi/change/ListReviewers.java b/java/com/google/gerrit/server/restapi/change/ListReviewers.java
index 99d8746..725a89b 100644
--- a/java/com/google/gerrit/server/restapi/change/ListReviewers.java
+++ b/java/com/google/gerrit/server/restapi/change/ListReviewers.java
@@ -18,7 +18,6 @@
import com.google.gerrit.extensions.restapi.RestReadView;
import com.google.gerrit.mail.Address;
import com.google.gerrit.reviewdb.client.Account;
-import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gerrit.server.ApprovalsUtil;
import com.google.gerrit.server.change.ChangeResource;
import com.google.gerrit.server.change.ReviewerJson;
@@ -26,7 +25,6 @@
import com.google.gerrit.server.permissions.PermissionBackendException;
import com.google.gwtorm.server.OrmException;
import com.google.inject.Inject;
-import com.google.inject.Provider;
import com.google.inject.Singleton;
import java.util.LinkedHashMap;
import java.util.List;
@@ -34,18 +32,13 @@
@Singleton
class ListReviewers implements RestReadView<ChangeResource> {
- private final Provider<ReviewDb> dbProvider;
private final ApprovalsUtil approvalsUtil;
private final ReviewerJson json;
private final ReviewerResource.Factory resourceFactory;
@Inject
ListReviewers(
- Provider<ReviewDb> dbProvider,
- ApprovalsUtil approvalsUtil,
- ReviewerResource.Factory resourceFactory,
- ReviewerJson json) {
- this.dbProvider = dbProvider;
+ ApprovalsUtil approvalsUtil, ReviewerResource.Factory resourceFactory, ReviewerJson json) {
this.approvalsUtil = approvalsUtil;
this.resourceFactory = resourceFactory;
this.json = json;
@@ -55,8 +48,7 @@
public List<ReviewerInfo> apply(ChangeResource rsrc)
throws OrmException, PermissionBackendException {
Map<String, ReviewerResource> reviewers = new LinkedHashMap<>();
- ReviewDb db = dbProvider.get();
- for (Account.Id accountId : approvalsUtil.getReviewers(db, rsrc.getNotes()).all()) {
+ for (Account.Id accountId : approvalsUtil.getReviewers(rsrc.getNotes()).all()) {
if (!reviewers.containsKey(accountId.toString())) {
reviewers.put(accountId.toString(), resourceFactory.create(rsrc, accountId));
}
diff --git a/java/com/google/gerrit/server/restapi/change/ListRevisionComments.java b/java/com/google/gerrit/server/restapi/change/ListRevisionComments.java
index 964e560..f10d92b 100644
--- a/java/com/google/gerrit/server/restapi/change/ListRevisionComments.java
+++ b/java/com/google/gerrit/server/restapi/change/ListRevisionComments.java
@@ -15,7 +15,6 @@
package com.google.gerrit.server.restapi.change;
import com.google.gerrit.reviewdb.client.Comment;
-import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gerrit.server.CommentsUtil;
import com.google.gerrit.server.change.RevisionResource;
import com.google.gerrit.server.notedb.ChangeNotes;
@@ -27,9 +26,8 @@
@Singleton
public class ListRevisionComments extends ListRevisionDrafts {
@Inject
- ListRevisionComments(
- Provider<ReviewDb> db, Provider<CommentJson> commentJson, CommentsUtil commentsUtil) {
- super(db, commentJson, commentsUtil);
+ ListRevisionComments(Provider<CommentJson> commentJson, CommentsUtil commentsUtil) {
+ super(commentJson, commentsUtil);
}
@Override
@@ -40,6 +38,6 @@
@Override
protected Iterable<Comment> listComments(RevisionResource rsrc) throws OrmException {
ChangeNotes notes = rsrc.getNotes();
- return commentsUtil.publishedByPatchSet(db.get(), notes, rsrc.getPatchSet().getId());
+ return commentsUtil.publishedByPatchSet(notes, rsrc.getPatchSet().getId());
}
}
diff --git a/java/com/google/gerrit/server/restapi/change/ListRevisionDrafts.java b/java/com/google/gerrit/server/restapi/change/ListRevisionDrafts.java
index dbd0ccf..3df7e9c 100644
--- a/java/com/google/gerrit/server/restapi/change/ListRevisionDrafts.java
+++ b/java/com/google/gerrit/server/restapi/change/ListRevisionDrafts.java
@@ -18,7 +18,6 @@
import com.google.gerrit.extensions.common.CommentInfo;
import com.google.gerrit.extensions.restapi.RestReadView;
import com.google.gerrit.reviewdb.client.Comment;
-import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gerrit.server.CommentsUtil;
import com.google.gerrit.server.change.RevisionResource;
import com.google.gerrit.server.permissions.PermissionBackendException;
@@ -31,21 +30,18 @@
@Singleton
public class ListRevisionDrafts implements RestReadView<RevisionResource> {
- protected final Provider<ReviewDb> db;
protected final Provider<CommentJson> commentJson;
protected final CommentsUtil commentsUtil;
@Inject
- ListRevisionDrafts(
- Provider<ReviewDb> db, Provider<CommentJson> commentJson, CommentsUtil commentsUtil) {
- this.db = db;
+ ListRevisionDrafts(Provider<CommentJson> commentJson, CommentsUtil commentsUtil) {
this.commentJson = commentJson;
this.commentsUtil = commentsUtil;
}
protected Iterable<Comment> listComments(RevisionResource rsrc) throws OrmException {
return commentsUtil.draftByPatchSetAuthor(
- db.get(), rsrc.getPatchSet().getId(), rsrc.getAccountId(), rsrc.getNotes());
+ rsrc.getPatchSet().getId(), rsrc.getAccountId(), rsrc.getNotes());
}
protected boolean includeAuthorInfo() {
diff --git a/java/com/google/gerrit/server/restapi/change/ListRevisionReviewers.java b/java/com/google/gerrit/server/restapi/change/ListRevisionReviewers.java
index 7add548..6e7ffd9 100644
--- a/java/com/google/gerrit/server/restapi/change/ListRevisionReviewers.java
+++ b/java/com/google/gerrit/server/restapi/change/ListRevisionReviewers.java
@@ -19,7 +19,6 @@
import com.google.gerrit.extensions.restapi.RestReadView;
import com.google.gerrit.mail.Address;
import com.google.gerrit.reviewdb.client.Account;
-import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gerrit.server.ApprovalsUtil;
import com.google.gerrit.server.change.ReviewerJson;
import com.google.gerrit.server.change.ReviewerResource;
@@ -27,7 +26,6 @@
import com.google.gerrit.server.permissions.PermissionBackendException;
import com.google.gwtorm.server.OrmException;
import com.google.inject.Inject;
-import com.google.inject.Provider;
import com.google.inject.Singleton;
import java.util.LinkedHashMap;
import java.util.List;
@@ -35,18 +33,13 @@
@Singleton
class ListRevisionReviewers implements RestReadView<RevisionResource> {
- private final Provider<ReviewDb> dbProvider;
private final ApprovalsUtil approvalsUtil;
private final ReviewerJson json;
private final ReviewerResource.Factory resourceFactory;
@Inject
ListRevisionReviewers(
- Provider<ReviewDb> dbProvider,
- ApprovalsUtil approvalsUtil,
- ReviewerResource.Factory resourceFactory,
- ReviewerJson json) {
- this.dbProvider = dbProvider;
+ ApprovalsUtil approvalsUtil, ReviewerResource.Factory resourceFactory, ReviewerJson json) {
this.approvalsUtil = approvalsUtil;
this.resourceFactory = resourceFactory;
this.json = json;
@@ -60,8 +53,7 @@
}
Map<String, ReviewerResource> reviewers = new LinkedHashMap<>();
- ReviewDb db = dbProvider.get();
- for (Account.Id accountId : approvalsUtil.getReviewers(db, rsrc.getNotes()).all()) {
+ for (Account.Id accountId : approvalsUtil.getReviewers(rsrc.getNotes()).all()) {
if (!reviewers.containsKey(accountId.toString())) {
reviewers.put(accountId.toString(), resourceFactory.create(rsrc, accountId));
}
diff --git a/java/com/google/gerrit/server/restapi/change/Move.java b/java/com/google/gerrit/server/restapi/change/Move.java
index df1d9b9..0f650dd 100644
--- a/java/com/google/gerrit/server/restapi/change/Move.java
+++ b/java/com/google/gerrit/server/restapi/change/Move.java
@@ -252,7 +252,7 @@
}
ChangeMessage cmsg =
ChangeMessagesUtil.newMessage(ctx, msgBuf.toString(), ChangeMessagesUtil.TAG_MOVE);
- cmUtil.addChangeMessage(ctx.getDb(), update, cmsg);
+ cmUtil.addChangeMessage(update, cmsg);
return true;
}
diff --git a/java/com/google/gerrit/server/restapi/change/PostReview.java b/java/com/google/gerrit/server/restapi/change/PostReview.java
index d06766d..ac19cce 100644
--- a/java/com/google/gerrit/server/restapi/change/PostReview.java
+++ b/java/com/google/gerrit/server/restapi/change/PostReview.java
@@ -322,7 +322,7 @@
if (!ccOrReviewer) {
// Check if user was already CCed or reviewing prior to this review.
ReviewerSet currentReviewers =
- approvalsUtil.getReviewers(db.get(), revision.getChangeResource().getNotes());
+ approvalsUtil.getReviewers(revision.getChangeResource().getNotes());
ccOrReviewer = currentReviewers.all().contains(id);
}
@@ -990,7 +990,7 @@
break;
}
ChangeUpdate u = ctx.getUpdate(psId);
- commentsUtil.putComments(ctx.getDb(), u, Status.PUBLISHED, toPublish);
+ commentsUtil.putComments(u, Status.PUBLISHED, toPublish);
comments.addAll(toPublish);
return !toPublish.isEmpty();
}
@@ -1079,7 +1079,7 @@
private Set<CommentSetEntry> readExistingComments(ChangeContext ctx) throws OrmException {
return commentsUtil
- .publishedByChange(ctx.getDb(), ctx.getNotes())
+ .publishedByChange(ctx.getNotes())
.stream()
.map(CommentSetEntry::create)
.collect(toSet());
@@ -1095,8 +1095,7 @@
private Map<String, Comment> changeDrafts(ChangeContext ctx) throws OrmException {
Map<String, Comment> drafts = new HashMap<>();
- for (Comment c :
- commentsUtil.draftByChangeAuthor(ctx.getDb(), ctx.getNotes(), user.getAccountId())) {
+ for (Comment c : commentsUtil.draftByChangeAuthor(ctx.getNotes(), user.getAccountId())) {
c.tag = in.tag;
drafts.put(c.key.uuid, c);
}
@@ -1106,8 +1105,7 @@
private Map<String, Comment> patchSetDrafts(ChangeContext ctx) throws OrmException {
Map<String, Comment> drafts = new HashMap<>();
for (Comment c :
- commentsUtil.draftByPatchSetAuthor(
- ctx.getDb(), psId, user.getAccountId(), ctx.getNotes())) {
+ commentsUtil.draftByPatchSetAuthor(psId, user.getAccountId(), ctx.getNotes())) {
drafts.put(c.key.uuid, c);
}
return drafts;
@@ -1387,7 +1385,7 @@
return current;
}
- private boolean insertMessage(ChangeContext ctx) throws OrmException {
+ private boolean insertMessage(ChangeContext ctx) {
String msg = Strings.nullToEmpty(in.message).trim();
StringBuilder buf = new StringBuilder();
@@ -1411,7 +1409,7 @@
message =
ChangeMessagesUtil.newMessage(
psId, user, ctx.getWhen(), "Patch Set " + psId.get() + ":" + buf, in.tag);
- cmUtil.addChangeMessage(ctx.getDb(), ctx.getUpdate(psId), message);
+ cmUtil.addChangeMessage(ctx.getUpdate(psId), message);
return true;
}
diff --git a/java/com/google/gerrit/server/restapi/change/PutDescription.java b/java/com/google/gerrit/server/restapi/change/PutDescription.java
index 3b5edb2..a116fc1 100644
--- a/java/com/google/gerrit/server/restapi/change/PutDescription.java
+++ b/java/com/google/gerrit/server/restapi/change/PutDescription.java
@@ -117,7 +117,7 @@
ChangeMessage cmsg =
ChangeMessagesUtil.newMessage(
psId, ctx.getUser(), ctx.getWhen(), summary, ChangeMessagesUtil.TAG_SET_DESCRIPTION);
- cmUtil.addChangeMessage(ctx.getDb(), update, cmsg);
+ cmUtil.addChangeMessage(update, cmsg);
return true;
}
}
diff --git a/java/com/google/gerrit/server/restapi/change/PutDraftComment.java b/java/com/google/gerrit/server/restapi/change/PutDraftComment.java
index 72358bd..dfa32bf 100644
--- a/java/com/google/gerrit/server/restapi/change/PutDraftComment.java
+++ b/java/com/google/gerrit/server/restapi/change/PutDraftComment.java
@@ -118,7 +118,7 @@
public boolean updateChange(ChangeContext ctx)
throws ResourceNotFoundException, OrmException, PatchListNotAvailableException {
Optional<Comment> maybeComment =
- commentsUtil.getDraft(ctx.getDb(), ctx.getNotes(), ctx.getIdentifiedUser(), key);
+ commentsUtil.getDraft(ctx.getNotes(), ctx.getIdentifiedUser(), key);
if (!maybeComment.isPresent()) {
// Disappeared out from under us. Can't easily fall back to insert,
// because the input might be missing required fields. Just give up.
@@ -141,15 +141,12 @@
// Updating the path alters the primary key, which isn't possible.
// Delete then recreate the comment instead of an update.
- commentsUtil.deleteComments(ctx.getDb(), update, Collections.singleton(origComment));
+ commentsUtil.deleteComments(update, Collections.singleton(origComment));
comment.key.filename = in.path;
}
setCommentRevId(comment, patchListCache, ctx.getChange(), ps);
commentsUtil.putComments(
- ctx.getDb(),
- update,
- Status.DRAFT,
- Collections.singleton(update(comment, in, ctx.getWhen())));
+ update, Status.DRAFT, Collections.singleton(update(comment, in, ctx.getWhen())));
ctx.dontBumpLastUpdatedOn();
return true;
}
diff --git a/java/com/google/gerrit/server/restapi/change/PutTopic.java b/java/com/google/gerrit/server/restapi/change/PutTopic.java
index 7f56c91..60d5088 100644
--- a/java/com/google/gerrit/server/restapi/change/PutTopic.java
+++ b/java/com/google/gerrit/server/restapi/change/PutTopic.java
@@ -123,7 +123,7 @@
ChangeMessage cmsg =
ChangeMessagesUtil.newMessage(ctx, summary, ChangeMessagesUtil.TAG_SET_TOPIC);
- cmUtil.addChangeMessage(ctx.getDb(), update, cmsg);
+ cmUtil.addChangeMessage(update, cmsg);
return true;
}
diff --git a/java/com/google/gerrit/server/restapi/change/Restore.java b/java/com/google/gerrit/server/restapi/change/Restore.java
index d6f9e2b..4411766 100644
--- a/java/com/google/gerrit/server/restapi/change/Restore.java
+++ b/java/com/google/gerrit/server/restapi/change/Restore.java
@@ -130,7 +130,7 @@
update.setStatus(change.getStatus());
message = newMessage(ctx);
- cmUtil.addChangeMessage(ctx.getDb(), update, message);
+ cmUtil.addChangeMessage(update, message);
return true;
}
diff --git a/java/com/google/gerrit/server/restapi/change/Revert.java b/java/com/google/gerrit/server/restapi/change/Revert.java
index 7309fde..dfaad5a 100644
--- a/java/com/google/gerrit/server/restapi/change/Revert.java
+++ b/java/com/google/gerrit/server/restapi/change/Revert.java
@@ -231,7 +231,7 @@
ins.setNotify(input.notify);
ins.setAccountsToNotify(accountsToNotify);
- ReviewerSet reviewerSet = approvalsUtil.getReviewers(db.get(), notes);
+ ReviewerSet reviewerSet = approvalsUtil.getReviewers(notes);
Set<Account.Id> reviewers = new HashSet<>();
reviewers.add(changeToRevert.getOwner());
@@ -318,7 +318,7 @@
}
@Override
- public boolean updateChange(ChangeContext ctx) throws Exception {
+ public boolean updateChange(ChangeContext ctx) {
Change change = ctx.getChange();
PatchSet.Id patchSetId = change.currentPatchSetId();
ChangeMessage changeMessage =
@@ -326,7 +326,7 @@
ctx,
"Created a revert of this change as I" + computedChangeId.name(),
ChangeMessagesUtil.TAG_REVERT);
- cmUtil.addChangeMessage(ctx.getDb(), ctx.getUpdate(patchSetId), changeMessage);
+ cmUtil.addChangeMessage(ctx.getUpdate(patchSetId), changeMessage);
return true;
}
}
diff --git a/java/com/google/gerrit/server/restapi/change/ReviewerRecommender.java b/java/com/google/gerrit/server/restapi/change/ReviewerRecommender.java
index d88489e..eb79b79 100644
--- a/java/com/google/gerrit/server/restapi/change/ReviewerRecommender.java
+++ b/java/com/google/gerrit/server/restapi/change/ReviewerRecommender.java
@@ -27,7 +27,6 @@
import com.google.gerrit.index.query.QueryParseException;
import com.google.gerrit.reviewdb.client.Account;
import com.google.gerrit.reviewdb.client.PatchSetApproval;
-import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gerrit.server.ApprovalsUtil;
import com.google.gerrit.server.FanOutExecutor;
import com.google.gerrit.server.change.ReviewerSuggestion;
@@ -80,7 +79,6 @@
private final PluginMapContext<ReviewerSuggestion> reviewerSuggestionPluginMap;
private final Provider<InternalChangeQuery> queryProvider;
private final ExecutorService executor;
- private final Provider<ReviewDb> dbProvider;
private final ApprovalsUtil approvalsUtil;
@Inject
@@ -89,7 +87,6 @@
PluginMapContext<ReviewerSuggestion> reviewerSuggestionPluginMap,
Provider<InternalChangeQuery> queryProvider,
@FanOutExecutor ExecutorService executor,
- Provider<ReviewDb> dbProvider,
ApprovalsUtil approvalsUtil,
@GerritServerConfig Config config) {
this.changeQueryBuilder = changeQueryBuilder;
@@ -97,7 +94,6 @@
this.queryProvider = queryProvider;
this.reviewerSuggestionPluginMap = reviewerSuggestionPluginMap;
this.executor = executor;
- this.dbProvider = dbProvider;
this.approvalsUtil = approvalsUtil;
}
@@ -183,7 +179,7 @@
// Remove existing reviewers
approvalsUtil
- .getReviewers(dbProvider.get(), changeNotes)
+ .getReviewers(changeNotes)
.byState(REVIEWER)
.forEach(
r -> {
diff --git a/java/com/google/gerrit/server/restapi/change/Reviewers.java b/java/com/google/gerrit/server/restapi/change/Reviewers.java
index f0aef13..cf69080 100644
--- a/java/com/google/gerrit/server/restapi/change/Reviewers.java
+++ b/java/com/google/gerrit/server/restapi/change/Reviewers.java
@@ -23,14 +23,12 @@
import com.google.gerrit.extensions.restapi.TopLevelResource;
import com.google.gerrit.mail.Address;
import com.google.gerrit.reviewdb.client.Account;
-import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gerrit.server.ApprovalsUtil;
import com.google.gerrit.server.change.ChangeResource;
import com.google.gerrit.server.change.ReviewerResource;
import com.google.gerrit.server.restapi.account.AccountsCollection;
import com.google.gwtorm.server.OrmException;
import com.google.inject.Inject;
-import com.google.inject.Provider;
import com.google.inject.Singleton;
import java.io.IOException;
import java.util.Collection;
@@ -39,7 +37,6 @@
@Singleton
public class Reviewers implements ChildCollection<ChangeResource, ReviewerResource> {
private final DynamicMap<RestView<ReviewerResource>> views;
- private final Provider<ReviewDb> dbProvider;
private final ApprovalsUtil approvalsUtil;
private final AccountsCollection accounts;
private final ReviewerResource.Factory resourceFactory;
@@ -47,13 +44,11 @@
@Inject
Reviewers(
- Provider<ReviewDb> dbProvider,
ApprovalsUtil approvalsUtil,
AccountsCollection accounts,
ReviewerResource.Factory resourceFactory,
DynamicMap<RestView<ReviewerResource>> views,
ListReviewers list) {
- this.dbProvider = dbProvider;
this.approvalsUtil = approvalsUtil;
this.accounts = accounts;
this.resourceFactory = resourceFactory;
@@ -99,6 +94,6 @@
}
private Collection<Account.Id> fetchAccountIds(ChangeResource rsrc) throws OrmException {
- return approvalsUtil.getReviewers(dbProvider.get(), rsrc.getNotes()).all();
+ return approvalsUtil.getReviewers(rsrc.getNotes()).all();
}
}
diff --git a/java/com/google/gerrit/server/restapi/change/RevisionReviewers.java b/java/com/google/gerrit/server/restapi/change/RevisionReviewers.java
index b9b7a4f..60c9a54 100644
--- a/java/com/google/gerrit/server/restapi/change/RevisionReviewers.java
+++ b/java/com/google/gerrit/server/restapi/change/RevisionReviewers.java
@@ -24,14 +24,12 @@
import com.google.gerrit.extensions.restapi.TopLevelResource;
import com.google.gerrit.mail.Address;
import com.google.gerrit.reviewdb.client.Account;
-import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gerrit.server.ApprovalsUtil;
import com.google.gerrit.server.change.ReviewerResource;
import com.google.gerrit.server.change.RevisionResource;
import com.google.gerrit.server.restapi.account.AccountsCollection;
import com.google.gwtorm.server.OrmException;
import com.google.inject.Inject;
-import com.google.inject.Provider;
import com.google.inject.Singleton;
import java.io.IOException;
import java.util.Collection;
@@ -40,7 +38,6 @@
@Singleton
public class RevisionReviewers implements ChildCollection<RevisionResource, ReviewerResource> {
private final DynamicMap<RestView<ReviewerResource>> views;
- private final Provider<ReviewDb> dbProvider;
private final ApprovalsUtil approvalsUtil;
private final AccountsCollection accounts;
private final ReviewerResource.Factory resourceFactory;
@@ -48,13 +45,11 @@
@Inject
RevisionReviewers(
- Provider<ReviewDb> dbProvider,
ApprovalsUtil approvalsUtil,
AccountsCollection accounts,
ReviewerResource.Factory resourceFactory,
DynamicMap<RestView<ReviewerResource>> views,
ListRevisionReviewers list) {
- this.dbProvider = dbProvider;
this.approvalsUtil = approvalsUtil;
this.accounts = accounts;
this.resourceFactory = resourceFactory;
@@ -89,8 +84,7 @@
throw e;
}
}
- Collection<Account.Id> reviewers =
- approvalsUtil.getReviewers(dbProvider.get(), rsrc.getNotes()).all();
+ Collection<Account.Id> reviewers = approvalsUtil.getReviewers(rsrc.getNotes()).all();
// See if the id exists as a reviewer for this change
if (reviewers.contains(accountId)) {
return resourceFactory.create(rsrc, accountId);
diff --git a/java/com/google/gerrit/server/restapi/change/SetPrivateOp.java b/java/com/google/gerrit/server/restapi/change/SetPrivateOp.java
index 8aac92c..47427dd 100644
--- a/java/com/google/gerrit/server/restapi/change/SetPrivateOp.java
+++ b/java/com/google/gerrit/server/restapi/change/SetPrivateOp.java
@@ -87,7 +87,7 @@
privateStateChanged.fire(change, ps, ctx.getAccount(), ctx.getWhen());
}
- private void addMessage(ChangeContext ctx, ChangeUpdate update) throws OrmException {
+ private void addMessage(ChangeContext ctx, ChangeUpdate update) {
Change c = ctx.getChange();
StringBuilder buf = new StringBuilder(c.isPrivate() ? "Set private" : "Unset private");
@@ -104,6 +104,6 @@
c.isPrivate()
? ChangeMessagesUtil.TAG_SET_PRIVATE
: ChangeMessagesUtil.TAG_UNSET_PRIVATE);
- cmUtil.addChangeMessage(ctx.getDb(), update, cmsg);
+ cmUtil.addChangeMessage(update, cmsg);
}
}
diff --git a/java/com/google/gerrit/server/schema/H2.java b/java/com/google/gerrit/server/schema/H2.java
deleted file mode 100644
index 641f5e3..0000000
--- a/java/com/google/gerrit/server/schema/H2.java
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright (C) 2012 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package com.google.gerrit.server.schema;
-
-import com.google.gerrit.server.config.GerritServerConfig;
-import com.google.gerrit.server.config.SitePaths;
-import com.google.inject.Inject;
-import java.nio.file.Path;
-import org.eclipse.jgit.lib.Config;
-
-class H2 {
-
- protected final Config cfg;
- private final SitePaths site;
-
- @Inject
- H2(SitePaths site, @GerritServerConfig Config cfg) {
- this.cfg = cfg;
- this.site = site;
- }
-
- public String getUrl() {
- String database = cfg.getString("database", null, "database");
- if (database == null || database.isEmpty()) {
- database = "db/ReviewDB";
- }
- return appendUrlOptions(cfg, createUrl(site.resolve(database)));
- }
-
- public static String createUrl(Path path) {
- return new StringBuilder().append("jdbc:h2:").append(path.toUri().toString()).toString();
- }
-
- public static String appendUrlOptions(Config cfg, String url) {
- long h2CacheSize = cfg.getLong("database", "h2", "cacheSize", -1);
- boolean h2AutoServer = cfg.getBoolean("database", "h2", "autoServer", false);
-
- StringBuilder urlBuilder = new StringBuilder().append(url);
-
- if (h2CacheSize >= 0) {
- // H2 CACHE_SIZE is always given in KB
- urlBuilder.append(";CACHE_SIZE=").append(h2CacheSize / 1024);
- }
- if (h2AutoServer) {
- urlBuilder.append(";AUTO_SERVER=TRUE");
- }
- return urlBuilder.toString();
- }
-}
diff --git a/java/com/google/gerrit/server/schema/JdbcAccountPatchReviewStore.java b/java/com/google/gerrit/server/schema/JdbcAccountPatchReviewStore.java
index 83a0986..1ef69db 100644
--- a/java/com/google/gerrit/server/schema/JdbcAccountPatchReviewStore.java
+++ b/java/com/google/gerrit/server/schema/JdbcAccountPatchReviewStore.java
@@ -32,6 +32,7 @@
import com.google.gerrit.server.config.ThreadSettingsConfig;
import com.google.gwtorm.server.OrmDuplicateKeyException;
import com.google.gwtorm.server.OrmException;
+import java.nio.file.Path;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
@@ -115,7 +116,7 @@
private static String getUrl(@GerritServerConfig Config cfg, SitePaths sitePaths) {
String url = cfg.getString(ACCOUNT_PATCH_REVIEW_DB, null, URL);
if (url == null) {
- return H2.createUrl(sitePaths.db_dir.resolve("account_patch_reviews"));
+ return createH2Url(sitePaths.db_dir.resolve("account_patch_reviews"));
}
return url;
}
@@ -352,4 +353,8 @@
}
return 0;
}
+
+ private static String createH2Url(Path path) {
+ return new StringBuilder().append("jdbc:h2:").append(path.toUri().toString()).toString();
+ }
}
diff --git a/java/com/google/gerrit/server/schema/ScriptRunner.java b/java/com/google/gerrit/server/schema/ScriptRunner.java
deleted file mode 100644
index f4cba98..0000000
--- a/java/com/google/gerrit/server/schema/ScriptRunner.java
+++ /dev/null
@@ -1,125 +0,0 @@
-// Copyright (C) 2009 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package com.google.gerrit.server.schema;
-
-import static java.nio.charset.StandardCharsets.UTF_8;
-
-import com.google.common.base.CharMatcher;
-import com.google.gerrit.reviewdb.server.ReviewDb;
-import com.google.gwtorm.jdbc.JdbcSchema;
-import com.google.gwtorm.schema.sql.SqlDialect;
-import com.google.gwtorm.server.OrmException;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.ArrayList;
-import java.util.List;
-
-/** Parses an SQL script from a resource file and later runs it. */
-class ScriptRunner {
- private final String name;
- private final List<String> commands;
-
- static final ScriptRunner NOOP =
- new ScriptRunner(null, null) {
- @Override
- void run(ReviewDb db) {}
- };
-
- ScriptRunner(String scriptName, InputStream script) {
- this.name = scriptName;
- try {
- this.commands = script != null ? parse(script) : null;
- } catch (IOException e) {
- throw new IllegalStateException("Cannot parse " + name, e);
- }
- }
-
- void run(ReviewDb db) throws OrmException {
- try {
- final JdbcSchema schema = (JdbcSchema) db;
- final Connection c = schema.getConnection();
- final SqlDialect dialect = schema.getDialect();
- try (Statement stmt = c.createStatement()) {
- for (String sql : commands) {
- try {
- if (!dialect.isStatementDelimiterSupported()) {
- sql = CharMatcher.is(';').trimTrailingFrom(sql);
- }
- stmt.execute(sql);
- } catch (SQLException e) {
- throw new OrmException("Error in " + name + ":\n" + sql, e);
- }
- }
- }
- } catch (SQLException e) {
- throw new OrmException("Cannot run statements for " + name, e);
- }
- }
-
- private List<String> parse(InputStream in) throws IOException {
- try (BufferedReader br = new BufferedReader(new InputStreamReader(in, UTF_8))) {
- String delimiter = ";";
- List<String> commands = new ArrayList<>();
- StringBuilder buffer = new StringBuilder();
- String line;
- while ((line = br.readLine()) != null) {
- if (line.isEmpty()) {
- continue;
- }
- if (line.startsWith("--")) {
- continue;
- }
-
- if (buffer.length() == 0 && line.toLowerCase().startsWith("delimiter ")) {
- delimiter = line.substring("delimiter ".length()).trim();
- continue;
- }
-
- if (buffer.length() > 0) {
- buffer.append('\n');
- }
- buffer.append(line);
-
- if (isDone(delimiter, line, buffer)) {
- String cmd = buffer.toString();
- commands.add(cmd);
- buffer = new StringBuilder();
- }
- }
- if (buffer.length() > 0) {
- commands.add(buffer.toString());
- }
- return commands;
- }
- }
-
- private boolean isDone(String delimiter, String line, StringBuilder buffer) {
- if (";".equals(delimiter)) {
- return buffer.charAt(buffer.length() - 1) == ';';
-
- } else if (line.equals(delimiter)) {
- buffer.setLength(buffer.length() - delimiter.length());
- return true;
-
- } else {
- return false;
- }
- }
-}
diff --git a/java/com/google/gerrit/server/submit/MergeOp.java b/java/com/google/gerrit/server/submit/MergeOp.java
index 8e018a5..81e2661 100644
--- a/java/com/google/gerrit/server/submit/MergeOp.java
+++ b/java/com/google/gerrit/server/submit/MergeOp.java
@@ -911,7 +911,7 @@
cd.getId(),
new BatchUpdateOp() {
@Override
- public boolean updateChange(ChangeContext ctx) throws OrmException {
+ public boolean updateChange(ChangeContext ctx) {
Change change = ctx.getChange();
if (!change.getStatus().isOpen()) {
return false;
@@ -926,8 +926,7 @@
change.getLastUpdatedOn(),
ChangeMessagesUtil.TAG_MERGED,
"Project was deleted.");
- cmUtil.addChangeMessage(
- ctx.getDb(), ctx.getUpdate(change.currentPatchSetId()), msg);
+ cmUtil.addChangeMessage(ctx.getUpdate(change.currentPatchSetId()), msg);
return true;
}
diff --git a/java/com/google/gerrit/server/submit/SubmitStrategyOp.java b/java/com/google/gerrit/server/submit/SubmitStrategyOp.java
index 3be4c31..fd49042 100644
--- a/java/com/google/gerrit/server/submit/SubmitStrategyOp.java
+++ b/java/com/google/gerrit/server/submit/SubmitStrategyOp.java
@@ -32,7 +32,6 @@
import com.google.gerrit.reviewdb.client.PatchSetApproval;
import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.reviewdb.client.RefNames;
-import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gerrit.reviewdb.server.ReviewDbUtil;
import com.google.gerrit.server.ApprovalsUtil;
import com.google.gerrit.server.ChangeMessagesUtil;
@@ -483,9 +482,8 @@
psId, ctx.getUser(), ctx.getWhen(), body, ChangeMessagesUtil.TAG_MERGED);
}
- private void setMerged(ChangeContext ctx, ChangeMessage msg) throws OrmException {
+ private void setMerged(ChangeContext ctx, ChangeMessage msg) {
Change c = ctx.getChange();
- ReviewDb db = ctx.getDb();
logger.atFine().log("Setting change %s merged", c.getId());
c.setStatus(Change.Status.MERGED);
c.setSubmissionId(args.submissionId.toStringForStorage());
@@ -494,7 +492,7 @@
// which is not the user from the update context. addMergedMessage was able
// to do this in the past.
if (msg != null) {
- args.cmUtil.addChangeMessage(db, ctx.getUpdate(msg.getPatchSetId()), msg);
+ args.cmUtil.addChangeMessage(ctx.getUpdate(msg.getPatchSetId()), msg);
}
}
diff --git a/java/com/google/gerrit/server/update/RetryHelper.java b/java/com/google/gerrit/server/update/RetryHelper.java
index c08994b..9bdf293 100644
--- a/java/com/google/gerrit/server/update/RetryHelper.java
+++ b/java/com/google/gerrit/server/update/RetryHelper.java
@@ -41,7 +41,6 @@
import com.google.gerrit.metrics.Histogram1;
import com.google.gerrit.metrics.MetricMaker;
import com.google.gerrit.server.config.GerritServerConfig;
-import com.google.gerrit.server.notedb.NotesMigration;
import com.google.inject.Inject;
import com.google.inject.Singleton;
import java.time.Duration;
@@ -141,7 +140,6 @@
return options().build();
}
- private final NotesMigration migration;
private final Metrics metrics;
private final BatchUpdate.Factory updateFactory;
private final Map<ActionType, Duration> defaultTimeouts;
@@ -152,20 +150,17 @@
RetryHelper(
@GerritServerConfig Config cfg,
Metrics metrics,
- NotesMigration migration,
NoteDbBatchUpdate.AssistedFactory noteDbBatchUpdateFactory) {
- this(cfg, metrics, migration, noteDbBatchUpdateFactory, null);
+ this(cfg, metrics, noteDbBatchUpdateFactory, null);
}
@VisibleForTesting
public RetryHelper(
@GerritServerConfig Config cfg,
Metrics metrics,
- NotesMigration migration,
NoteDbBatchUpdate.AssistedFactory noteDbBatchUpdateFactory,
@Nullable Consumer<RetryerBuilder<?>> overwriteDefaultRetryerStrategySetup) {
this.metrics = metrics;
- this.migration = migration;
this.updateFactory = new BatchUpdate.Factory(noteDbBatchUpdateFactory);
Duration defaultTimeout =
@@ -226,16 +221,6 @@
public <T> T execute(ChangeAction<T> changeAction, Options opts)
throws RestApiException, UpdateException {
try {
- if (!migration.disableChangeReviewDb()) {
- // Either we aren't full-NoteDb, or the underlying ref storage doesn't support atomic
- // transactions. Either way, retrying a partially-failed operation is not idempotent, so
- // don't do it automatically. Let the end user decide whether they want to retry.
- return executeWithTimeoutCount(
- ActionType.CHANGE_UPDATE,
- () -> changeAction.call(updateFactory),
- RetryerBuilder.<T>newBuilder().build());
- }
-
return execute(
ActionType.CHANGE_UPDATE,
() -> changeAction.call(updateFactory),
diff --git a/java/com/google/gerrit/testing/TestChanges.java b/java/com/google/gerrit/testing/TestChanges.java
index 8e752fa..0c87b38 100644
--- a/java/com/google/gerrit/testing/TestChanges.java
+++ b/java/com/google/gerrit/testing/TestChanges.java
@@ -30,7 +30,6 @@
import com.google.gerrit.server.notedb.AbstractChangeNotes;
import com.google.gerrit.server.notedb.ChangeNotes;
import com.google.gerrit.server.notedb.ChangeUpdate;
-import com.google.gerrit.server.notedb.NotesMigration;
import com.google.gerrit.server.util.time.TimeUtil;
import com.google.inject.Injector;
import java.util.TimeZone;
@@ -98,8 +97,7 @@
ChangeNotes notes = update.getNotes();
boolean hasPatchSets = notes.getPatchSets() != null && !notes.getPatchSets().isEmpty();
- NotesMigration migration = injector.getInstance(NotesMigration.class);
- if (hasPatchSets || !migration.readChanges()) {
+ if (hasPatchSets) {
return update;
}
diff --git a/javatests/com/google/gerrit/acceptance/api/accounts/AccountIT.java b/javatests/com/google/gerrit/acceptance/api/accounts/AccountIT.java
index cce7bca..4086233 100644
--- a/javatests/com/google/gerrit/acceptance/api/accounts/AccountIT.java
+++ b/javatests/com/google/gerrit/acceptance/api/accounts/AccountIT.java
@@ -2251,7 +2251,7 @@
externalIds,
metaDataUpdateInternalFactory,
new RetryHelper(
- cfg, retryMetrics, null, null, r -> r.withBlockStrategy(noSleepBlockStrategy)),
+ cfg, retryMetrics, null, r -> r.withBlockStrategy(noSleepBlockStrategy)),
extIdNotesFactory,
ident,
ident,
@@ -2304,7 +2304,6 @@
cfg,
retryMetrics,
null,
- null,
r ->
r.withStopStrategy(StopStrategies.stopAfterAttempt(status.size()))
.withBlockStrategy(noSleepBlockStrategy)),
@@ -2362,7 +2361,7 @@
externalIds,
metaDataUpdateInternalFactory,
new RetryHelper(
- cfg, retryMetrics, null, null, r -> r.withBlockStrategy(noSleepBlockStrategy)),
+ cfg, retryMetrics, null, r -> r.withBlockStrategy(noSleepBlockStrategy)),
extIdNotesFactory,
ident,
ident,
@@ -2428,7 +2427,7 @@
externalIds,
metaDataUpdateInternalFactory,
new RetryHelper(
- cfg, retryMetrics, null, null, r -> r.withBlockStrategy(noSleepBlockStrategy)),
+ cfg, retryMetrics, null, r -> r.withBlockStrategy(noSleepBlockStrategy)),
extIdNotesFactory,
ident,
ident,
diff --git a/javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java b/javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java
index bb4b728..7983770 100644
--- a/javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java
+++ b/javatests/com/google/gerrit/acceptance/api/change/ChangeIT.java
@@ -16,7 +16,6 @@
import static com.google.common.truth.Truth.assertThat;
import static com.google.common.truth.Truth8.assertThat;
-import static com.google.common.truth.TruthJUnit.assume;
import static com.google.gerrit.acceptance.GitUtil.assertPushOk;
import static com.google.gerrit.acceptance.GitUtil.pushHead;
import static com.google.gerrit.acceptance.PushOneCommit.FILE_CONTENT;
@@ -40,7 +39,6 @@
import static com.google.gerrit.extensions.client.ReviewerState.REMOVED;
import static com.google.gerrit.extensions.client.ReviewerState.REVIEWER;
import static com.google.gerrit.reviewdb.client.RefNames.changeMetaRef;
-import static com.google.gerrit.reviewdb.server.ReviewDbUtil.unwrapDb;
import static com.google.gerrit.server.StarredChangesUtil.DEFAULT_LABEL;
import static com.google.gerrit.server.group.SystemGroupBackend.ANONYMOUS_USERS;
import static com.google.gerrit.server.group.SystemGroupBackend.CHANGE_OWNER;
@@ -133,9 +131,7 @@
import com.google.gerrit.reviewdb.client.AccountGroup;
import com.google.gerrit.reviewdb.client.Branch;
import com.google.gerrit.reviewdb.client.Change;
-import com.google.gerrit.reviewdb.client.LabelId;
import com.google.gerrit.reviewdb.client.PatchSet;
-import com.google.gerrit.reviewdb.client.PatchSetApproval;
import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.reviewdb.client.RefNames;
import com.google.gerrit.server.ChangeMessagesUtil;
@@ -146,7 +142,6 @@
import com.google.gerrit.server.index.change.ChangeIndex;
import com.google.gerrit.server.index.change.ChangeIndexCollection;
import com.google.gerrit.server.index.change.IndexedChangeQuery;
-import com.google.gerrit.server.notedb.NoteDbChangeState.PrimaryStorage;
import com.google.gerrit.server.project.testing.Util;
import com.google.gerrit.server.query.change.ChangeData;
import com.google.gerrit.server.restapi.change.PostReview;
@@ -162,7 +157,6 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
-import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
@@ -513,8 +507,6 @@
@Test
public void pendingReviewersInNoteDb() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
-
ConfigInput conf = new ConfigInput();
conf.enableReviewerByEmail = InheritableBoolean.TRUE;
gApi.projects().name(project.get()).config(conf);
@@ -854,16 +846,11 @@
List<Integer> reviewers =
result.get(ReviewerState.REVIEWER).stream().map(a -> a._accountId).collect(toList());
- if (notesMigration.readChanges()) {
- assertThat(result).containsKey(ReviewerState.CC);
- List<Integer> ccs =
- result.get(ReviewerState.CC).stream().map(a -> a._accountId).collect(toList());
- assertThat(ccs).containsExactly(accountCreator.user2().id.get());
- assertThat(reviewers).containsExactly(user.id.get(), admin.id.get());
- } else {
- assertThat(reviewers)
- .containsExactly(user.id.get(), admin.id.get(), accountCreator.user2().id.get());
- }
+ assertThat(result).containsKey(ReviewerState.CC);
+ List<Integer> ccs =
+ result.get(ReviewerState.CC).stream().map(a -> a._accountId).collect(toList());
+ assertThat(ccs).containsExactly(accountCreator.user2().id.get());
+ assertThat(reviewers).containsExactly(user.id.get(), admin.id.get());
}
@Test
@@ -929,17 +916,6 @@
assertThat(cr.all).hasSize(1);
assertThat(cr.all.get(0).value).isEqualTo(1);
- if (notesMigration.changePrimaryStorage() == PrimaryStorage.REVIEW_DB) {
- // Ensure record was actually copied under ReviewDb
- List<PatchSetApproval> psas =
- unwrapDb(db)
- .patchSetApprovals()
- .byPatchSet(new PatchSet.Id(new Change.Id(c2._number), 2))
- .toList();
- assertThat(psas).hasSize(1);
- assertThat(psas.get(0).getValue()).isEqualTo((short) 1);
- }
-
// Rebasing the second change again should fail
exception.expect(ResourceConflictException.class);
exception.expectMessage("Change is already up to date");
@@ -1710,8 +1686,6 @@
@Test
public void addReviewerThatIsInactiveEmailFallback() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
-
ConfigInput conf = new ConfigInput();
conf.enableReviewerByEmail = InheritableBoolean.TRUE;
gApi.projects().name(project.get()).config(conf);
@@ -1927,26 +1901,6 @@
}
@Test
- public void addReviewerWithNoteDbWhenDummyApprovalInReviewDbExists() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
- assume().that(notesMigration.changePrimaryStorage()).isEqualTo(PrimaryStorage.REVIEW_DB);
-
- PushOneCommit.Result r = createChange();
-
- // insert dummy approval in ReviewDb
- PatchSetApproval psa =
- new PatchSetApproval(
- new PatchSetApproval.Key(r.getPatchSetId(), user.id, new LabelId("Code-Review")),
- (short) 0,
- TimeUtil.nowTs());
- db.patchSetApprovals().insert(Collections.singleton(psa));
-
- AddReviewerInput in = new AddReviewerInput();
- in.reviewer = user.email;
- gApi.changes().id(r.getChangeId()).addReviewer(in);
- }
-
- @Test
public void addSelfAsReviewer() throws Exception {
TestTimeUtil.resetWithClockStep(1, SECONDS);
PushOneCommit.Result r = createChange();
@@ -2004,9 +1958,7 @@
in.reviewers = ImmutableList.of();
gApi.changes().id(r.getChangeId()).revision(r.getCommit().name()).review(in);
- // If we're not reading from NoteDb, then the CCed user will be returned in the REVIEWER state.
- assertThat(getReviewerState(r.getChangeId(), testAccount.id))
- .hasValue(notesMigration.readChanges() ? CC : REVIEWER);
+ assertThat(getReviewerState(r.getChangeId(), testAccount.id)).hasValue(CC);
}
@Test
@@ -2035,8 +1987,7 @@
.revision(r.getCommit().name())
.review(new ReviewInput().message("hi"));
c = gApi.changes().id(r.getChangeId()).get();
- ReviewerState state = notesMigration.readChanges() ? CC : REVIEWER;
- assertThat(c.reviewers.get(state).stream().map(ai -> ai._accountId).collect(toList()))
+ assertThat(c.reviewers.get(CC).stream().map(ai -> ai._accountId).collect(toList()))
.containsExactly(user.id.get());
}
@@ -2885,8 +2836,6 @@
@Test
public void noteDbCommitsOnPatchSetCreation() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
-
PushOneCommit.Result r = createChange();
pushFactory
.create(
@@ -3438,12 +3387,7 @@
gApi.changes().id(changeId).current().review(input);
Map<String, Short> votes = gApi.changes().id(changeId).current().reviewer(admin.email).votes();
- if (!notesMigration.readChanges()) {
- assertThat(votes.keySet()).containsExactly("Code-Review");
- assertThat(votes.values()).containsExactly((short) 0);
- } else {
- assertThat(votes).isEmpty();
- }
+ assertThat(votes).isEmpty();
}
@Test
diff --git a/javatests/com/google/gerrit/acceptance/api/revision/RevisionIT.java b/javatests/com/google/gerrit/acceptance/api/revision/RevisionIT.java
index bde042f..03ab0e1 100644
--- a/javatests/com/google/gerrit/acceptance/api/revision/RevisionIT.java
+++ b/javatests/com/google/gerrit/acceptance/api/revision/RevisionIT.java
@@ -795,16 +795,11 @@
assertThat(result).containsKey(ReviewerState.REVIEWER);
List<Integer> reviewers =
result.get(ReviewerState.REVIEWER).stream().map(a -> a._accountId).collect(toList());
- if (notesMigration.readChanges()) {
- assertThat(result).containsKey(ReviewerState.CC);
- List<Integer> ccs =
- result.get(ReviewerState.CC).stream().map(a -> a._accountId).collect(toList());
- assertThat(ccs).containsExactly(user.id.get());
- assertThat(reviewers).containsExactly(admin.id.get(), accountCreator.admin2().id.get());
- } else {
- assertThat(reviewers)
- .containsExactly(user.id.get(), admin.id.get(), accountCreator.admin2().id.get());
- }
+ assertThat(result).containsKey(ReviewerState.CC);
+ List<Integer> ccs =
+ result.get(ReviewerState.CC).stream().map(a -> a._accountId).collect(toList());
+ assertThat(ccs).containsExactly(user.id.get());
+ assertThat(reviewers).containsExactly(admin.id.get(), accountCreator.admin2().id.get());
}
@Test
diff --git a/javatests/com/google/gerrit/acceptance/api/revision/RobotCommentsIT.java b/javatests/com/google/gerrit/acceptance/api/revision/RobotCommentsIT.java
index d713db6..c5251f7 100644
--- a/javatests/com/google/gerrit/acceptance/api/revision/RobotCommentsIT.java
+++ b/javatests/com/google/gerrit/acceptance/api/revision/RobotCommentsIT.java
@@ -15,7 +15,6 @@
package com.google.gerrit.acceptance.api.revision;
import static com.google.common.truth.Truth.assertThat;
-import static com.google.common.truth.TruthJUnit.assume;
import static com.google.gerrit.acceptance.PushOneCommit.SUBJECT;
import static com.google.gerrit.extensions.common.testing.EditInfoSubject.assertThat;
import static com.google.gerrit.extensions.common.testing.RobotCommentInfoSubject.assertThatList;
@@ -38,7 +37,6 @@
import com.google.gerrit.extensions.common.RobotCommentInfo;
import com.google.gerrit.extensions.restapi.BadRequestException;
import com.google.gerrit.extensions.restapi.BinaryResult;
-import com.google.gerrit.extensions.restapi.MethodNotAllowedException;
import com.google.gerrit.extensions.restapi.ResourceConflictException;
import com.google.gerrit.extensions.restapi.ResourceNotFoundException;
import com.google.gerrit.extensions.restapi.RestApiException;
@@ -85,8 +83,6 @@
@Test
public void retrievingRobotCommentsBeforeAddingAnyDoesNotRaiseAnException() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
-
Map<String, List<RobotCommentInfo>> robotComments =
gApi.changes().id(changeId).current().robotComments();
@@ -96,8 +92,6 @@
@Test
public void addedRobotCommentsCanBeRetrieved() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
-
RobotCommentInput in = createRobotCommentInput();
addRobotComment(changeId, in);
@@ -110,8 +104,6 @@
@Test
public void addedRobotCommentsCanBeRetrievedByChange() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
-
RobotCommentInput in = createRobotCommentInput();
addRobotComment(changeId, in);
@@ -133,8 +125,6 @@
@Test
public void robotCommentsCanBeRetrievedAsList() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
-
RobotCommentInput robotCommentInput = createRobotCommentInput();
addRobotComment(changeId, robotCommentInput);
@@ -148,8 +138,6 @@
@Test
public void specificRobotCommentCanBeRetrieved() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
-
RobotCommentInput robotCommentInput = createRobotCommentInput();
addRobotComment(changeId, robotCommentInput);
@@ -163,8 +151,6 @@
@Test
public void robotCommentWithoutOptionalFieldsCanBeAdded() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
-
RobotCommentInput in = createRobotCommentInputWithMandatoryFields();
addRobotComment(changeId, in);
@@ -176,8 +162,6 @@
@Test
public void hugeRobotCommentIsRejected() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
-
int defaultSizeLimit = 1024 * 1024;
int sizeOfRest = 451;
fixReplacementInfo.replacement = getStringFor(defaultSizeLimit - sizeOfRest + 1);
@@ -189,8 +173,6 @@
@Test
public void reasonablyLargeRobotCommentIsAccepted() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
-
int defaultSizeLimit = 1024 * 1024;
int sizeOfRest = 451;
fixReplacementInfo.replacement = getStringFor(defaultSizeLimit - sizeOfRest);
@@ -204,8 +186,6 @@
@Test
@GerritConfig(name = "change.robotCommentSizeLimit", value = "10k")
public void maximumAllowedSizeOfRobotCommentCanBeAdjusted() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
-
int sizeLimit = 10 * 1024;
fixReplacementInfo.replacement = getStringFor(sizeLimit);
@@ -217,8 +197,6 @@
@Test
@GerritConfig(name = "change.robotCommentSizeLimit", value = "0")
public void zeroForMaximumAllowedSizeOfRobotCommentRemovesRestriction() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
-
int defaultSizeLimit = 1024 * 1024;
fixReplacementInfo.replacement = getStringFor(defaultSizeLimit);
@@ -232,8 +210,6 @@
@GerritConfig(name = "change.robotCommentSizeLimit", value = "-1")
public void negativeValueForMaximumAllowedSizeOfRobotCommentRemovesRestriction()
throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
-
int defaultSizeLimit = 1024 * 1024;
fixReplacementInfo.replacement = getStringFor(defaultSizeLimit);
@@ -245,8 +221,6 @@
@Test
public void addedFixSuggestionCanBeRetrieved() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
-
addRobotComment(changeId, withFixRobotCommentInput);
List<RobotCommentInfo> robotCommentInfos = getRobotComments();
@@ -255,8 +229,6 @@
@Test
public void fixIdIsGeneratedForFixSuggestion() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
-
addRobotComment(changeId, withFixRobotCommentInput);
List<RobotCommentInfo> robotCommentInfos = getRobotComments();
@@ -270,8 +242,6 @@
@Test
public void descriptionOfFixSuggestionIsAcceptedAsIs() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
-
addRobotComment(changeId, withFixRobotCommentInput);
List<RobotCommentInfo> robotCommentInfos = getRobotComments();
@@ -284,8 +254,6 @@
@Test
public void descriptionOfFixSuggestionIsMandatory() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
-
fixSuggestionInfo.description = null;
exception.expect(BadRequestException.class);
@@ -298,8 +266,6 @@
@Test
public void addedFixReplacementCanBeRetrieved() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
-
addRobotComment(changeId, withFixRobotCommentInput);
List<RobotCommentInfo> robotCommentInfos = getRobotComments();
@@ -312,8 +278,6 @@
@Test
public void fixReplacementsAreMandatory() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
-
fixSuggestionInfo.replacements = Collections.emptyList();
exception.expect(BadRequestException.class);
@@ -327,8 +291,6 @@
@Test
public void pathOfFixReplacementIsAcceptedAsIs() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
-
addRobotComment(changeId, withFixRobotCommentInput);
List<RobotCommentInfo> robotCommentInfos = getRobotComments();
@@ -343,8 +305,6 @@
@Test
public void pathOfFixReplacementIsMandatory() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
-
fixReplacementInfo.path = null;
exception.expect(BadRequestException.class);
@@ -357,8 +317,6 @@
@Test
public void rangeOfFixReplacementIsAcceptedAsIs() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
-
addRobotComment(changeId, withFixRobotCommentInput);
List<RobotCommentInfo> robotCommentInfos = getRobotComments();
@@ -373,8 +331,6 @@
@Test
public void rangeOfFixReplacementIsMandatory() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
-
fixReplacementInfo.range = null;
exception.expect(BadRequestException.class);
@@ -387,8 +343,6 @@
@Test
public void rangeOfFixReplacementNeedsToBeValid() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
-
fixReplacementInfo.range = createRange(13, 9, 5, 10);
exception.expect(BadRequestException.class);
exception.expectMessage("Range (13:9 - 5:10)");
@@ -398,8 +352,6 @@
@Test
public void rangesOfFixReplacementsOfSameFixSuggestionForSameFileMayNotOverlap()
throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
-
FixReplacementInfo fixReplacementInfo1 = new FixReplacementInfo();
fixReplacementInfo1.path = FILE_NAME;
fixReplacementInfo1.range = createRange(2, 0, 3, 1);
@@ -422,8 +374,6 @@
@Test
public void rangesOfFixReplacementsOfSameFixSuggestionForDifferentFileMayOverlap()
throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
-
FixReplacementInfo fixReplacementInfo1 = new FixReplacementInfo();
fixReplacementInfo1.path = FILE_NAME;
fixReplacementInfo1.range = createRange(2, 0, 3, 1);
@@ -447,8 +397,6 @@
@Test
public void rangesOfFixReplacementsOfDifferentFixSuggestionsForSameFileMayOverlap()
throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
-
FixReplacementInfo fixReplacementInfo1 = new FixReplacementInfo();
fixReplacementInfo1.path = FILE_NAME;
fixReplacementInfo1.range = createRange(2, 0, 3, 1);
@@ -472,8 +420,6 @@
@Test
public void fixReplacementsDoNotNeedToBeOrderedAccordingToRange() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
-
FixReplacementInfo fixReplacementInfo1 = new FixReplacementInfo();
fixReplacementInfo1.path = FILE_NAME;
fixReplacementInfo1.range = createRange(2, 0, 3, 0);
@@ -501,8 +447,6 @@
@Test
public void replacementStringOfFixReplacementIsAcceptedAsIs() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
-
addRobotComment(changeId, withFixRobotCommentInput);
List<RobotCommentInfo> robotCommentInfos = getRobotComments();
@@ -517,8 +461,6 @@
@Test
public void replacementStringOfFixReplacementIsMandatory() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
-
fixReplacementInfo.replacement = null;
exception.expect(BadRequestException.class);
@@ -532,8 +474,6 @@
@Test
public void fixWithinALineCanBeApplied() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
-
fixReplacementInfo.path = FILE_NAME;
fixReplacementInfo.replacement = "Modified content";
fixReplacementInfo.range = createRange(3, 1, 3, 3);
@@ -557,8 +497,6 @@
@Test
public void fixSpanningMultipleLinesCanBeApplied() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
-
fixReplacementInfo.path = FILE_NAME;
fixReplacementInfo.replacement = "Modified content\n5";
fixReplacementInfo.range = createRange(3, 2, 5, 3);
@@ -581,8 +519,6 @@
@Test
public void fixWithTwoCloseReplacementsOnSameFileCanBeApplied() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
-
FixReplacementInfo fixReplacementInfo1 = new FixReplacementInfo();
fixReplacementInfo1.path = FILE_NAME;
fixReplacementInfo1.range = createRange(2, 0, 3, 0);
@@ -615,8 +551,6 @@
@Test
public void twoFixesOnSameFileCanBeApplied() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
-
FixReplacementInfo fixReplacementInfo1 = new FixReplacementInfo();
fixReplacementInfo1.path = FILE_NAME;
fixReplacementInfo1.range = createRange(2, 0, 3, 0);
@@ -650,8 +584,6 @@
@Test
public void twoConflictingFixesOnSameFileCannotBeApplied() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
-
FixReplacementInfo fixReplacementInfo1 = new FixReplacementInfo();
fixReplacementInfo1.path = FILE_NAME;
fixReplacementInfo1.range = createRange(2, 0, 3, 1);
@@ -679,8 +611,6 @@
@Test
public void twoFixesOfSameRobotCommentCanBeApplied() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
-
FixReplacementInfo fixReplacementInfo1 = new FixReplacementInfo();
fixReplacementInfo1.path = FILE_NAME;
fixReplacementInfo1.range = createRange(2, 0, 3, 0);
@@ -714,8 +644,6 @@
@Test
public void fixReferringToDifferentFileThanRobotCommentCanBeApplied() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
-
fixReplacementInfo.path = FILE_NAME2;
fixReplacementInfo.range = createRange(2, 0, 3, 0);
fixReplacementInfo.replacement = "Modified content\n";
@@ -736,8 +664,6 @@
@Test
public void fixInvolvingTwoFilesCanBeApplied() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
-
FixReplacementInfo fixReplacementInfo1 = new FixReplacementInfo();
fixReplacementInfo1.path = FILE_NAME;
fixReplacementInfo1.range = createRange(2, 0, 3, 0);
@@ -775,8 +701,6 @@
@Test
public void fixReferringToNonExistentFileCannotBeApplied() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
-
fixReplacementInfo.path = "a_non_existent_file.txt";
fixReplacementInfo.range = createRange(1, 0, 2, 0);
fixReplacementInfo.replacement = "Modified content\n";
@@ -792,8 +716,6 @@
@Test
public void fixOnPreviousPatchSetWithoutChangeEditCannotBeApplied() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
-
fixReplacementInfo.path = FILE_NAME;
fixReplacementInfo.replacement = "Modified content";
fixReplacementInfo.range = createRange(3, 1, 3, 3);
@@ -815,8 +737,6 @@
@Test
public void fixOnPreviousPatchSetWithExistingChangeEditCanBeApplied() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
-
// Create an empty change edit.
gApi.changes().id(changeId).edit().create();
@@ -849,8 +769,6 @@
@Test
public void fixOnCurrentPatchSetWithChangeEditOnPreviousPatchSetCannotBeApplied()
throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
-
// Create an empty change edit.
gApi.changes().id(changeId).edit().create();
@@ -874,8 +792,6 @@
@Test
public void fixDoesNotModifyCommitMessageOfChangeEdit() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
-
String changeEditCommitMessage = "This is the commit message of the change edit.\n";
gApi.changes().id(changeId).edit().modifyCommitMessage(changeEditCommitMessage);
@@ -897,8 +813,6 @@
@Test
public void applyingFixTwiceIsIdempotent() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
-
fixReplacementInfo.path = FILE_NAME;
fixReplacementInfo.replacement = "Modified content";
fixReplacementInfo.range = createRange(3, 1, 3, 3);
@@ -922,8 +836,6 @@
@Test
public void nonExistentFixCannotBeApplied() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
-
fixReplacementInfo.path = FILE_NAME;
fixReplacementInfo.replacement = "Modified content";
fixReplacementInfo.range = createRange(3, 1, 3, 3);
@@ -941,8 +853,6 @@
@Test
public void applyingFixReturnsEditInfoForCreatedChangeEdit() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
-
fixReplacementInfo.path = FILE_NAME;
fixReplacementInfo.replacement = "Modified content";
fixReplacementInfo.range = createRange(3, 1, 3, 3);
@@ -964,8 +874,6 @@
@Test
public void applyingFixOnTopOfChangeEditReturnsEditInfoForUpdatedChangeEdit() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
-
gApi.changes().id(changeId).edit().create();
fixReplacementInfo.path = FILE_NAME;
@@ -989,7 +897,6 @@
@Test
public void createdChangeEditIsBasedOnCurrentPatchSet() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
String currentRevision = gApi.changes().id(changeId).get().currentRevision;
fixReplacementInfo.path = FILE_NAME;
@@ -1008,25 +915,7 @@
}
@Test
- public void robotCommentsNotSupportedWithoutNoteDb() throws Exception {
- assume().that(notesMigration.readChanges()).isFalse();
-
- RobotCommentInput in = createRobotCommentInput();
- ReviewInput reviewInput = new ReviewInput();
- Map<String, List<RobotCommentInput>> robotComments = new HashMap<>();
- robotComments.put(in.path, ImmutableList.of(in));
- reviewInput.robotComments = robotComments;
- reviewInput.message = "comment test";
-
- exception.expect(MethodNotAllowedException.class);
- exception.expectMessage("robot comments not supported");
- gApi.changes().id(changeId).current().review(reviewInput);
- }
-
- @Test
public void queryChangesWithCommentCounts() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
-
PushOneCommit.Result r1 = createChange();
PushOneCommit.Result r2 =
pushFactory
diff --git a/javatests/com/google/gerrit/acceptance/git/AbstractPushForReview.java b/javatests/com/google/gerrit/acceptance/git/AbstractPushForReview.java
index 7529ee3..5fdfe72 100644
--- a/javatests/com/google/gerrit/acceptance/git/AbstractPushForReview.java
+++ b/javatests/com/google/gerrit/acceptance/git/AbstractPushForReview.java
@@ -18,7 +18,6 @@
import static com.google.common.collect.ImmutableList.toImmutableList;
import static com.google.common.truth.Truth.assertThat;
import static com.google.common.truth.Truth8.assertThat;
-import static com.google.common.truth.TruthJUnit.assume;
import static com.google.gerrit.acceptance.GitUtil.assertPushOk;
import static com.google.gerrit.acceptance.GitUtil.assertPushRejected;
import static com.google.gerrit.acceptance.GitUtil.pushHead;
@@ -543,12 +542,7 @@
r.assertOkStatus();
assertThat(sender.getMessages()).hasSize(1);
Message m = sender.getMessages().get(0);
- if (notesMigration.readChanges()) {
- assertThat(m.rcpt()).containsExactly(user.emailAddress);
- } else {
- // CCs are considered reviewers in the storage layer and so get notified.
- assertThat(m.rcpt()).containsExactly(user.emailAddress, user2.emailAddress);
- }
+ assertThat(m.rcpt()).containsExactly(user.emailAddress);
sender.clear();
r = pushTo(pushSpec + ",notify=" + NotifyHandling.ALL);
@@ -639,23 +633,19 @@
PushOneCommit.Result r =
pushTo("refs/for/master%cc=non.existing.1@example.com,cc=non.existing.2@example.com");
- if (notesMigration.readChanges()) {
- r.assertOkStatus();
+ r.assertOkStatus();
- ChangeInfo ci = get(r.getChangeId(), DETAILED_LABELS);
- ImmutableList<AccountInfo> ccs =
- firstNonNull(ci.reviewers.get(ReviewerState.CC), ImmutableList.<AccountInfo>of())
- .stream()
- .sorted(comparing((AccountInfo a) -> a.email))
- .collect(toImmutableList());
- assertThat(ccs).hasSize(2);
- assertThat(ccs.get(0).email).isEqualTo("non.existing.1@example.com");
- assertThat(ccs.get(0)._accountId).isNull();
- assertThat(ccs.get(1).email).isEqualTo("non.existing.2@example.com");
- assertThat(ccs.get(1)._accountId).isNull();
- } else {
- r.assertErrorStatus("non.existing.1@example.com does not identify a registered user");
- }
+ ChangeInfo ci = get(r.getChangeId(), DETAILED_LABELS);
+ ImmutableList<AccountInfo> ccs =
+ firstNonNull(ci.reviewers.get(ReviewerState.CC), ImmutableList.<AccountInfo>of())
+ .stream()
+ .sorted(comparing((AccountInfo a) -> a.email))
+ .collect(toImmutableList());
+ assertThat(ccs).hasSize(2);
+ assertThat(ccs.get(0).email).isEqualTo("non.existing.1@example.com");
+ assertThat(ccs.get(0)._accountId).isNull();
+ assertThat(ccs.get(1).email).isEqualTo("non.existing.2@example.com");
+ assertThat(ccs.get(1)._accountId).isNull();
}
@Test
@@ -721,23 +711,19 @@
PushOneCommit.Result r =
pushTo("refs/for/master%r=non.existing.1@example.com,r=non.existing.2@example.com");
- if (notesMigration.readChanges()) {
- r.assertOkStatus();
+ r.assertOkStatus();
- ChangeInfo ci = get(r.getChangeId(), DETAILED_LABELS);
- ImmutableList<AccountInfo> reviewers =
- firstNonNull(ci.reviewers.get(ReviewerState.REVIEWER), ImmutableList.<AccountInfo>of())
- .stream()
- .sorted(comparing((AccountInfo a) -> a.email))
- .collect(toImmutableList());
- assertThat(reviewers).hasSize(2);
- assertThat(reviewers.get(0).email).isEqualTo("non.existing.1@example.com");
- assertThat(reviewers.get(0)._accountId).isNull();
- assertThat(reviewers.get(1).email).isEqualTo("non.existing.2@example.com");
- assertThat(reviewers.get(1)._accountId).isNull();
- } else {
- r.assertErrorStatus("non.existing.1@example.com does not identify a registered user");
- }
+ ChangeInfo ci = get(r.getChangeId(), DETAILED_LABELS);
+ ImmutableList<AccountInfo> reviewers =
+ firstNonNull(ci.reviewers.get(ReviewerState.REVIEWER), ImmutableList.<AccountInfo>of())
+ .stream()
+ .sorted(comparing((AccountInfo a) -> a.email))
+ .collect(toImmutableList());
+ assertThat(reviewers).hasSize(2);
+ assertThat(reviewers.get(0).email).isEqualTo("non.existing.1@example.com");
+ assertThat(reviewers.get(0)._accountId).isNull();
+ assertThat(reviewers.get(1).email).isEqualTo("non.existing.2@example.com");
+ assertThat(reviewers.get(1)._accountId).isNull();
}
@Test
@@ -1295,9 +1281,6 @@
@Test
public void pushForMasterWithHashtags() throws Exception {
- // Hashtags only work when reading from NoteDB is enabled
- assume().that(notesMigration.readChanges()).isTrue();
-
// specify a single hashtag as option
String hashtag1 = "tag1";
Set<String> expected = ImmutableSet.of(hashtag1);
@@ -1328,9 +1311,6 @@
@Test
public void pushForMasterWithMultipleHashtags() throws Exception {
- // Hashtags only work when reading from NoteDB is enabled
- assume().that(notesMigration.readChanges()).isTrue();
-
// specify multiple hashtags as options
String hashtag1 = "tag1";
String hashtag2 = "tag2";
@@ -1363,14 +1343,6 @@
}
@Test
- public void pushForMasterWithHashtagsNoteDbDisabled() throws Exception {
- // Push with hashtags should fail when reading from NoteDb is disabled.
- assume().that(notesMigration.readChanges()).isFalse();
- PushOneCommit.Result r = pushTo("refs/for/master%hashtag=tag1");
- r.assertErrorStatus("cannot add hashtags; noteDb is disabled");
- }
-
- @Test
public void pushCommitUsingSignedOffBy() throws Exception {
PushOneCommit push =
pushFactory.create(
diff --git a/javatests/com/google/gerrit/acceptance/git/RefAdvertisementIT.java b/javatests/com/google/gerrit/acceptance/git/RefAdvertisementIT.java
index e4d9f7c..d2fd331 100644
--- a/javatests/com/google/gerrit/acceptance/git/RefAdvertisementIT.java
+++ b/javatests/com/google/gerrit/acceptance/git/RefAdvertisementIT.java
@@ -49,18 +49,15 @@
import com.google.gerrit.server.config.AnonymousCowardName;
import com.google.gerrit.server.git.receive.ReceiveCommitsAdvertiseRefsHook;
import com.google.gerrit.server.notedb.ChangeNoteUtil;
-import com.google.gerrit.server.notedb.NoteDbChangeState.PrimaryStorage;
import com.google.gerrit.server.permissions.PermissionBackend;
import com.google.gerrit.server.permissions.PermissionBackend.RefFilterOptions;
import com.google.gerrit.server.project.testing.Util;
import com.google.gerrit.server.query.change.ChangeData;
import com.google.gerrit.testing.NoteDbMode;
-import com.google.gerrit.testing.TestChanges;
import com.google.inject.Inject;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.function.Predicate;
@@ -424,12 +421,6 @@
PatchSet.Id psId = new PatchSet.Id(c3.getId(), 2);
c.setCurrentPatchSet(psId, subject, c.getOriginalSubject());
- if (notesMigration.changePrimaryStorage() == PrimaryStorage.REVIEW_DB) {
- PatchSet ps = TestChanges.newPatchSet(psId, rev, admin.getId());
- db.patchSets().insert(Collections.singleton(ps));
- db.changes().update(Collections.singleton(c));
- }
-
if (notesMigration.commitChangeWrites()) {
PersonIdent committer = serverIdent.get();
PersonIdent author =
diff --git a/javatests/com/google/gerrit/acceptance/git/SubmitOnPushIT.java b/javatests/com/google/gerrit/acceptance/git/SubmitOnPushIT.java
index 700b18b..cf22a0a 100644
--- a/javatests/com/google/gerrit/acceptance/git/SubmitOnPushIT.java
+++ b/javatests/com/google/gerrit/acceptance/git/SubmitOnPushIT.java
@@ -318,7 +318,7 @@
private PatchSetApproval getSubmitter(PatchSet.Id patchSetId) throws Exception {
ChangeNotes notes = notesFactory.createChecked(db, project, patchSetId.getParentKey()).load();
- return approvalsUtil.getSubmitter(db, notes, patchSetId);
+ return approvalsUtil.getSubmitter(notes, patchSetId);
}
private void assertSubmitApproval(PatchSet.Id patchSetId) throws Exception {
diff --git a/javatests/com/google/gerrit/acceptance/git/SubmoduleSubscriptionsWholeTopicMergeIT.java b/javatests/com/google/gerrit/acceptance/git/SubmoduleSubscriptionsWholeTopicMergeIT.java
index 82b9cd0..f72df99 100644
--- a/javatests/com/google/gerrit/acceptance/git/SubmoduleSubscriptionsWholeTopicMergeIT.java
+++ b/javatests/com/google/gerrit/acceptance/git/SubmoduleSubscriptionsWholeTopicMergeIT.java
@@ -16,7 +16,6 @@
import static com.google.common.truth.Truth.assertThat;
import static com.google.common.truth.Truth.assertWithMessage;
-import static com.google.common.truth.TruthJUnit.assume;
import static com.google.gerrit.acceptance.GitUtil.getChangeId;
import com.google.common.collect.ImmutableList;
@@ -800,8 +799,6 @@
@Test
public void retrySubmitAfterTornTopicOnLockFailure() throws Exception {
- assume().that(notesMigration.disableChangeReviewDb()).isTrue();
-
Project.NameKey subKey1 = createProjectForPush(getSubmitType());
TestRepository<?> sub1 = cloneProject(subKey1);
Project.NameKey subKey2 = createProjectForPush(getSubmitType());
diff --git a/javatests/com/google/gerrit/acceptance/rest/account/ImpersonationIT.java b/javatests/com/google/gerrit/acceptance/rest/account/ImpersonationIT.java
index 65c95f8..dd26347 100644
--- a/javatests/com/google/gerrit/acceptance/rest/account/ImpersonationIT.java
+++ b/javatests/com/google/gerrit/acceptance/rest/account/ImpersonationIT.java
@@ -15,7 +15,6 @@
package com.google.gerrit.acceptance.rest.account;
import static com.google.common.truth.Truth.assertThat;
-import static com.google.common.truth.TruthJUnit.assume;
import static com.google.gerrit.extensions.client.ListChangesOption.MESSAGES;
import static com.google.gerrit.server.group.SystemGroupBackend.ANONYMOUS_USERS;
import static com.google.gerrit.server.group.SystemGroupBackend.REGISTERED_USERS;
@@ -116,7 +115,7 @@
assertThat(psa.getRealAccountId()).isEqualTo(admin.id);
ChangeData cd = r.getChange();
- ChangeMessage m = Iterables.getLast(cmUtil.byChange(db, cd.notes()));
+ ChangeMessage m = Iterables.getLast(cmUtil.byChange(cd.notes()));
assertThat(m.getMessage()).endsWith(in.message);
assertThat(m.getAuthor()).isEqualTo(user.id);
assertThat(m.getRealAuthor()).isEqualTo(admin.id);
@@ -191,7 +190,6 @@
@Test
public void voteOnBehalfOfWithCommentWritingJson() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
testVoteOnBehalfOfWithComment();
}
@@ -218,7 +216,7 @@
assertThat(psa.getRealAccountId()).isEqualTo(admin.id);
ChangeData cd = r.getChange();
- Comment c = Iterables.getOnlyElement(commentsUtil.publishedByChange(db, cd.notes()));
+ Comment c = Iterables.getOnlyElement(commentsUtil.publishedByChange(cd.notes()));
assertThat(c.message).isEqualTo(ci.message);
assertThat(c.author.getId()).isEqualTo(user.id);
assertThat(c.getRealAuthor().getId()).isEqualTo(admin.id);
@@ -226,7 +224,6 @@
@Test
public void voteOnBehalfOfWithRobotComment() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
allowCodeReviewOnBehalfOf();
PushOneCommit.Result r = createChange();
@@ -342,7 +339,7 @@
ChangeData cd = r.getChange();
assertThat(cd.change().getStatus()).isEqualTo(Change.Status.MERGED);
PatchSetApproval submitter =
- approvalsUtil.getSubmitter(db, cd.notes(), cd.change().currentPatchSetId());
+ approvalsUtil.getSubmitter(cd.notes(), cd.change().currentPatchSetId());
assertThat(submitter.getAccountId()).isEqualTo(admin2.id);
assertThat(submitter.getRealAccountId()).isEqualTo(admin.id);
}
@@ -520,7 +517,7 @@
assertThat(psa.getRealAccountId()).isEqualTo(admin.id); // not user2
ChangeData cd = r.getChange();
- ChangeMessage m = Iterables.getLast(cmUtil.byChange(db, cd.notes()));
+ ChangeMessage m = Iterables.getLast(cmUtil.byChange(cd.notes()));
assertThat(m.getMessage()).endsWith(in.message);
assertThat(m.getAuthor()).isEqualTo(user.id);
assertThat(m.getRealAuthor()).isEqualTo(admin.id); // not user2
diff --git a/javatests/com/google/gerrit/acceptance/rest/binding/ChangesRestApiBindingsIT.java b/javatests/com/google/gerrit/acceptance/rest/binding/ChangesRestApiBindingsIT.java
index 0b64beb..db5dfab 100644
--- a/javatests/com/google/gerrit/acceptance/rest/binding/ChangesRestApiBindingsIT.java
+++ b/javatests/com/google/gerrit/acceptance/rest/binding/ChangesRestApiBindingsIT.java
@@ -14,7 +14,6 @@
package com.google.gerrit.acceptance.rest.binding;
-import static com.google.common.truth.TruthJUnit.assume;
import static com.google.gerrit.acceptance.rest.util.RestCall.Method.GET;
import static com.google.gerrit.extensions.common.testing.RobotCommentInfoSubject.assertThatList;
import static java.util.stream.Collectors.toList;
@@ -378,8 +377,6 @@
@Test
public void robotCommentEndpoints() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
-
String changeId = createChange().getChangeId();
RobotCommentInput robotCommentInput = new RobotCommentInput();
@@ -405,8 +402,6 @@
@Test
public void fixEndpoints() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
-
String changeId = createChange("Subject", FILENAME, "content").getChangeId();
RobotCommentInput robotCommentInput = new RobotCommentInput();
diff --git a/javatests/com/google/gerrit/acceptance/rest/change/AbstractSubmit.java b/javatests/com/google/gerrit/acceptance/rest/change/AbstractSubmit.java
index bab4c1d..095bd96 100644
--- a/javatests/com/google/gerrit/acceptance/rest/change/AbstractSubmit.java
+++ b/javatests/com/google/gerrit/acceptance/rest/change/AbstractSubmit.java
@@ -905,8 +905,6 @@
@Test
public void retrySubmitSingleChangeOnLockFailure() throws Exception {
- assume().that(notesMigration.disableChangeReviewDb()).isTrue();
-
PushOneCommit.Result change = createChange();
String id = change.getChangeId();
approve(id);
@@ -932,7 +930,6 @@
@Test
public void retrySubmitAfterTornTopicOnLockFailure() throws Exception {
- assume().that(notesMigration.disableChangeReviewDb()).isTrue();
assume().that(isSubmitWholeTopicEnabled()).isTrue();
String topic = "test-topic";
@@ -1281,7 +1278,7 @@
Change c = getOnlyElement(queryProvider.get().byKeyPrefix(changeId)).change();
ChangeNotes cn = notesFactory.createChecked(db, c);
PatchSetApproval submitter =
- approvalsUtil.getSubmitter(db, cn, new PatchSet.Id(cn.getChangeId(), psId));
+ approvalsUtil.getSubmitter(cn, new PatchSet.Id(cn.getChangeId(), psId));
assertThat(submitter).isNotNull();
assertThat(submitter.isLegacySubmit()).isTrue();
assertThat(submitter.getAccountId()).isEqualTo(user.getId());
@@ -1291,7 +1288,7 @@
Change c = getOnlyElement(queryProvider.get().byKeyPrefix(changeId)).change();
ChangeNotes cn = notesFactory.createChecked(db, c);
PatchSetApproval submitter =
- approvalsUtil.getSubmitter(db, cn, new PatchSet.Id(cn.getChangeId(), psId));
+ approvalsUtil.getSubmitter(cn, new PatchSet.Id(cn.getChangeId(), psId));
assertThat(submitter).isNull();
}
diff --git a/javatests/com/google/gerrit/acceptance/rest/change/AbstractSubmitByMerge.java b/javatests/com/google/gerrit/acceptance/rest/change/AbstractSubmitByMerge.java
index 29a81ca..fecb6c5 100644
--- a/javatests/com/google/gerrit/acceptance/rest/change/AbstractSubmitByMerge.java
+++ b/javatests/com/google/gerrit/acceptance/rest/change/AbstractSubmitByMerge.java
@@ -17,21 +17,10 @@
import static com.google.common.truth.Truth.assertThat;
import static com.google.common.truth.TruthJUnit.assume;
-import com.google.common.collect.Iterables;
import com.google.gerrit.acceptance.PushOneCommit;
import com.google.gerrit.acceptance.TestProjectInput;
-import com.google.gerrit.extensions.api.changes.SubmitInput;
-import com.google.gerrit.extensions.client.ChangeStatus;
import com.google.gerrit.extensions.client.InheritableBoolean;
-import com.google.gerrit.extensions.common.ChangeInfo;
-import com.google.gerrit.extensions.restapi.ResourceConflictException;
-import com.google.gerrit.reviewdb.client.Change;
-import com.google.gerrit.reviewdb.client.PatchSet;
-import com.google.gerrit.server.change.TestSubmitInput;
-import org.eclipse.jgit.lib.ObjectId;
-import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevCommit;
-import org.eclipse.jgit.revwalk.RevWalk;
import org.junit.Test;
public abstract class AbstractSubmitByMerge extends AbstractSubmit {
@@ -124,58 +113,4 @@
assertThat(head.getParent(0)).isEqualTo(change1.getCommit());
assertThat(head.getParent(1)).isEqualTo(change2.getCommit());
}
-
- @Test
- public void repairChangeStateAfterFailure() throws Exception {
- // In NoteDb-only mode, repo and meta updates are atomic (at least in InMemoryRepository).
- assume().that(notesMigration.disableChangeReviewDb()).isFalse();
-
- RevCommit initialHead = getRemoteHead();
- PushOneCommit.Result change = createChange("Change 1", "a.txt", "content");
- submit(change.getChangeId());
- RevCommit afterChange1Head = getRemoteHead();
-
- testRepo.reset(initialHead);
- PushOneCommit.Result change2 = createChange("Change 2", "b.txt", "other content");
- Change.Id id2 = change2.getChange().getId();
- TestSubmitInput failInput = new TestSubmitInput();
- failInput.failAfterRefUpdates = true;
- submit(
- change2.getChangeId(),
- failInput,
- ResourceConflictException.class,
- "Failing after ref updates");
-
- // Bad: ref advanced but change wasn't updated.
- PatchSet.Id psId1 = new PatchSet.Id(id2, 1);
- ChangeInfo info = gApi.changes().id(id2.get()).get();
- assertThat(info.status).isEqualTo(ChangeStatus.NEW);
- assertThat(info.revisions.get(info.currentRevision)._number).isEqualTo(1);
-
- RevCommit tip;
- try (Repository repo = repoManager.openRepository(project);
- RevWalk rw = new RevWalk(repo)) {
- ObjectId rev1 = repo.exactRef(psId1.toRefName()).getObjectId();
- assertThat(rev1).isNotNull();
-
- tip = rw.parseCommit(repo.exactRef("refs/heads/master").getObjectId());
- assertThat(tip.getParentCount()).isEqualTo(2);
- assertThat(tip.getParent(0)).isEqualTo(afterChange1Head);
- assertThat(tip.getParent(1)).isEqualTo(change2.getCommit());
- }
-
- submit(change2.getChangeId(), new SubmitInput(), null, null);
-
- // Change status and patch set entities were updated, and branch tip stayed
- // the same.
- info = gApi.changes().id(id2.get()).get();
- assertThat(info.status).isEqualTo(ChangeStatus.MERGED);
- assertThat(info.revisions.get(info.currentRevision)._number).isEqualTo(1);
- assertThat(Iterables.getLast(info.messages).message)
- .isEqualTo("Change has been successfully merged by Administrator");
-
- try (Repository repo = repoManager.openRepository(project)) {
- assertThat(repo.exactRef("refs/heads/master").getObjectId()).isEqualTo(tip);
- }
- }
}
diff --git a/javatests/com/google/gerrit/acceptance/rest/change/AbstractSubmitByRebase.java b/javatests/com/google/gerrit/acceptance/rest/change/AbstractSubmitByRebase.java
index 0a92cfb..e8e896d 100644
--- a/javatests/com/google/gerrit/acceptance/rest/change/AbstractSubmitByRebase.java
+++ b/javatests/com/google/gerrit/acceptance/rest/change/AbstractSubmitByRebase.java
@@ -15,13 +15,11 @@
package com.google.gerrit.acceptance.rest.change;
import static com.google.common.truth.Truth.assertThat;
-import static com.google.common.truth.TruthJUnit.assume;
import static com.google.gerrit.acceptance.GitUtil.getChangeId;
import static com.google.gerrit.acceptance.GitUtil.pushHead;
import static com.google.gerrit.server.group.SystemGroupBackend.REGISTERED_USERS;
import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Iterables;
import com.google.gerrit.acceptance.PushOneCommit;
import com.google.gerrit.acceptance.TestAccount;
import com.google.gerrit.acceptance.TestProjectInput;
@@ -30,12 +28,8 @@
import com.google.gerrit.extensions.client.InheritableBoolean;
import com.google.gerrit.extensions.client.SubmitType;
import com.google.gerrit.extensions.common.ChangeInfo;
-import com.google.gerrit.extensions.restapi.ResourceConflictException;
import com.google.gerrit.reviewdb.client.Branch;
-import com.google.gerrit.reviewdb.client.Change;
-import com.google.gerrit.reviewdb.client.PatchSet;
import com.google.gerrit.reviewdb.client.Project;
-import com.google.gerrit.server.change.TestSubmitInput;
import com.google.gerrit.server.project.testing.Util;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.Repository;
@@ -242,80 +236,6 @@
assertChangeMergedEvents(change.getChangeId(), headAfterFirstSubmit.name());
}
- @Test
- public void repairChangeStateAfterFailure() throws Exception {
- // In NoteDb-only mode, repo and meta updates are atomic (at least in InMemoryRepository).
- assume().that(notesMigration.disableChangeReviewDb()).isFalse();
-
- RevCommit initialHead = getRemoteHead();
- PushOneCommit.Result change = createChange("Change 1", "a.txt", "content");
- submit(change.getChangeId());
-
- RevCommit headAfterFirstSubmit = getRemoteHead();
- testRepo.reset(initialHead);
- PushOneCommit.Result change2 = createChange("Change 2", "b.txt", "other content");
- Change.Id id2 = change2.getChange().getId();
- TestSubmitInput failInput = new TestSubmitInput();
- failInput.failAfterRefUpdates = true;
- submit(
- change2.getChangeId(),
- failInput,
- ResourceConflictException.class,
- "Failing after ref updates");
- RevCommit headAfterFailedSubmit = getRemoteHead();
-
- // Bad: ref advanced but change wasn't updated.
- PatchSet.Id psId1 = new PatchSet.Id(id2, 1);
- PatchSet.Id psId2 = new PatchSet.Id(id2, 2);
- ChangeInfo info = gApi.changes().id(id2.get()).get();
- assertThat(info.status).isEqualTo(ChangeStatus.NEW);
- assertThat(info.revisions.get(info.currentRevision)._number).isEqualTo(1);
- assertThat(getPatchSet(psId2)).isNull();
-
- ObjectId rev2;
- try (Repository repo = repoManager.openRepository(project);
- RevWalk rw = new RevWalk(repo)) {
- ObjectId rev1 = repo.exactRef(psId1.toRefName()).getObjectId();
- assertThat(rev1).isNotNull();
-
- rev2 = repo.exactRef(psId2.toRefName()).getObjectId();
- assertThat(rev2).isNotNull();
- assertThat(rev2).isNotEqualTo(rev1);
- assertThat(rw.parseCommit(rev2).getParent(0)).isEqualTo(headAfterFirstSubmit);
-
- assertThat(repo.exactRef("refs/heads/master").getObjectId()).isEqualTo(rev2);
- }
-
- submit(change2.getChangeId());
- RevCommit headAfterSecondSubmit = getRemoteHead();
- assertThat(headAfterSecondSubmit).isEqualTo(headAfterFailedSubmit);
-
- // Change status and patch set entities were updated, and branch tip stayed
- // the same.
- info = gApi.changes().id(id2.get()).get();
- assertThat(info.status).isEqualTo(ChangeStatus.MERGED);
- assertThat(info.revisions.get(info.currentRevision)._number).isEqualTo(2);
- PatchSet ps2 = getPatchSet(psId2);
- assertThat(ps2).isNotNull();
- assertThat(ps2.getRevision().get()).isEqualTo(rev2.name());
- assertThat(Iterables.getLast(info.messages).message)
- .isEqualTo(
- "Change has been successfully rebased and submitted as "
- + rev2.name()
- + " by Administrator");
-
- try (Repository repo = repoManager.openRepository(project)) {
- assertThat(repo.exactRef("refs/heads/master").getObjectId()).isEqualTo(rev2);
- }
-
- assertRefUpdatedEvents(initialHead, headAfterFirstSubmit);
- assertChangeMergedEvents(
- change.getChangeId(),
- headAfterFirstSubmit.name(),
- change2.getChangeId(),
- headAfterSecondSubmit.name());
- }
-
protected RevCommit parse(ObjectId id) throws Exception {
try (Repository repo = repoManager.openRepository(project);
RevWalk rw = new RevWalk(repo)) {
diff --git a/javatests/com/google/gerrit/acceptance/rest/change/AssigneeIT.java b/javatests/com/google/gerrit/acceptance/rest/change/AssigneeIT.java
index 69035f2..c925d88 100644
--- a/javatests/com/google/gerrit/acceptance/rest/change/AssigneeIT.java
+++ b/javatests/com/google/gerrit/acceptance/rest/change/AssigneeIT.java
@@ -15,7 +15,6 @@
package com.google.gerrit.acceptance.rest.change;
import static com.google.common.truth.Truth.assertThat;
-import static com.google.common.truth.TruthJUnit.assume;
import static com.google.gerrit.extensions.client.ListChangesOption.DETAILED_LABELS;
import static com.google.gerrit.server.group.SystemGroupBackend.REGISTERED_USERS;
import static java.util.concurrent.TimeUnit.SECONDS;
@@ -79,7 +78,6 @@
@Test
public void getPastAssignees() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
PushOneCommit.Result r = createChange();
setAssignee(r, user.email);
setAssignee(r, admin.email);
@@ -92,14 +90,7 @@
@Test
public void assigneeAddedAsReviewer() throws Exception {
- ReviewerState state;
- // Assignee is added as CC, if back-end is reviewDb (that does not support
- // CC) CC is stored as REVIEWER
- if (notesMigration.readChanges()) {
- state = ReviewerState.CC;
- } else {
- state = ReviewerState.REVIEWER;
- }
+ ReviewerState state = ReviewerState.CC;
PushOneCommit.Result r = createChange();
Iterable<AccountInfo> reviewers = getReviewers(r, state);
assertThat(reviewers).isNull();
diff --git a/javatests/com/google/gerrit/acceptance/rest/change/ChangeMessagesIT.java b/javatests/com/google/gerrit/acceptance/rest/change/ChangeMessagesIT.java
index 790b884..48cb050 100644
--- a/javatests/com/google/gerrit/acceptance/rest/change/ChangeMessagesIT.java
+++ b/javatests/com/google/gerrit/acceptance/rest/change/ChangeMessagesIT.java
@@ -251,10 +251,7 @@
List<ChangeMessageInfo> messagesBeforeDeletion = gApi.changes().id(changeNum).messages();
List<CommentInfo> commentsBefore = getChangeSortedComments(changeNum);
- List<RevCommit> commitsBefore = new ArrayList<>();
- if (notesMigration.readChanges()) {
- commitsBefore = getChangeMetaCommitsInReverseOrder(new Change.Id(changeNum));
- }
+ List<RevCommit> commitsBefore = getChangeMetaCommitsInReverseOrder(new Change.Id(changeNum));
String id = messagesBeforeDeletion.get(deletedMessageIndex).id;
DeleteChangeMessageInput input = new DeleteChangeMessageInput(reason);
@@ -271,11 +268,9 @@
List<ChangeInfo> changes = gApi.changes().query("message removed").get();
assertThat(changes.stream().map(c -> c._number).collect(toSet())).contains(changeNum);
- // Verifies states of commits if NoteDb is on.
- if (notesMigration.readChanges()) {
- assertMetaCommitsAfterDeletion(
- commitsBefore, changeNum, deletedMessageIndex, deletedBy, reason);
- }
+ // Verifies states of commits.
+ assertMetaCommitsAfterDeletion(
+ commitsBefore, changeNum, deletedMessageIndex, deletedBy, reason);
}
private void assertMessagesAfterDeletion(
diff --git a/javatests/com/google/gerrit/acceptance/rest/change/ChangeReviewersByEmailIT.java b/javatests/com/google/gerrit/acceptance/rest/change/ChangeReviewersByEmailIT.java
index dc71c1f..2a397e4 100644
--- a/javatests/com/google/gerrit/acceptance/rest/change/ChangeReviewersByEmailIT.java
+++ b/javatests/com/google/gerrit/acceptance/rest/change/ChangeReviewersByEmailIT.java
@@ -15,7 +15,6 @@
package com.google.gerrit.acceptance.rest.change;
import static com.google.common.truth.Truth.assertThat;
-import static com.google.common.truth.TruthJUnit.assume;
import static com.google.gerrit.extensions.client.ListChangesOption.DETAILED_LABELS;
import com.google.common.collect.ImmutableList;
@@ -52,7 +51,6 @@
@Test
public void addByEmail() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
AccountInfo acc = new AccountInfo("Foo Bar", "foo.bar@gerritcodereview.com");
for (ReviewerState state : ImmutableList.of(ReviewerState.CC, ReviewerState.REVIEWER)) {
@@ -72,7 +70,6 @@
@Test
public void addByEmailAndById() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
AccountInfo byEmail = new AccountInfo("Foo Bar", "foo.bar@gerritcodereview.com");
AccountInfo byId = new AccountInfo(user.id.get());
@@ -98,7 +95,6 @@
@Test
public void listReviewersByEmail() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
AccountInfo acc = new AccountInfo("Foo Bar", "foo.bar@gerritcodereview.com");
for (ReviewerState state : ImmutableList.of(ReviewerState.CC, ReviewerState.REVIEWER)) {
@@ -126,7 +122,6 @@
@Test
public void removeByEmail() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
AccountInfo acc = new AccountInfo("Foo Bar", "foo.bar@gerritcodereview.com");
for (ReviewerState state : ImmutableList.of(ReviewerState.CC, ReviewerState.REVIEWER)) {
@@ -146,7 +141,6 @@
@Test
public void convertFromCCToReviewer() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
AccountInfo acc = new AccountInfo("Foo Bar", "foo.bar@gerritcodereview.com");
PushOneCommit.Result r = createChange();
@@ -168,7 +162,6 @@
@Test
public void addedReviewersGetNotified() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
AccountInfo acc = new AccountInfo("Foo Bar", "foo.bar@gerritcodereview.com");
for (ReviewerState state : ImmutableList.of(ReviewerState.CC, ReviewerState.REVIEWER)) {
@@ -188,7 +181,6 @@
@Test
public void removingReviewerTriggersNotification() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
AccountInfo acc = new AccountInfo("Foo Bar", "foo.bar@gerritcodereview.com");
for (ReviewerState state : ImmutableList.of(ReviewerState.CC, ReviewerState.REVIEWER)) {
@@ -221,7 +213,6 @@
@Test
public void reviewerAndCCReceiveRegularNotification() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
AccountInfo acc = new AccountInfo("Foo Bar", "foo.bar@gerritcodereview.com");
for (ReviewerState state : ImmutableList.of(ReviewerState.CC, ReviewerState.REVIEWER)) {
@@ -244,8 +235,6 @@
@Test
public void reviewerAndCCReceiveSameEmail() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
-
PushOneCommit.Result r = createChange();
for (ReviewerState state : ImmutableList.of(ReviewerState.CC, ReviewerState.REVIEWER)) {
for (int i = 0; i < 10; i++) {
@@ -270,8 +259,6 @@
@Test
public void addingMultipleReviewersAndCCsAtOnceSendsOnlyOneEmail() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
-
PushOneCommit.Result r = createChange();
ReviewInput reviewInput = new ReviewInput();
for (ReviewerState state : ImmutableList.of(ReviewerState.CC, ReviewerState.REVIEWER)) {
@@ -288,7 +275,6 @@
@Test
public void rejectMissingEmail() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
PushOneCommit.Result r = createChange();
AddReviewerResult result = gApi.changes().id(r.getChangeId()).addReviewer("");
@@ -298,7 +284,6 @@
@Test
public void rejectMalformedEmail() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
PushOneCommit.Result r = createChange();
AddReviewerResult result = gApi.changes().id(r.getChangeId()).addReviewer("Foo Bar <foo.bar@");
@@ -308,8 +293,6 @@
@Test
public void rejectWhenFeatureIsDisabled() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
-
ConfigInput conf = new ConfigInput();
conf.enableReviewerByEmail = InheritableBoolean.FALSE;
gApi.projects().name(project.get()).config(conf);
@@ -326,7 +309,6 @@
@Test
public void reviewersByEmailAreServedFromIndex() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
AccountInfo acc = new AccountInfo("Foo Bar", "foo.bar@gerritcodereview.com");
for (ReviewerState state : ImmutableList.of(ReviewerState.CC, ReviewerState.REVIEWER)) {
@@ -351,7 +333,6 @@
@Test
public void addExistingReviewerByEmailShortCircuits() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
PushOneCommit.Result r = createChange();
AddReviewerInput input = new AddReviewerInput();
@@ -369,7 +350,6 @@
@Test
public void addExistingCcByEmailShortCircuits() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
PushOneCommit.Result r = createChange();
AddReviewerInput input = new AddReviewerInput();
diff --git a/javatests/com/google/gerrit/acceptance/rest/change/ChangeReviewersIT.java b/javatests/com/google/gerrit/acceptance/rest/change/ChangeReviewersIT.java
index 6a9a27c..069607a 100644
--- a/javatests/com/google/gerrit/acceptance/rest/change/ChangeReviewersIT.java
+++ b/javatests/com/google/gerrit/acceptance/rest/change/ChangeReviewersIT.java
@@ -15,7 +15,6 @@
package com.google.gerrit.acceptance.rest.change;
import static com.google.common.truth.Truth.assertThat;
-import static com.google.common.truth.TruthJUnit.assume;
import static com.google.gerrit.extensions.client.ListChangesOption.DETAILED_LABELS;
import static com.google.gerrit.extensions.client.ReviewerState.CC;
import static com.google.gerrit.extensions.client.ReviewerState.REMOVED;
@@ -134,31 +133,18 @@
assertThat(result.confirm).isNull();
assertThat(result.error).isNull();
ChangeInfo c = gApi.changes().id(r.getChangeId()).get();
- if (notesMigration.readChanges()) {
- assertThat(result.reviewers).isNull();
- assertThat(result.ccs).hasSize(1);
- AccountInfo ai = result.ccs.get(0);
- assertThat(ai._accountId).isEqualTo(user.id.get());
- assertReviewers(c, CC, user);
- } else {
- assertThat(result.ccs).isNull();
- assertThat(result.reviewers).hasSize(1);
- AccountInfo ai = result.reviewers.get(0);
- assertThat(ai._accountId).isEqualTo(user.id.get());
- assertReviewers(c, REVIEWER, user);
- }
+ assertThat(result.reviewers).isNull();
+ assertThat(result.ccs).hasSize(1);
+ AccountInfo ai = result.ccs.get(0);
+ assertThat(ai._accountId).isEqualTo(user.id.get());
+ assertReviewers(c, CC, user);
// Verify email was sent to CCed account.
List<Message> messages = sender.getMessages();
assertThat(messages).hasSize(1);
Message m = messages.get(0);
assertThat(m.rcpt()).containsExactly(user.emailAddress);
- if (notesMigration.readChanges()) {
- assertThat(m.body()).contains(admin.fullName + " has uploaded this change for review.");
- } else {
- assertThat(m.body()).contains("Hello " + user.fullName + ",\n");
- assertThat(m.body()).contains("I'd like you to do a code review.");
- }
+ assertThat(m.body()).contains(admin.fullName + " has uploaded this change for review.");
}
@Test
@@ -185,18 +171,9 @@
assertThat(result.input).isEqualTo(in.reviewer);
assertThat(result.confirm).isNull();
assertThat(result.error).isNull();
- if (notesMigration.readChanges()) {
- assertThat(result.reviewers).isNull();
- } else {
- assertThat(result.ccs).isNull();
- }
+ assertThat(result.reviewers).isNull();
ChangeInfo c = gApi.changes().id(r.getChangeId()).get();
- if (notesMigration.readChanges()) {
- assertReviewers(c, CC, firstUsers);
- } else {
- assertReviewers(c, REVIEWER, firstUsers);
- assertReviewers(c, CC);
- }
+ assertReviewers(c, CC, firstUsers);
// Verify emails were sent to each of the group's accounts.
List<Message> messages = sender.getMessages();
@@ -222,19 +199,10 @@
assertThat(result.confirm).isNull();
assertThat(result.error).isNull();
c = gApi.changes().id(r.getChangeId()).get();
- if (notesMigration.readChanges()) {
- assertThat(result.ccs).hasSize(3);
- assertThat(result.reviewers).isNull();
- assertReviewers(c, REVIEWER, reviewer);
- assertReviewers(c, CC, users);
- } else {
- assertThat(result.ccs).isNull();
- assertThat(result.reviewers).hasSize(3);
- List<TestAccount> expectedUsers = new ArrayList<>(users.size() + 2);
- expectedUsers.addAll(users);
- expectedUsers.add(reviewer);
- assertReviewers(c, REVIEWER, expectedUsers);
- }
+ assertThat(result.ccs).hasSize(3);
+ assertThat(result.reviewers).isNull();
+ assertReviewers(c, REVIEWER, reviewer);
+ assertReviewers(c, CC, users);
messages = sender.getMessages();
assertThat(messages).hasSize(1);
@@ -243,11 +211,6 @@
for (int i = 0; i < 3; i++) {
expectedAddresses.add(users.get(users.size() - i - 1).emailAddress);
}
- if (!notesMigration.readChanges()) {
- for (int i = 0; i < 3; i++) {
- expectedAddresses.add(users.get(i).emailAddress);
- }
- }
expectedAddresses.add(reviewer.emailAddress);
assertThat(m.rcpt()).containsExactlyElementsIn(expectedAddresses);
}
@@ -261,13 +224,8 @@
in.state = CC;
addReviewer(changeId, in);
ChangeInfo c = gApi.changes().id(r.getChangeId()).get();
- if (notesMigration.readChanges()) {
- assertReviewers(c, REVIEWER);
- assertReviewers(c, CC, user);
- } else {
- assertReviewers(c, REVIEWER, user);
- assertReviewers(c, CC);
- }
+ assertReviewers(c, REVIEWER);
+ assertReviewers(c, CC, user);
in.state = REVIEWER;
addReviewer(changeId, in);
@@ -293,15 +251,8 @@
// Verify user is added to CC list.
ChangeInfo c = gApi.changes().id(r.getChangeId()).get();
- if (notesMigration.readChanges()) {
- assertReviewers(c, REVIEWER);
- assertReviewers(c, CC, user);
- } else {
- // If we aren't reading from NoteDb, the user will appear as a
- // reviewer.
- assertReviewers(c, REVIEWER, user);
- assertReviewers(c, CC);
- }
+ assertReviewers(c, REVIEWER);
+ assertReviewers(c, CC, user);
}
@Test
@@ -350,26 +301,13 @@
// Verify reviewer state.
ChangeInfo c = gApi.changes().id(r.getChangeId()).get();
- if (notesMigration.readChanges()) {
- assertReviewers(c, REVIEWER);
- assertReviewers(c, CC, user);
- // Verify no approvals were added.
- assertThat(c.labels).isNotNull();
- LabelInfo label = c.labels.get("Code-Review");
- assertThat(label).isNotNull();
- assertThat(label.all).isNull();
- } else {
- // When approvals are stored in ReviewDb, we still create a label for
- // the reviewing user, and force them into the REVIEWER state.
- assertReviewers(c, REVIEWER, user);
- assertReviewers(c, CC);
- LabelInfo label = c.labels.get("Code-Review");
- assertThat(label).isNotNull();
- assertThat(label.all).isNotNull();
- assertThat(label.all).hasSize(1);
- ApprovalInfo approval = label.all.get(0);
- assertThat(approval._accountId).isEqualTo(user.getId().get());
- }
+ assertReviewers(c, REVIEWER);
+ assertReviewers(c, CC, user);
+ // Verify no approvals were added.
+ assertThat(c.labels).isNotNull();
+ LabelInfo label = c.labels.get("Code-Review");
+ assertThat(label).isNotNull();
+ assertThat(label.all).isNull();
}
@Test
@@ -449,14 +387,8 @@
// Verify reviewer and CC were added. If not in NoteDb read mode, both
// parties will be returned as CCed.
ChangeInfo c = gApi.changes().id(r.getChangeId()).get();
- if (notesMigration.readChanges()) {
- assertReviewers(c, REVIEWER, admin, user);
- assertReviewers(c, CC, observer);
- } else {
- // In legacy mode, everyone should be a reviewer.
- assertReviewers(c, REVIEWER, admin, user, observer);
- assertReviewers(c, CC);
- }
+ assertReviewers(c, REVIEWER, admin, user);
+ assertReviewers(c, CC, observer);
// Verify emails were sent to added reviewers.
List<Message> messages = sender.getMessages();
@@ -549,23 +481,12 @@
c = gApi.changes().id(r.getChangeId()).get();
assertThat(c.messages).hasSize(2);
- if (notesMigration.readChanges()) {
- assertReviewers(c, REVIEWER, admin, user);
- assertReviewers(c, CC, users.subList(0, mediumGroupSize));
- } else {
- // If not in NoteDb mode, then everyone is a REVIEWER.
- List<TestAccount> expected = users.subList(0, mediumGroupSize);
- expected.add(admin);
- expected.add(user);
- assertReviewers(c, REVIEWER, expected);
- assertReviewers(c, CC);
- }
+ assertReviewers(c, REVIEWER, admin, user);
+ assertReviewers(c, CC, users.subList(0, mediumGroupSize));
}
@Test
public void noteDbAddReviewerToReviewerChangeInfo() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
-
PushOneCommit.Result r = createChange();
String changeId = r.getChangeId();
AddReviewerInput in = new AddReviewerInput();
@@ -645,9 +566,6 @@
assertThat(reviewerResult.reviewers).hasSize(1);
// Repeat the above for CCs
- if (!notesMigration.readChanges()) {
- return;
- }
r = createChange();
input = ReviewInput.approve().reviewer(group1, CC, false).reviewer(group2, CC, false);
result = review(r.getChangeId(), r.getCommit().name(), input);
@@ -792,7 +710,6 @@
@Test
public void addExistingReviewerShortCircuits() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
PushOneCommit.Result r = createChange();
AddReviewerInput input = new AddReviewerInput();
@@ -809,7 +726,6 @@
@Test
public void addExistingCcShortCircuits() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
PushOneCommit.Result r = createChange();
AddReviewerInput input = new AddReviewerInput();
diff --git a/javatests/com/google/gerrit/acceptance/rest/change/CreateChangeIT.java b/javatests/com/google/gerrit/acceptance/rest/change/CreateChangeIT.java
index 9218336..28252e5 100644
--- a/javatests/com/google/gerrit/acceptance/rest/change/CreateChangeIT.java
+++ b/javatests/com/google/gerrit/acceptance/rest/change/CreateChangeIT.java
@@ -15,7 +15,6 @@
package com.google.gerrit.acceptance.rest.change;
import static com.google.common.truth.Truth.assertThat;
-import static com.google.common.truth.TruthJUnit.assume;
import static com.google.gerrit.common.data.Permission.READ;
import static com.google.gerrit.reviewdb.client.RefNames.changeMetaRef;
import static com.google.gerrit.server.group.SystemGroupBackend.REGISTERED_USERS;
@@ -276,8 +275,6 @@
@Test
public void noteDbCommit() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
-
ChangeInfo c = assertCreateSucceeds(newChangeInput(ChangeStatus.NEW));
try (Repository repo = repoManager.openRepository(project);
RevWalk rw = new RevWalk(repo)) {
diff --git a/javatests/com/google/gerrit/acceptance/rest/change/HashtagsIT.java b/javatests/com/google/gerrit/acceptance/rest/change/HashtagsIT.java
index 864f08d..47ec0d2 100644
--- a/javatests/com/google/gerrit/acceptance/rest/change/HashtagsIT.java
+++ b/javatests/com/google/gerrit/acceptance/rest/change/HashtagsIT.java
@@ -15,7 +15,6 @@
package com.google.gerrit.acceptance.rest.change;
import static com.google.common.truth.Truth.assertThat;
-import static com.google.common.truth.TruthJUnit.assume;
import static com.google.gerrit.server.group.SystemGroupBackend.REGISTERED_USERS;
import static java.util.Objects.requireNonNull;
import static java.util.concurrent.TimeUnit.SECONDS;
@@ -33,17 +32,11 @@
import com.google.gerrit.extensions.restapi.BadRequestException;
import com.google.gerrit.testing.TestTimeUtil;
import org.junit.AfterClass;
-import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
@NoHttpd
public class HashtagsIT extends AbstractDaemonTest {
- @Before
- public void before() {
- assume().that(notesMigration.readChanges()).isTrue();
- }
-
@BeforeClass
public static void setTimeForTesting() {
TestTimeUtil.resetWithClockStep(1, SECONDS);
diff --git a/javatests/com/google/gerrit/acceptance/rest/change/SubmitByCherryPickIT.java b/javatests/com/google/gerrit/acceptance/rest/change/SubmitByCherryPickIT.java
index 8160d9a..8a81d6d 100644
--- a/javatests/com/google/gerrit/acceptance/rest/change/SubmitByCherryPickIT.java
+++ b/javatests/com/google/gerrit/acceptance/rest/change/SubmitByCherryPickIT.java
@@ -15,7 +15,6 @@
package com.google.gerrit.acceptance.rest.change;
import static com.google.common.truth.Truth.assertThat;
-import static com.google.common.truth.TruthJUnit.assume;
import static com.google.gerrit.extensions.client.ListChangesOption.CURRENT_REVISION;
import static com.google.gerrit.extensions.client.ListChangesOption.MESSAGES;
@@ -31,19 +30,13 @@
import com.google.gerrit.extensions.common.ChangeInfo;
import com.google.gerrit.extensions.registration.DynamicSet;
import com.google.gerrit.extensions.registration.RegistrationHandle;
-import com.google.gerrit.extensions.restapi.ResourceConflictException;
import com.google.gerrit.reviewdb.client.Branch;
-import com.google.gerrit.reviewdb.client.Change;
-import com.google.gerrit.reviewdb.client.PatchSet;
-import com.google.gerrit.server.change.TestSubmitInput;
import com.google.gerrit.server.git.ChangeMessageModifier;
import com.google.gerrit.server.submit.CommitMergeStatus;
import com.google.inject.Inject;
import java.util.List;
import org.eclipse.jgit.lib.ObjectId;
-import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevCommit;
-import org.eclipse.jgit.revwalk.RevWalk;
import org.junit.Test;
public class SubmitByCherryPickIT extends AbstractSubmit {
@@ -389,76 +382,4 @@
change2.getChangeId(),
headAfterFirstSubmit.name());
}
-
- @Test
- public void repairChangeStateAfterFailure() throws Exception {
- // In NoteDb-only mode, repo and meta updates are atomic (at least in InMemoryRepository).
- assume().that(notesMigration.disableChangeReviewDb()).isFalse();
-
- RevCommit initialHead = getRemoteHead();
- PushOneCommit.Result change = createChange("Change 1", "a.txt", "content");
- submit(change.getChangeId());
-
- RevCommit headAfterFirstSubmit = getRemoteHead();
- testRepo.reset(initialHead);
- PushOneCommit.Result change2 = createChange("Change 2", "b.txt", "other content");
- Change.Id id2 = change2.getChange().getId();
- TestSubmitInput failInput = new TestSubmitInput();
- failInput.failAfterRefUpdates = true;
- submit(
- change2.getChangeId(),
- failInput,
- ResourceConflictException.class,
- "Failing after ref updates");
- RevCommit headAfterFailedSubmit = getRemoteHead();
-
- // Bad: ref advanced but change wasn't updated.
- PatchSet.Id psId1 = new PatchSet.Id(id2, 1);
- PatchSet.Id psId2 = new PatchSet.Id(id2, 2);
- ChangeInfo info = gApi.changes().id(id2.get()).get();
- assertThat(info.status).isEqualTo(ChangeStatus.NEW);
- assertThat(info.revisions.get(info.currentRevision)._number).isEqualTo(1);
- assertThat(getPatchSet(psId2)).isNull();
-
- ObjectId rev2;
- try (Repository repo = repoManager.openRepository(project);
- RevWalk rw = new RevWalk(repo)) {
- ObjectId rev1 = repo.exactRef(psId1.toRefName()).getObjectId();
- assertThat(rev1).isNotNull();
-
- rev2 = repo.exactRef(psId2.toRefName()).getObjectId();
- assertThat(rev2).isNotNull();
- assertThat(rev2).isNotEqualTo(rev1);
- assertThat(rw.parseCommit(rev2).getParent(0)).isEqualTo(headAfterFirstSubmit);
-
- assertThat(repo.exactRef("refs/heads/master").getObjectId()).isEqualTo(rev2);
- }
-
- submit(change2.getChangeId());
-
- // Change status and patch set entities were updated, and branch tip stayed
- // the same.
- RevCommit headAfterSecondSubmit = getRemoteHead();
- assertThat(headAfterSecondSubmit).isEqualTo(headAfterFailedSubmit);
- info = gApi.changes().id(id2.get()).get();
- assertThat(info.status).isEqualTo(ChangeStatus.MERGED);
- assertThat(info.revisions.get(info.currentRevision)._number).isEqualTo(2);
- PatchSet ps2 = getPatchSet(psId2);
- assertThat(ps2).isNotNull();
- assertThat(ps2.getRevision().get()).isEqualTo(rev2.name());
- assertThat(Iterables.getLast(info.messages).message)
- .isEqualTo(
- "Change has been successfully cherry-picked as " + rev2.name() + " by Administrator");
-
- try (Repository repo = repoManager.openRepository(project)) {
- assertThat(repo.exactRef("refs/heads/master").getObjectId()).isEqualTo(rev2);
- }
-
- assertRefUpdatedEvents(initialHead, headAfterFirstSubmit);
- assertChangeMergedEvents(
- change.getChangeId(),
- headAfterFirstSubmit.name(),
- change2.getChangeId(),
- headAfterSecondSubmit.name());
- }
}
diff --git a/javatests/com/google/gerrit/acceptance/rest/change/SubmitByFastForwardIT.java b/javatests/com/google/gerrit/acceptance/rest/change/SubmitByFastForwardIT.java
index ea8b98a..ccb684c 100644
--- a/javatests/com/google/gerrit/acceptance/rest/change/SubmitByFastForwardIT.java
+++ b/javatests/com/google/gerrit/acceptance/rest/change/SubmitByFastForwardIT.java
@@ -15,26 +15,16 @@
package com.google.gerrit.acceptance.rest.change;
import static com.google.common.truth.Truth.assertThat;
-import static com.google.common.truth.TruthJUnit.assume;
import static com.google.gerrit.acceptance.GitUtil.pushHead;
-import com.google.common.collect.Iterables;
import com.google.gerrit.acceptance.GitUtil;
import com.google.gerrit.acceptance.PushOneCommit;
import com.google.gerrit.common.data.Permission;
-import com.google.gerrit.extensions.client.ChangeStatus;
import com.google.gerrit.extensions.client.SubmitType;
import com.google.gerrit.extensions.common.ActionInfo;
-import com.google.gerrit.extensions.common.ChangeInfo;
-import com.google.gerrit.extensions.restapi.ResourceConflictException;
import com.google.gerrit.reviewdb.client.Change;
-import com.google.gerrit.reviewdb.client.PatchSet;
-import com.google.gerrit.server.change.TestSubmitInput;
import java.util.Map;
-import org.eclipse.jgit.lib.ObjectId;
-import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevCommit;
-import org.eclipse.jgit.revwalk.RevWalk;
import org.eclipse.jgit.transport.PushResult;
import org.junit.Test;
@@ -146,52 +136,6 @@
}
@Test
- public void repairChangeStateAfterFailure() throws Exception {
- // In NoteDb-only mode, repo and meta updates are atomic (at least in InMemoryRepository).
- assume().that(notesMigration.disableChangeReviewDb()).isFalse();
-
- PushOneCommit.Result change = createChange("Change 1", "a.txt", "content");
- Change.Id id = change.getChange().getId();
- TestSubmitInput failInput = new TestSubmitInput();
- failInput.failAfterRefUpdates = true;
- submit(
- change.getChangeId(),
- failInput,
- ResourceConflictException.class,
- "Failing after ref updates");
-
- // Bad: ref advanced but change wasn't updated.
- PatchSet.Id psId = new PatchSet.Id(id, 1);
- ChangeInfo info = gApi.changes().id(id.get()).get();
- assertThat(info.status).isEqualTo(ChangeStatus.NEW);
- assertThat(info.revisions.get(info.currentRevision)._number).isEqualTo(1);
-
- ObjectId rev;
- try (Repository repo = repoManager.openRepository(project);
- RevWalk rw = new RevWalk(repo)) {
- rev = repo.exactRef(psId.toRefName()).getObjectId();
- assertThat(rev).isNotNull();
- assertThat(repo.exactRef("refs/heads/master").getObjectId()).isEqualTo(rev);
- }
-
- submit(change.getChangeId());
-
- // Change status was updated, and branch tip stayed the same.
- info = gApi.changes().id(id.get()).get();
- assertThat(info.status).isEqualTo(ChangeStatus.MERGED);
- assertThat(info.revisions.get(info.currentRevision)._number).isEqualTo(1);
- assertThat(Iterables.getLast(info.messages).message)
- .isEqualTo("Change has been successfully merged by Administrator");
-
- try (Repository repo = repoManager.openRepository(project)) {
- assertThat(repo.exactRef("refs/heads/master").getObjectId()).isEqualTo(rev);
- }
-
- assertRefUpdatedEvents();
- assertChangeMergedEvents(change.getChangeId(), getRemoteHead().name());
- }
-
- @Test
public void submitSameCommitsAsInExperimentalBranch() throws Exception {
RevCommit initialHead = getRemoteHead();
diff --git a/javatests/com/google/gerrit/acceptance/server/change/CommentsIT.java b/javatests/com/google/gerrit/acceptance/server/change/CommentsIT.java
index 0d40a1c..a352baa 100644
--- a/javatests/com/google/gerrit/acceptance/server/change/CommentsIT.java
+++ b/javatests/com/google/gerrit/acceptance/server/change/CommentsIT.java
@@ -16,7 +16,6 @@
import static com.google.common.truth.Truth.assertThat;
import static com.google.common.truth.Truth8.assertThat;
-import static com.google.common.truth.TruthJUnit.assume;
import static com.google.gerrit.acceptance.PushOneCommit.FILE_NAME;
import static com.google.gerrit.acceptance.PushOneCommit.SUBJECT;
import static java.util.stream.Collectors.groupingBy;
@@ -946,7 +945,6 @@
@Test
public void jsonCommentHasLegacyFormatFalse() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
PushOneCommit.Result result = createChange();
Change.Id changeId = result.getChange().getId();
addComment(result.getChangeId(), "comment");
diff --git a/javatests/com/google/gerrit/acceptance/server/change/ConsistencyCheckerIT.java b/javatests/com/google/gerrit/acceptance/server/change/ConsistencyCheckerIT.java
index 7a30f79..e377a86 100644
--- a/javatests/com/google/gerrit/acceptance/server/change/ConsistencyCheckerIT.java
+++ b/javatests/com/google/gerrit/acceptance/server/change/ConsistencyCheckerIT.java
@@ -245,10 +245,6 @@
String rev = "deadbeefdeadbeefdeadbeefdeadbeefdeadbeef";
PatchSet ps = newPatchSet(psId, rev, adminId);
- if (notesMigration.changePrimaryStorage() == PrimaryStorage.REVIEW_DB) {
- db.changes().insert(singleton(c));
- db.patchSets().insert(singleton(ps));
- }
addNoteDbCommit(
c.getId(),
"Create change\n"
diff --git a/javatests/com/google/gerrit/acceptance/server/mail/ChangeNotificationsIT.java b/javatests/com/google/gerrit/acceptance/server/mail/ChangeNotificationsIT.java
index 209d0a2..35d9e88 100644
--- a/javatests/com/google/gerrit/acceptance/server/mail/ChangeNotificationsIT.java
+++ b/javatests/com/google/gerrit/acceptance/server/mail/ChangeNotificationsIT.java
@@ -14,7 +14,6 @@
package com.google.gerrit.acceptance.server.mail;
-import static com.google.common.truth.TruthJUnit.assume;
import static com.google.gerrit.extensions.api.changes.NotifyHandling.ALL;
import static com.google.gerrit.extensions.api.changes.NotifyHandling.NONE;
import static com.google.gerrit.extensions.api.changes.NotifyHandling.OWNER;
@@ -255,31 +254,7 @@
* AddReviewerSender tests.
*/
- private void addReviewerToReviewableChangeInReviewDb(Adder adder) throws Exception {
- assume().that(notesMigration.readChanges()).isFalse();
- StagedChange sc = stageReviewableChange();
- TestAccount reviewer = accountCreator.create("added", "added@example.com", "added");
- addReviewer(adder, sc.changeId, sc.owner, reviewer.email);
- assertThat(sender)
- .sent("newchange", sc)
- .to(reviewer)
- .cc(sc.reviewer, sc.ccer)
- .cc(sc.reviewerByEmail, sc.ccerByEmail)
- .noOneElse();
- }
-
- @Test
- public void addReviewerToReviewableChangeInReviewDbSingly() throws Exception {
- addReviewerToReviewableChangeInReviewDb(singly());
- }
-
- @Test
- public void addReviewerToReviewableChangeInReviewDbBatch() throws Exception {
- addReviewerToReviewableChangeInReviewDb(batch());
- }
-
- private void addReviewerToReviewableChangeInNoteDb(Adder adder) throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
+ private void addReviewerToReviewableChange(Adder adder) throws Exception {
StagedChange sc = stageReviewableChange();
TestAccount reviewer = accountCreator.create("added", "added@example.com", "added");
addReviewer(adder, sc.changeId, sc.owner, reviewer.email);
@@ -293,17 +268,16 @@
}
@Test
- public void addReviewerToReviewableChangeInNoteDbSingly() throws Exception {
- addReviewerToReviewableChangeInNoteDb(singly());
+ public void addReviewerToReviewableChangeSingly() throws Exception {
+ addReviewerToReviewableChange(singly());
}
@Test
- public void addReviewerToReviewableChangeInNoteDbBatch() throws Exception {
- addReviewerToReviewableChangeInNoteDb(batch());
+ public void addReviewerToReviewableChangeBatch() throws Exception {
+ addReviewerToReviewableChange(batch());
}
- private void addReviewerToReviewableChangeByOwnerCcingSelfInNoteDb(Adder adder) throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
+ private void addReviewerToReviewableChangeByOwnerCcingSelf(Adder adder) throws Exception {
StagedChange sc = stageReviewableChange();
TestAccount reviewer = accountCreator.create("added", "added@example.com", "added");
addReviewer(adder, sc.changeId, sc.owner, reviewer.email, CC_ON_OWN_COMMENTS, null);
@@ -317,17 +291,16 @@
}
@Test
- public void addReviewerToReviewableChangeByOwnerCcingSelfInNoteDbSingly() throws Exception {
- addReviewerToReviewableChangeByOwnerCcingSelfInNoteDb(singly());
+ public void addReviewerToReviewableChangeByOwnerCcingSelfSingly() throws Exception {
+ addReviewerToReviewableChangeByOwnerCcingSelf(singly());
}
@Test
- public void addReviewerToReviewableChangeByOwnerCcingSelfInNoteDbBatch() throws Exception {
- addReviewerToReviewableChangeByOwnerCcingSelfInNoteDb(batch());
+ public void addReviewerToReviewableChangeByOwnerCcingSelfBatch() throws Exception {
+ addReviewerToReviewableChangeByOwnerCcingSelf(batch());
}
- private void addReviewerToReviewableChangeByOtherInNoteDb(Adder adder) throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
+ private void addReviewerToReviewableChangeByOther(Adder adder) throws Exception {
TestAccount other = accountCreator.create("other", "other@example.com", "other");
StagedChange sc = stageReviewableChange();
TestAccount reviewer = accountCreator.create("added", "added@example.com", "added");
@@ -342,17 +315,16 @@
}
@Test
- public void addReviewerToReviewableChangeByOtherInNoteDbSingly() throws Exception {
- addReviewerToReviewableChangeByOtherInNoteDb(singly());
+ public void addReviewerToReviewableChangeByOtherSingly() throws Exception {
+ addReviewerToReviewableChangeByOther(singly());
}
@Test
- public void addReviewerToReviewableChangeByOtherInNoteDbBatch() throws Exception {
- addReviewerToReviewableChangeByOtherInNoteDb(batch());
+ public void addReviewerToReviewableChangeByOtherBatch() throws Exception {
+ addReviewerToReviewableChangeByOther(batch());
}
- private void addReviewerToReviewableChangeByOtherCcingSelfInNoteDb(Adder adder) throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
+ private void addReviewerToReviewableChangeByOtherCcingSelf(Adder adder) throws Exception {
TestAccount other = accountCreator.create("other", "other@example.com", "other");
StagedChange sc = stageReviewableChange();
TestAccount reviewer = accountCreator.create("added", "added@example.com", "added");
@@ -367,35 +339,16 @@
}
@Test
- public void addReviewerToReviewableChangeByOtherCcingSelfInNoteDbSingly() throws Exception {
- addReviewerToReviewableChangeByOtherCcingSelfInNoteDb(singly());
+ public void addReviewerToReviewableChangeByOtherCcingSelfSingly() throws Exception {
+ addReviewerToReviewableChangeByOtherCcingSelf(singly());
}
@Test
- public void addReviewerToReviewableChangeByOtherCcingSelfInNoteDbBatch() throws Exception {
- addReviewerToReviewableChangeByOtherCcingSelfInNoteDb(batch());
+ public void addReviewerToReviewableChangeByOtherCcingSelfBatch() throws Exception {
+ addReviewerToReviewableChangeByOtherCcingSelf(batch());
}
- private void addReviewerByEmailToReviewableChangeInReviewDb(Adder adder) throws Exception {
- assume().that(notesMigration.readChanges()).isFalse();
- String email = "addedbyemail@example.com";
- StagedChange sc = stageReviewableChange();
- addReviewer(adder, sc.changeId, sc.owner, email);
- assertThat(sender).notSent();
- }
-
- @Test
- public void addReviewerByEmailToReviewableChangeInReviewDbSingly() throws Exception {
- addReviewerByEmailToReviewableChangeInReviewDb(singly());
- }
-
- @Test
- public void addReviewerByEmailToReviewableChangeInReviewDbBatch() throws Exception {
- addReviewerByEmailToReviewableChangeInReviewDb(batch());
- }
-
- private void addReviewerByEmailToReviewableChangeInNoteDb(Adder adder) throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
+ private void addReviewerByEmailToReviewableChange(Adder adder) throws Exception {
String email = "addedbyemail@example.com";
StagedChange sc = stageReviewableChange();
addReviewer(adder, sc.changeId, sc.owner, email);
@@ -409,13 +362,13 @@
}
@Test
- public void addReviewerByEmailToReviewableChangeInNoteDbSingly() throws Exception {
- addReviewerByEmailToReviewableChangeInNoteDb(singly());
+ public void addReviewerByEmailToReviewableChangeSingly() throws Exception {
+ addReviewerByEmailToReviewableChange(singly());
}
@Test
- public void addReviewerByEmailToReviewableChangeInNoteDbBatch() throws Exception {
- addReviewerByEmailToReviewableChangeInNoteDb(batch());
+ public void addReviewerByEmailToReviewableChangeBatch() throws Exception {
+ addReviewerByEmailToReviewableChange(batch());
}
private void addReviewerToWipChange(Adder adder) throws Exception {
@@ -452,8 +405,7 @@
addReviewerToReviewableWipChange(batch());
}
- private void addReviewerToWipChangeInNoteDbNotifyAll(Adder adder) throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
+ private void addReviewerToWipChangeNotifyAll(Adder adder) throws Exception {
StagedChange sc = stageWipChange();
TestAccount reviewer = accountCreator.create("added", "added@example.com", "added");
addReviewer(adder, sc.changeId, sc.owner, reviewer.email, NotifyHandling.ALL);
@@ -467,41 +419,16 @@
}
@Test
- public void addReviewerToWipChangeInNoteDbNotifyAllSingly() throws Exception {
- addReviewerToWipChangeInNoteDbNotifyAll(singly());
+ public void addReviewerToWipChangeNotifyAllSingly() throws Exception {
+ addReviewerToWipChangeNotifyAll(singly());
}
@Test
- public void addReviewerToWipChangeInNoteDbNotifyAllBatch() throws Exception {
- addReviewerToWipChangeInNoteDbNotifyAll(batch());
+ public void addReviewerToWipChangeNotifyAllBatch() throws Exception {
+ addReviewerToWipChangeNotifyAll(batch());
}
- private void addReviewerToWipChangeInReviewDbNotifyAll(Adder adder) throws Exception {
- assume().that(notesMigration.readChanges()).isFalse();
- StagedChange sc = stageWipChange();
- TestAccount reviewer = accountCreator.create("added", "added@example.com", "added");
- addReviewer(adder, sc.changeId, sc.owner, reviewer.email, NotifyHandling.ALL);
- assertThat(sender)
- .sent("newchange", sc)
- .to(reviewer)
- .cc(sc.reviewer, sc.ccer)
- .cc(sc.reviewerByEmail, sc.ccerByEmail)
- .noOneElse();
- }
-
- @Test
- public void addReviewerToWipChangeInReviewDbNotifyAllSingly() throws Exception {
- addReviewerToWipChangeInReviewDbNotifyAll(singly());
- }
-
- @Test
- public void addReviewerToWipChangeInReviewDbNotifyAllBatch() throws Exception {
- addReviewerToWipChangeInReviewDbNotifyAll(batch());
- }
-
- private void addReviewerToReviewableChangeInNoteDbNotifyOwnerReviewers(Adder adder)
- throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
+ private void addReviewerToReviewableChangeNotifyOwnerReviewers(Adder adder) throws Exception {
StagedChange sc = stageReviewableChange();
TestAccount reviewer = accountCreator.create("added", "added@example.com", "added");
addReviewer(adder, sc.changeId, sc.owner, reviewer.email, OWNER_REVIEWERS);
@@ -515,18 +442,17 @@
}
@Test
- public void addReviewerToReviewableChangeInNoteDbNotifyOwnerReviewersSingly() throws Exception {
- addReviewerToReviewableChangeInNoteDbNotifyOwnerReviewers(singly());
+ public void addReviewerToReviewableChangeNotifyOwnerReviewersSingly() throws Exception {
+ addReviewerToReviewableChangeNotifyOwnerReviewers(singly());
}
@Test
- public void addReviewerToReviewableChangeInNoteDbNotifyOwnerReviewersBatch() throws Exception {
- addReviewerToReviewableChangeInNoteDbNotifyOwnerReviewers(batch());
+ public void addReviewerToReviewableChangeNotifyOwnerReviewersBatch() throws Exception {
+ addReviewerToReviewableChangeNotifyOwnerReviewers(batch());
}
- private void addReviewerToReviewableChangeInNoteDbByOwnerCcingSelfNotifyOwner(Adder adder)
+ private void addReviewerToReviewableChangeByOwnerCcingSelfNotifyOwner(Adder adder)
throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
StagedChange sc = stageReviewableChange();
TestAccount reviewer = accountCreator.create("added", "added@example.com", "added");
addReviewer(adder, sc.changeId, sc.owner, reviewer.email, CC_ON_OWN_COMMENTS, OWNER);
@@ -534,20 +460,17 @@
}
@Test
- public void addReviewerToReviewableChangeInNoteDbByOwnerCcingSelfNotifyOwnerSingly()
- throws Exception {
- addReviewerToReviewableChangeInNoteDbByOwnerCcingSelfNotifyOwner(singly());
+ public void addReviewerToReviewableChangeByOwnerCcingSelfNotifyOwnerSingly() throws Exception {
+ addReviewerToReviewableChangeByOwnerCcingSelfNotifyOwner(singly());
}
@Test
- public void addReviewerToReviewableChangeInNoteDbByOwnerCcingSelfNotifyOwnerBatch()
- throws Exception {
- addReviewerToReviewableChangeInNoteDbByOwnerCcingSelfNotifyOwner(batch());
+ public void addReviewerToReviewableChangeByOwnerCcingSelfNotifyOwnerBatch() throws Exception {
+ addReviewerToReviewableChangeByOwnerCcingSelfNotifyOwner(batch());
}
- private void addReviewerToReviewableChangeInNoteDbByOwnerCcingSelfNotifyNone(Adder adder)
+ private void addReviewerToReviewableChangeByOwnerCcingSelfNotifyNone(Adder adder)
throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
StagedChange sc = stageReviewableChange();
TestAccount reviewer = accountCreator.create("added", "added@example.com", "added");
addReviewer(adder, sc.changeId, sc.owner, reviewer.email, CC_ON_OWN_COMMENTS, NONE);
@@ -555,19 +478,16 @@
}
@Test
- public void addReviewerToReviewableChangeInNoteDbByOwnerCcingSelfNotifyNoneSingly()
- throws Exception {
- addReviewerToReviewableChangeInNoteDbByOwnerCcingSelfNotifyNone(singly());
+ public void addReviewerToReviewableChangeByOwnerCcingSelfNotifyNoneSingly() throws Exception {
+ addReviewerToReviewableChangeByOwnerCcingSelfNotifyNone(singly());
}
@Test
- public void addReviewerToReviewableChangeInNoteDbByOwnerCcingSelfNotifyNoneBatch()
- throws Exception {
- addReviewerToReviewableChangeInNoteDbByOwnerCcingSelfNotifyNone(batch());
+ public void addReviewerToReviewableChangeByOwnerCcingSelfNotifyNoneBatch() throws Exception {
+ addReviewerToReviewableChangeByOwnerCcingSelfNotifyNone(batch());
}
- private void addNonUserReviewerByEmailInNoteDb(Adder adder) throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
+ private void addNonUserReviewerByEmail(Adder adder) throws Exception {
StagedChange sc = stageReviewableChange();
addReviewer(adder, sc.changeId, sc.owner, "nonexistent@example.com");
assertThat(sender)
@@ -579,17 +499,16 @@
}
@Test
- public void addNonUserReviewerByEmailInNoteDbSingly() throws Exception {
- addNonUserReviewerByEmailInNoteDb(singly(ReviewerState.REVIEWER));
+ public void addNonUserReviewerByEmailSingly() throws Exception {
+ addNonUserReviewerByEmail(singly(ReviewerState.REVIEWER));
}
@Test
- public void addNonUserReviewerByEmailInNoteDbBatch() throws Exception {
- addNonUserReviewerByEmailInNoteDb(batch(ReviewerState.REVIEWER));
+ public void addNonUserReviewerByEmailBatch() throws Exception {
+ addNonUserReviewerByEmail(batch(ReviewerState.REVIEWER));
}
- private void addNonUserCcByEmailInNoteDb(Adder adder) throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
+ private void addNonUserCcByEmail(Adder adder) throws Exception {
StagedChange sc = stageReviewableChange();
addReviewer(adder, sc.changeId, sc.owner, "nonexistent@example.com");
assertThat(sender)
@@ -601,13 +520,13 @@
}
@Test
- public void addNonUserCcByEmailInNoteDbSingly() throws Exception {
- addNonUserCcByEmailInNoteDb(singly(ReviewerState.CC));
+ public void addNonUserCcByEmailSingly() throws Exception {
+ addNonUserCcByEmail(singly(ReviewerState.CC));
}
@Test
- public void addNonUserCcByEmailInNoteDbBatch() throws Exception {
- addNonUserCcByEmailInNoteDb(batch(ReviewerState.CC));
+ public void addNonUserCcByEmailBatch() throws Exception {
+ addNonUserCcByEmail(batch(ReviewerState.CC));
}
private interface Adder {
@@ -923,8 +842,7 @@
}
@Test
- public void addReviewerOnWipChangeAndStartReviewInNoteDb() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
+ public void addReviewerOnWipChangeAndStartReview() throws Exception {
StagedChange sc = stageWipChange();
ReviewInput in = ReviewInput.noScore().reviewer(other.email).setWorkInProgress(false);
gApi.changes().id(sc.changeId).revision("current").review(in);
@@ -946,28 +864,6 @@
}
@Test
- public void addReviewerOnWipChangeAndStartReviewInReviewDb() throws Exception {
- assume().that(notesMigration.readChanges()).isFalse();
- StagedChange sc = stageWipChange();
- ReviewInput in = ReviewInput.noScore().reviewer(other.email).setWorkInProgress(false);
- gApi.changes().id(sc.changeId).revision("current").review(in);
- assertThat(sender)
- .sent("comment", sc)
- .cc(sc.reviewer, sc.ccer, other)
- .cc(sc.reviewerByEmail, sc.ccerByEmail)
- .bcc(sc.starrer)
- .bcc(ALL_COMMENTS)
- .noOneElse();
- assertThat(sender)
- .sent("newchange", sc)
- .to(other)
- .cc(sc.reviewer, sc.ccer)
- .cc(sc.reviewerByEmail, sc.ccerByEmail)
- .noOneElse();
- assertThat(sender).notSent();
- }
-
- @Test
public void startReviewMessageNotRepeated() throws Exception {
// TODO(logan): Remove this test check once PolyGerrit workaround is rolled back.
StagedChange sc = stageWipChange();
@@ -1094,18 +990,12 @@
users -> ImmutableList.of("r=" + users.reviewer.username, "cc=" + users.ccer.username));
FakeEmailSenderSubject subject =
assertThat(sender).sent("newchange", spc).to(spc.reviewer, spc.watchingProjectOwner);
- if (notesMigration.readChanges()) {
- subject.cc(spc.ccer);
- } else {
- // CCs are considered reviewers in the storage layer.
- subject.to(spc.ccer);
- }
+ subject.cc(spc.ccer);
subject.bcc(NEW_CHANGES, NEW_PATCHSETS).noOneElse();
}
@Test
- public void createReviewableChangeWithReviewersAndCcsByEmailInNoteDb() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
+ public void createReviewableChangeWithReviewersAndCcsByEmail() throws Exception {
StagedPreChange spc =
stagePreChange(
"refs/for/master",
@@ -1290,8 +1180,7 @@
}
@Test
- public void deleteReviewerByEmailFromWipChangeInNoteDb() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
+ public void deleteReviewerByEmailFromWipChange() throws Exception {
StagedChange sc = stageWipChangeWithExtraReviewer();
gApi.changes().id(sc.changeId).reviewer(sc.reviewerByEmail).remove();
assertThat(sender).notSent();
@@ -1650,8 +1539,7 @@
*/
@Test
- public void newPatchSetByOwnerOnReviewableChangeInNoteDb() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
+ public void newPatchSetByOwnerOnReviewableChange() throws Exception {
StagedChange sc = stageReviewableChange();
pushTo(sc, "refs/for/master", sc.owner);
assertThat(sender)
@@ -1665,21 +1553,7 @@
}
@Test
- public void newPatchSetByOwnerOnReviewableChangeInReviewDb() throws Exception {
- assume().that(notesMigration.readChanges()).isFalse();
- StagedChange sc = stageReviewableChange();
- pushTo(sc, "refs/for/master", sc.owner);
- assertThat(sender)
- .sent("newpatchset", sc)
- .to(sc.reviewer, sc.ccer)
- .bcc(sc.starrer)
- .bcc(NEW_PATCHSETS)
- .noOneElse();
- }
-
- @Test
- public void newPatchSetByOtherOnReviewableChangeInNoteDb() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
+ public void newPatchSetByOtherOnReviewableChange() throws Exception {
StagedChange sc = stageReviewableChange();
pushTo(sc, "refs/for/master", other);
assertThat(sender)
@@ -1694,22 +1568,7 @@
}
@Test
- public void newPatchSetByOtherOnReviewableChangeInReviewDb() throws Exception {
- assume().that(notesMigration.readChanges()).isFalse();
- StagedChange sc = stageReviewableChange();
- pushTo(sc, "refs/for/master", other);
- assertThat(sender)
- .sent("newpatchset", sc)
- .notTo(sc.owner) // TODO(logan): This email shouldn't come from the owner.
- .to(sc.reviewer, sc.ccer, other)
- .bcc(sc.starrer)
- .bcc(NEW_PATCHSETS)
- .noOneElse();
- }
-
- @Test
- public void newPatchSetByOtherOnReviewableChangeOwnerSelfCcInNoteDb() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
+ public void newPatchSetByOtherOnReviewableChangeOwnerSelfCc() throws Exception {
StagedChange sc = stageReviewableChange();
pushTo(sc, "refs/for/master", other, EmailStrategy.CC_ON_OWN_COMMENTS);
assertThat(sender)
@@ -1724,22 +1583,7 @@
}
@Test
- public void newPatchSetByOtherOnReviewableChangeOwnerSelfCcInReviewDb() throws Exception {
- assume().that(notesMigration.readChanges()).isFalse();
- StagedChange sc = stageReviewableChange();
- pushTo(sc, "refs/for/master", other, EmailStrategy.CC_ON_OWN_COMMENTS);
- assertThat(sender)
- .sent("newpatchset", sc)
- .notTo(sc.owner) // TODO(logan): This shouldn't be sent *from* the owner.
- .to(sc.reviewer, sc.ccer, other)
- .bcc(sc.starrer)
- .bcc(NEW_PATCHSETS)
- .noOneElse();
- }
-
- @Test
- public void newPatchSetByOtherOnReviewableChangeNotifyOwnerReviewersInNoteDb() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
+ public void newPatchSetByOtherOnReviewableChangeNotifyOwnerReviewers() throws Exception {
StagedChange sc = stageReviewableChange();
pushTo(sc, "refs/for/master%notify=OWNER_REVIEWERS", other);
assertThat(sender)
@@ -1753,23 +1597,8 @@
}
@Test
- public void newPatchSetByOtherOnReviewableChangeNotifyOwnerReviewersInReviewDb()
+ public void newPatchSetByOtherOnReviewableChangeOwnerSelfCcNotifyOwnerReviewers()
throws Exception {
- assume().that(notesMigration.readChanges()).isFalse();
- StagedChange sc = stageReviewableChange();
- pushTo(sc, "refs/for/master%notify=OWNER_REVIEWERS", other);
- assertThat(sender)
- .sent("newpatchset", sc)
- .notTo(sc.owner) // TODO(logan): This shouldn't be sent *from* the owner.
- .to(sc.reviewer, sc.ccer)
- .to(other)
- .noOneElse();
- }
-
- @Test
- public void newPatchSetByOtherOnReviewableChangeOwnerSelfCcNotifyOwnerReviewersInNoteDb()
- throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
StagedChange sc = stageReviewableChange();
pushTo(sc, "refs/for/master%notify=OWNER_REVIEWERS", other, EmailStrategy.CC_ON_OWN_COMMENTS);
assertThat(sender)
@@ -1783,20 +1612,6 @@
}
@Test
- public void newPatchSetByOtherOnReviewableChangeOwnerSelfCcNotifyOwnerReviewersInReviewDb()
- throws Exception {
- assume().that(notesMigration.readChanges()).isFalse();
- StagedChange sc = stageReviewableChange();
- pushTo(sc, "refs/for/master%notify=OWNER_REVIEWERS", other, EmailStrategy.CC_ON_OWN_COMMENTS);
- assertThat(sender)
- .sent("newpatchset", sc)
- .to(sc.reviewer, sc.ccer)
- .to(other)
- .notTo(sc.owner) // TODO(logan): This shouldn't be sent *from* the owner.
- .noOneElse();
- }
-
- @Test
public void newPatchSetByOtherOnReviewableChangeNotifyOwner() throws Exception {
StagedChange sc = stageReviewableChange();
pushTo(sc, "refs/for/master%notify=OWNER", other);
@@ -1843,8 +1658,7 @@
}
@Test
- public void newPatchSetOnWipChangeNotifyAllInNoteDb() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
+ public void newPatchSetOnWipChangeNotifyAll() throws Exception {
StagedChange sc = stageWipChange();
pushTo(sc, "refs/for/master%wip,notify=ALL", sc.owner);
assertThat(sender)
@@ -1858,21 +1672,7 @@
}
@Test
- public void newPatchSetOnWipChangeNotifyAllInReviewDb() throws Exception {
- assume().that(notesMigration.readChanges()).isFalse();
- StagedChange sc = stageWipChange();
- pushTo(sc, "refs/for/master%wip,notify=ALL", sc.owner);
- assertThat(sender)
- .sent("newpatchset", sc)
- .to(sc.reviewer, sc.ccer)
- .bcc(sc.starrer)
- .bcc(NEW_PATCHSETS)
- .noOneElse();
- }
-
- @Test
- public void newPatchSetOnWipChangeToReadyInNoteDb() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
+ public void newPatchSetOnWipChangeToReady() throws Exception {
StagedChange sc = stageWipChange();
pushTo(sc, "refs/for/master%ready", sc.owner);
assertThat(sender)
@@ -1886,19 +1686,6 @@
}
@Test
- public void newPatchSetOnWipChangeToReadyInReviewDb() throws Exception {
- assume().that(notesMigration.readChanges()).isFalse();
- StagedChange sc = stageWipChange();
- pushTo(sc, "refs/for/master%ready", sc.owner);
- assertThat(sender)
- .sent("newpatchset", sc)
- .to(sc.reviewer, sc.ccer)
- .bcc(sc.starrer)
- .bcc(NEW_PATCHSETS)
- .noOneElse();
- }
-
- @Test
public void newPatchSetOnReviewableWipChange() throws Exception {
StagedChange sc = stageReviewableWipChange();
pushTo(sc, "refs/for/master%wip", sc.owner);
@@ -1906,8 +1693,7 @@
}
@Test
- public void newPatchSetOnReviewableChangeAddingReviewerInNoteDb() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
+ public void newPatchSetOnReviewableChangeAddingReviewer() throws Exception {
StagedChange sc = stageReviewableChange();
TestAccount newReviewer = sc.testAccount("newReviewer");
pushTo(sc, "refs/for/master%r=" + newReviewer.username, sc.owner);
@@ -1923,22 +1709,6 @@
}
@Test
- public void newPatchSetOnReviewableChangeAddingReviewerInReviewDb() throws Exception {
- assume().that(notesMigration.readChanges()).isFalse();
- StagedChange sc = stageReviewableChange();
- TestAccount newReviewer = sc.testAccount("newReviewer");
- pushTo(sc, "refs/for/master%r=" + newReviewer.username, sc.owner);
- assertThat(sender)
- .sent("newpatchset", sc)
- .to(sc.reviewer, sc.ccer, newReviewer)
- .cc(sc.reviewerByEmail, sc.ccerByEmail)
- .bcc(sc.starrer)
- .bcc(NEW_PATCHSETS)
- .noOneElse();
- assertThat(sender).notSent();
- }
-
- @Test
public void newPatchSetOnWipChangeAddingReviewer() throws Exception {
StagedChange sc = stageWipChange();
TestAccount newReviewer = sc.testAccount("newReviewer");
@@ -1947,8 +1717,7 @@
}
@Test
- public void newPatchSetOnWipChangeAddingReviewerNotifyAllInNoteDb() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
+ public void newPatchSetOnWipChangeAddingReviewerNotifyAll() throws Exception {
StagedChange sc = stageWipChange();
TestAccount newReviewer = sc.testAccount("newReviewer");
pushTo(sc, "refs/for/master%notify=ALL,r=" + newReviewer.username, sc.owner);
@@ -1964,24 +1733,7 @@
}
@Test
- public void newPatchSetOnWipChangeAddingReviewerNotifyAllInReviewDb() throws Exception {
- assume().that(notesMigration.readChanges()).isFalse();
- StagedChange sc = stageWipChange();
- TestAccount newReviewer = sc.testAccount("newReviewer");
- pushTo(sc, "refs/for/master%notify=ALL,r=" + newReviewer.username, sc.owner);
- assertThat(sender)
- .sent("newpatchset", sc)
- .to(sc.reviewer, sc.ccer, newReviewer)
- .cc(sc.reviewerByEmail, sc.ccerByEmail)
- .bcc(sc.starrer)
- .bcc(NEW_PATCHSETS)
- .noOneElse();
- assertThat(sender).notSent();
- }
-
- @Test
- public void newPatchSetOnWipChangeSettingReadyInNoteDb() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
+ public void newPatchSetOnWipChangeSettingReady() throws Exception {
StagedChange sc = stageWipChange();
pushTo(sc, "refs/for/master%ready", sc.owner);
assertThat(sender)
@@ -1995,21 +1747,6 @@
assertThat(sender).notSent();
}
- @Test
- public void newPatchSetOnWipChangeSettingReadyInReviewDb() throws Exception {
- assume().that(notesMigration.readChanges()).isFalse();
- StagedChange sc = stageWipChange();
- pushTo(sc, "refs/for/master%ready", sc.owner);
- assertThat(sender)
- .sent("newpatchset", sc)
- .to(sc.reviewer, sc.ccer)
- .cc(sc.reviewerByEmail, sc.ccerByEmail)
- .bcc(sc.starrer)
- .bcc(NEW_PATCHSETS)
- .noOneElse();
- assertThat(sender).notSent();
- }
-
private void pushTo(StagedChange sc, String ref, TestAccount by) throws Exception {
pushTo(sc, ref, by, ENABLED);
}
@@ -2021,8 +1758,7 @@
}
@Test
- public void editCommitMessageEditByOwnerOnReviewableChangeInNoteDb() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
+ public void editCommitMessageEditByOwnerOnReviewableChange() throws Exception {
StagedChange sc = stageReviewableChange();
editCommitMessage(sc, sc.owner);
assertThat(sender)
@@ -2036,21 +1772,7 @@
}
@Test
- public void editCommitMessageEditByOwnerOnReviewableChangeInReviewDb() throws Exception {
- assume().that(notesMigration.readChanges()).isFalse();
- StagedChange sc = stageReviewableChange();
- editCommitMessage(sc, sc.owner);
- assertThat(sender)
- .sent("newpatchset", sc)
- .to(sc.reviewer, sc.ccer)
- .bcc(sc.starrer)
- .bcc(NEW_PATCHSETS)
- .noOneElse();
- }
-
- @Test
- public void editCommitMessageEditByOtherOnReviewableChangeInNoteDb() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
+ public void editCommitMessageEditByOtherOnReviewableChange() throws Exception {
StagedChange sc = stageReviewableChange();
editCommitMessage(sc, other);
assertThat(sender)
@@ -2064,21 +1786,7 @@
}
@Test
- public void editCommitMessageEditByOtherOnReviewableChangeInReviewDb() throws Exception {
- assume().that(notesMigration.readChanges()).isFalse();
- StagedChange sc = stageReviewableChange();
- editCommitMessage(sc, other);
- assertThat(sender)
- .sent("newpatchset", sc)
- .to(sc.owner, sc.reviewer, sc.ccer)
- .bcc(sc.starrer)
- .bcc(NEW_PATCHSETS)
- .noOneElse();
- }
-
- @Test
- public void editCommitMessageByOtherOnReviewableChangeOwnerSelfCcInNoteDb() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
+ public void editCommitMessageByOtherOnReviewableChangeOwnerSelfCc() throws Exception {
StagedChange sc = stageReviewableChange();
editCommitMessage(sc, other, CC_ON_OWN_COMMENTS);
assertThat(sender)
@@ -2092,22 +1800,7 @@
}
@Test
- public void editCommitMessageByOtherOnReviewableChangeOwnerSelfCcInReviewDb() throws Exception {
- assume().that(notesMigration.readChanges()).isFalse();
- StagedChange sc = stageReviewableChange();
- editCommitMessage(sc, other, CC_ON_OWN_COMMENTS);
- assertThat(sender)
- .sent("newpatchset", sc)
- .to(sc.owner, sc.reviewer, sc.ccer, other)
- .bcc(sc.starrer)
- .bcc(NEW_PATCHSETS)
- .noOneElse();
- }
-
- @Test
- public void editCommitMessageByOtherOnReviewableChangeNotifyOwnerReviewersInNoteDb()
- throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
+ public void editCommitMessageByOtherOnReviewableChangeNotifyOwnerReviewers() throws Exception {
StagedChange sc = stageReviewableChange();
editCommitMessage(sc, other, OWNER_REVIEWERS);
assertThat(sender)
@@ -2119,18 +1812,8 @@
}
@Test
- public void editCommitMessageByOtherOnReviewableChangeNotifyOwnerReviewersInReviewDb()
+ public void editCommitMessageByOtherOnReviewableChangeOwnerSelfCcNotifyOwnerReviewers()
throws Exception {
- assume().that(notesMigration.readChanges()).isFalse();
- StagedChange sc = stageReviewableChange();
- editCommitMessage(sc, other, OWNER_REVIEWERS);
- assertThat(sender).sent("newpatchset", sc).to(sc.owner, sc.reviewer, sc.ccer).noOneElse();
- }
-
- @Test
- public void editCommitMessageByOtherOnReviewableChangeOwnerSelfCcNotifyOwnerReviewersInNoteDb()
- throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
StagedChange sc = stageReviewableChange();
editCommitMessage(sc, other, OWNER_REVIEWERS, CC_ON_OWN_COMMENTS);
assertThat(sender)
@@ -2142,19 +1825,6 @@
}
@Test
- public void editCommitMessageByOtherOnReviewableChangeOwnerSelfCcNotifyOwnerReviewersInReviewDb()
- throws Exception {
- assume().that(notesMigration.readChanges()).isFalse();
- StagedChange sc = stageReviewableChange();
- editCommitMessage(sc, other, OWNER_REVIEWERS, CC_ON_OWN_COMMENTS);
- assertThat(sender)
- .sent("newpatchset", sc)
- .to(sc.owner, sc.reviewer, sc.ccer)
- .cc(other)
- .noOneElse();
- }
-
- @Test
public void editCommitMessageByOtherOnReviewableChangeNotifyOwner() throws Exception {
StagedChange sc = stageReviewableChange();
editCommitMessage(sc, other, OWNER);
@@ -2204,8 +1874,7 @@
}
@Test
- public void editCommitMessageOnWipChangeNotifyAllInNoteDb() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
+ public void editCommitMessageOnWipChangeNotifyAll() throws Exception {
StagedChange sc = stageWipChange();
editCommitMessage(sc, sc.owner, ALL);
assertThat(sender)
@@ -2218,19 +1887,6 @@
.noOneElse();
}
- @Test
- public void editCommitMessageOnWipChangeNotifyAllInReviewDb() throws Exception {
- assume().that(notesMigration.readChanges()).isFalse();
- StagedChange sc = stageWipChange();
- editCommitMessage(sc, sc.owner, ALL);
- assertThat(sender)
- .sent("newpatchset", sc)
- .to(sc.reviewer, sc.ccer)
- .bcc(sc.starrer)
- .bcc(NEW_PATCHSETS)
- .noOneElse();
- }
-
private void editCommitMessage(StagedChange sc, TestAccount by) throws Exception {
editCommitMessage(sc, by, null, ENABLED);
}
@@ -2357,31 +2013,7 @@
*/
@Test
- public void revertChangeByOwnerInReviewDb() throws Exception {
- assume().that(notesMigration.readChanges()).isFalse();
- StagedChange sc = stageChange();
- revert(sc, sc.owner);
-
- // email for the newly created revert change
- assertThat(sender)
- .sent("newchange", sc)
- .to(sc.reviewer, sc.ccer, sc.watchingProjectOwner, admin)
- .bcc(NEW_CHANGES, NEW_PATCHSETS)
- .noOneElse();
-
- // email for the change that is reverted
- assertThat(sender)
- .sent("revert", sc)
- .cc(sc.reviewer, sc.ccer, admin)
- .cc(sc.reviewerByEmail)
- .bcc(sc.starrer)
- .bcc(ALL_COMMENTS)
- .noOneElse();
- }
-
- @Test
- public void revertChangeByOwnerInNoteDb() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
+ public void revertChangeByOwner() throws Exception {
StagedChange sc = stageChange();
revert(sc, sc.owner);
@@ -2404,33 +2036,7 @@
}
@Test
- public void revertChangeByOwnerCcingSelfInReviewDb() throws Exception {
- assume().that(notesMigration.readChanges()).isFalse();
- StagedChange sc = stageChange();
- revert(sc, sc.owner, CC_ON_OWN_COMMENTS);
-
- // email for the newly created revert change
- assertThat(sender)
- .sent("newchange", sc)
- .to(sc.reviewer, sc.ccer, sc.watchingProjectOwner, admin)
- .cc(sc.owner)
- .bcc(NEW_CHANGES, NEW_PATCHSETS)
- .noOneElse();
-
- // email for the change that is reverted
- assertThat(sender)
- .sent("revert", sc)
- .to(sc.owner)
- .cc(sc.reviewer, sc.ccer, admin)
- .cc(sc.reviewerByEmail)
- .bcc(sc.starrer)
- .bcc(ALL_COMMENTS)
- .noOneElse();
- }
-
- @Test
- public void revertChangeByOwnerCcingSelfInNoteDb() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
+ public void revertChangeByOwnerCcingSelf() throws Exception {
StagedChange sc = stageChange();
revert(sc, sc.owner, CC_ON_OWN_COMMENTS);
@@ -2454,32 +2060,7 @@
}
@Test
- public void revertChangeByOtherInReviewDb() throws Exception {
- assume().that(notesMigration.readChanges()).isFalse();
- StagedChange sc = stageChange();
- revert(sc, other);
-
- // email for the newly created revert change
- assertThat(sender)
- .sent("newchange", sc)
- .to(sc.owner, sc.reviewer, sc.ccer, sc.watchingProjectOwner, admin)
- .bcc(NEW_CHANGES, NEW_PATCHSETS)
- .noOneElse();
-
- // email for the change that is reverted
- assertThat(sender)
- .sent("revert", sc)
- .to(sc.owner)
- .cc(sc.reviewer, sc.ccer, admin)
- .cc(sc.reviewerByEmail)
- .bcc(sc.starrer)
- .bcc(ALL_COMMENTS)
- .noOneElse();
- }
-
- @Test
- public void revertChangeByOtherInNoteDb() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
+ public void revertChangeByOther() throws Exception {
StagedChange sc = stageChange();
revert(sc, other);
@@ -2503,33 +2084,7 @@
}
@Test
- public void revertChangeByOtherCcingSelfInReviewDb() throws Exception {
- assume().that(notesMigration.readChanges()).isFalse();
- StagedChange sc = stageChange();
- revert(sc, other, CC_ON_OWN_COMMENTS);
-
- // email for the newly created revert change
- assertThat(sender)
- .sent("newchange", sc)
- .to(sc.owner, sc.reviewer, sc.ccer, sc.watchingProjectOwner, admin)
- .cc(other)
- .bcc(NEW_CHANGES, NEW_PATCHSETS)
- .noOneElse();
-
- // email for the change that is reverted
- assertThat(sender)
- .sent("revert", sc)
- .to(sc.owner)
- .cc(other, sc.reviewer, sc.ccer, admin)
- .cc(sc.reviewerByEmail)
- .bcc(sc.starrer)
- .bcc(ALL_COMMENTS)
- .noOneElse();
- }
-
- @Test
- public void revertChangeByOtherCcingSelfInNoteDb() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
+ public void revertChangeByOtherCcingSelf() throws Exception {
StagedChange sc = stageChange();
revert(sc, other, CC_ON_OWN_COMMENTS);
@@ -2623,8 +2178,7 @@
}
@Test
- public void setAssigneeToSelfOnReviewableChangeInNoteDb() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
+ public void setAssigneeToSelfOnReviewableChange() throws Exception {
StagedChange sc = stageReviewableChange();
assign(sc, sc.owner, sc.owner);
assertThat(sender)
@@ -2634,14 +2188,6 @@
}
@Test
- public void setAssigneeToSelfOnReviewableChangeInReviewDb() throws Exception {
- assume().that(notesMigration.readChanges()).isFalse();
- StagedChange sc = stageReviewableChange();
- assign(sc, sc.owner, sc.owner);
- assertThat(sender).notSent();
- }
-
- @Test
public void changeAssigneeOnReviewableChange() throws Exception {
StagedChange sc = stageReviewableChange();
TestAccount other = accountCreator.create("other", "other@example.com", "other");
@@ -2656,8 +2202,7 @@
}
@Test
- public void changeAssigneeToSelfOnReviewableChangeInNoteDb() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
+ public void changeAssigneeToSelfOnReviewableChange() throws Exception {
StagedChange sc = stageReviewableChange();
assign(sc, sc.owner, sc.assignee);
sender.clear();
@@ -2669,16 +2214,6 @@
}
@Test
- public void changeAssigneeToSelfOnReviewableChangeInReviewDb() throws Exception {
- assume().that(notesMigration.readChanges()).isFalse();
- StagedChange sc = stageReviewableChange();
- assign(sc, sc.owner, sc.assignee);
- sender.clear();
- assign(sc, sc.owner, sc.owner);
- assertThat(sender).notSent();
- }
-
- @Test
public void setAssigneeOnReviewableWipChange() throws Exception {
StagedChange sc = stageReviewableWipChange();
assign(sc, sc.owner, sc.assignee);
diff --git a/javatests/com/google/gerrit/acceptance/server/notedb/NoteDbOnlyIT.java b/javatests/com/google/gerrit/acceptance/server/notedb/NoteDbOnlyIT.java
index 8d6fecd..5047b73 100644
--- a/javatests/com/google/gerrit/acceptance/server/notedb/NoteDbOnlyIT.java
+++ b/javatests/com/google/gerrit/acceptance/server/notedb/NoteDbOnlyIT.java
@@ -16,7 +16,6 @@
import static com.google.common.truth.Truth.assertThat;
import static com.google.common.truth.Truth8.assertThat;
-import static com.google.common.truth.TruthJUnit.assume;
import static com.google.gerrit.extensions.client.ListChangesOption.MESSAGES;
import static java.util.stream.Collectors.toList;
@@ -56,7 +55,6 @@
import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.revwalk.RevSort;
import org.eclipse.jgit.revwalk.RevWalk;
-import org.junit.Before;
import org.junit.Test;
public class NoteDbOnlyIT extends AbstractDaemonTest {
@@ -70,14 +68,8 @@
@Inject private RetryHelper retryHelper;
- @Before
- public void setUp() throws Exception {
- assume().that(notesMigration.disableChangeReviewDb()).isTrue();
- }
-
@Test
public void updateChangeFailureRollsBackRefUpdate() throws Exception {
- assume().that(notesMigration.disableChangeReviewDb()).isTrue();
PushOneCommit.Result r = createChange();
Change.Id id = r.getChange().getId();
@@ -149,7 +141,6 @@
@Test
public void retryOnLockFailureWithAtomicUpdates() throws Exception {
- assume().that(notesMigration.disableChangeReviewDb()).isTrue();
PushOneCommit.Result r = createChange();
Change.Id id = r.getChange().getId();
String master = "refs/heads/master";
diff --git a/javatests/com/google/gerrit/acceptance/server/project/ReflogIT.java b/javatests/com/google/gerrit/acceptance/server/project/ReflogIT.java
index 8abb59d..04303ea 100644
--- a/javatests/com/google/gerrit/acceptance/server/project/ReflogIT.java
+++ b/javatests/com/google/gerrit/acceptance/server/project/ReflogIT.java
@@ -15,7 +15,6 @@
package com.google.gerrit.acceptance.server.project;
import static com.google.common.truth.Truth.assertThat;
-import static com.google.common.truth.TruthJUnit.assume;
import static com.google.gerrit.reviewdb.client.RefNames.changeMetaRef;
import com.google.gerrit.acceptance.AbstractDaemonTest;
@@ -40,7 +39,6 @@
public class ReflogIT extends AbstractDaemonTest {
@Test
public void guessRestApiInReflog() throws Exception {
- assume().that(notesMigration.disableChangeReviewDb()).isTrue();
PushOneCommit.Result r = createChange();
Change.Id id = r.getChange().getId();
diff --git a/javatests/com/google/gerrit/server/notedb/CommentJsonMigratorTest.java b/javatests/com/google/gerrit/server/notedb/CommentJsonMigratorTest.java
index b63adab..fbec5e6 100644
--- a/javatests/com/google/gerrit/server/notedb/CommentJsonMigratorTest.java
+++ b/javatests/com/google/gerrit/server/notedb/CommentJsonMigratorTest.java
@@ -547,11 +547,9 @@
// TODO(dborowitz): Comparing collections directly would be much easier, but Comment doesn't
// have a proper equals; switch to that when the issues with
// https://gerrit-review.googlesource.com/c/gerrit/+/207013 are resolved.
+ assertCommentsEqual(commentsUtil.draftByChange(actual), commentsUtil.draftByChange(expected));
assertCommentsEqual(
- commentsUtil.draftByChange(null, actual), commentsUtil.draftByChange(null, expected));
- assertCommentsEqual(
- commentsUtil.publishedByChange(null, actual),
- commentsUtil.publishedByChange(null, expected));
+ commentsUtil.publishedByChange(actual), commentsUtil.publishedByChange(expected));
// Change metadata is equal.
assertLogEqualExceptTrees(
diff --git a/javatests/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java b/javatests/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java
index 928eeb3..e87942c 100644
--- a/javatests/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java
+++ b/javatests/com/google/gerrit/server/query/change/AbstractQueryChangesTest.java
@@ -52,7 +52,6 @@
import com.google.gerrit.extensions.api.changes.NotifyHandling;
import com.google.gerrit.extensions.api.changes.ReviewInput;
import com.google.gerrit.extensions.api.changes.ReviewInput.DraftHandling;
-import com.google.gerrit.extensions.api.changes.ReviewInput.RobotCommentInput;
import com.google.gerrit.extensions.api.changes.StarsInput;
import com.google.gerrit.extensions.api.groups.GroupInput;
import com.google.gerrit.extensions.api.projects.ConfigInput;
@@ -69,7 +68,6 @@
import com.google.gerrit.extensions.restapi.RestApiException;
import com.google.gerrit.index.FieldDef;
import com.google.gerrit.index.IndexConfig;
-import com.google.gerrit.index.QueryOptions;
import com.google.gerrit.index.Schema;
import com.google.gerrit.lifecycle.LifecycleManager;
import com.google.gerrit.reviewdb.client.Account;
@@ -81,7 +79,6 @@
import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.reviewdb.client.RefNames;
import com.google.gerrit.reviewdb.server.ReviewDb;
-import com.google.gerrit.reviewdb.server.ReviewDbUtil;
import com.google.gerrit.server.CurrentUser;
import com.google.gerrit.server.IdentifiedUser;
import com.google.gerrit.server.PatchSetUtil;
@@ -102,11 +99,7 @@
import com.google.gerrit.server.index.change.ChangeField;
import com.google.gerrit.server.index.change.ChangeIndexCollection;
import com.google.gerrit.server.index.change.ChangeIndexer;
-import com.google.gerrit.server.index.change.IndexedChangeQuery;
-import com.google.gerrit.server.index.change.StalenessChecker;
import com.google.gerrit.server.notedb.ChangeNotes;
-import com.google.gerrit.server.notedb.NoteDbChangeState;
-import com.google.gerrit.server.notedb.NoteDbChangeState.PrimaryStorage;
import com.google.gerrit.server.project.ProjectCache;
import com.google.gerrit.server.project.ProjectConfig;
import com.google.gerrit.server.schema.SchemaCreator;
@@ -116,7 +109,6 @@
import com.google.gerrit.server.util.RequestContext;
import com.google.gerrit.server.util.ThreadLocalRequestContext;
import com.google.gerrit.server.util.time.TimeUtil;
-import com.google.gerrit.testing.DisabledReviewDb;
import com.google.gerrit.testing.GerritServerTests;
import com.google.gerrit.testing.InMemoryDatabase;
import com.google.gerrit.testing.InMemoryRepositoryManager;
@@ -131,13 +123,11 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
-import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import java.util.Optional;
import java.util.concurrent.TimeUnit;
import org.eclipse.jgit.junit.TestRepository;
import org.eclipse.jgit.lib.ObjectId;
@@ -573,7 +563,6 @@
@Test
public void restorePendingReviewers() throws Exception {
assume().that(getSchemaVersion()).isAtLeast(44);
- assume().that(notesMigration.readChanges()).isTrue();
Project.NameKey project = new Project.NameKey("repo");
TestRepository<Repo> repo = createProject(project.get());
@@ -1600,8 +1589,7 @@
}
@Test
- public void byHashtagWithNoteDb() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
+ public void byHashtag() throws Exception {
List<Change> changes = setUpHashtagChanges();
assertQuery("hashtag:foo", changes.get(1), changes.get(0));
assertQuery("hashtag:bar", changes.get(1));
@@ -1613,35 +1601,6 @@
}
@Test
- public void byHashtagWithoutNoteDb() throws Exception {
- assume().that(notesMigration.readChanges()).isFalse();
-
- notesMigration.setWriteChanges(true);
- notesMigration.setReadChanges(true);
- db.close();
- db = schemaFactory.open();
- List<Change> changes;
- try {
- changes = setUpHashtagChanges();
- notesMigration.setWriteChanges(false);
- notesMigration.setReadChanges(false);
- } finally {
- db.close();
- }
- db = schemaFactory.open();
- for (Change c : changes) {
- indexer.index(db, c); // Reindex without hashtag field.
- }
- assertQuery("hashtag:foo");
- assertQuery("hashtag:bar");
- assertQuery("hashtag:\" bar \"");
- assertQuery("hashtag:\"a tag\"");
- assertQuery("hashtag:\" a tag \"");
- assertQuery("hashtag:#foo");
- assertQuery("hashtag:\"# #foo\"");
- }
-
- @Test
public void byDefault() throws Exception {
TestRepository<Repo> repo = createProject("repo");
@@ -1772,8 +1731,6 @@
@Test
public void byDraftByExcludesZombieDrafts() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
-
Project.NameKey project = new Project.NameKey("repo");
TestRepository<Repo> repo = createProject(project.get());
Change change = insert(repo, newChange(repo));
@@ -1805,18 +1762,6 @@
allUsers.update(draftsRef.getName(), draftsRef.getObjectId());
assertThat(allUsers.getRepository().exactRef(draftsRef.getName())).isNotNull();
- if (PrimaryStorage.of(change) == PrimaryStorage.REVIEW_DB
- && !notesMigration.disableChangeReviewDb()) {
- // Record draft ref in noteDbState as well.
- ReviewDb db = ReviewDbUtil.unwrapDb(this.db);
- change = db.changes().get(id);
- NoteDbChangeState.applyDelta(
- change,
- NoteDbChangeState.Delta.create(
- id, Optional.empty(), ImmutableMap.of(userId, draftsRef.getObjectId())));
- db.changes().update(Collections.singleton(change));
- }
-
indexer.index(db, project, id);
assertQuery("draftby:" + userId);
}
@@ -2031,17 +1976,10 @@
assertQuery("reviewer:self", change3);
requestContext.setContext(newRequestContext(user1));
- if (notesMigration.readChanges()) {
- assertQuery("reviewer:" + user1, change1);
- assertQuery("cc:" + user1, change2);
- assertQuery("is:cc", change2);
- assertQuery("cc:self", change2);
- } else {
- assertQuery("reviewer:" + user1, change2, change1);
- assertQuery("cc:" + user1);
- assertQuery("is:cc");
- assertQuery("cc:self");
- }
+ assertQuery("reviewer:" + user1, change1);
+ assertQuery("cc:" + user1, change2);
+ assertQuery("is:cc", change2);
+ assertQuery("cc:self", change2);
}
@Test
@@ -2104,36 +2042,19 @@
.collect(toList());
assertThat(members).contains(user2.toString());
- if (notesMigration.readChanges()) {
- // CC and REVIEWER are separate in NoteDB
- assertQuery("reviewerin:\"Registered Users\"", change2, change1);
- assertQuery("reviewerin:" + group, change2);
- } else {
- // CC and REVIEWER are the same in ReviewDb
- assertQuery("reviewerin:\"Registered Users\"", change3, change2, change1);
- assertQuery("reviewerin:" + group, change3, change2);
- }
+ assertQuery("reviewerin:\"Registered Users\"", change2, change1);
+ assertQuery("reviewerin:" + group, change2);
gApi.changes().id(change2.getId().get()).current().review(ReviewInput.approve());
gApi.changes().id(change2.getId().get()).current().submit();
- if (notesMigration.readChanges()) {
- // CC and REVIEWER are separate in NoteDB
- assertQuery("reviewerin:" + group, change2);
- assertQuery("project:repo reviewerin:" + group, change2);
- assertQuery("status:merged reviewerin:" + group, change2);
- } else {
- // CC and REVIEWER are the same in ReviewDb
- assertQuery("reviewerin:" + group, change2, change3);
- assertQuery("project:repo reviewerin:" + group, change2, change3);
- assertQuery("status:merged reviewerin:" + group, change2);
- }
+ assertQuery("reviewerin:" + group, change2);
+ assertQuery("project:repo reviewerin:" + group, change2);
+ assertQuery("status:merged reviewerin:" + group, change2);
}
@Test
public void reviewerAndCcByEmail() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
-
Project.NameKey project = new Project.NameKey("repo");
TestRepository<Repo> repo = createProject(project.get());
ConfigInput conf = new ConfigInput();
@@ -2180,8 +2101,6 @@
@Test
public void reviewerAndCcByEmailWithQueryForDifferentUser() throws Exception {
- assume().that(notesMigration.readChanges()).isTrue();
-
Project.NameKey project = new Project.NameKey("repo");
TestRepository<Repo> repo = createProject(project.get());
ConfigInput conf = new ConfigInput();
@@ -2354,71 +2273,6 @@
}
@Test
- public void prepopulatedFields() throws Exception {
- assume().that(notesMigration.readChanges()).isFalse();
- TestRepository<Repo> repo = createProject("repo");
- Change change = insert(repo, newChange(repo));
-
- db = new DisabledReviewDb();
- requestContext.setContext(newRequestContext(userId));
- // Use QueryProcessor directly instead of API so we get ChangeDatas back.
- List<ChangeData> cds =
- queryProcessorProvider
- .get()
- .query(queryBuilder.parse(change.getId().toString()))
- .entities();
- assertThat(cds).hasSize(1);
-
- ChangeData cd = cds.get(0);
- cd.change();
- cd.patchSets();
- cd.currentApprovals();
- cd.changedLines();
- cd.reviewedBy();
- cd.reviewers();
- cd.unresolvedCommentCount();
-
- if (getSchemaVersion() < 51) {
- assertMissingField(ChangeField.TOTAL_COMMENT_COUNT);
- } else {
- cd.totalCommentCount();
- }
-
- // TODO(dborowitz): Swap out GitRepositoryManager somehow? Will probably be
- // necessary for NoteDb anyway.
- cd.isMergeable();
-
- exception.expect(DisabledReviewDb.Disabled.class);
- cd.messages();
- }
-
- @Test
- public void prepopulateOnlyRequestedFields() throws Exception {
- assume().that(notesMigration.readChanges()).isFalse();
- TestRepository<Repo> repo = createProject("repo");
- Change change = insert(repo, newChange(repo));
-
- db = new DisabledReviewDb();
- requestContext.setContext(newRequestContext(userId));
- // Use QueryProcessor directly instead of API so we get ChangeDatas back.
- List<ChangeData> cds =
- queryProcessorProvider
- .get()
- .setRequestedFields(
- ImmutableSet.of(ChangeField.PATCH_SET.getName(), ChangeField.CHANGE.getName()))
- .query(queryBuilder.parse(change.getId().toString()))
- .entities();
- assertThat(cds).hasSize(1);
-
- ChangeData cd = cds.get(0);
- cd.change();
- cd.patchSets();
-
- exception.expect(DisabledReviewDb.Disabled.class);
- cd.currentApprovals();
- }
-
- @Test
public void reindexIfStale() throws Exception {
Account.Id user = createAccount("user");
Project.NameKey project = new Project.NameKey("repo");
@@ -2446,93 +2300,6 @@
}
@Test
- public void refStateFields() throws Exception {
- // This test method manages primary storage manually.
- assume().that(notesMigration.changePrimaryStorage()).isEqualTo(PrimaryStorage.REVIEW_DB);
- Account.Id user = createAccount("user");
- Project.NameKey project = new Project.NameKey("repo");
- TestRepository<Repo> repo = createProject(project.get());
- String path = "file";
- RevCommit commit = repo.parseBody(repo.commit().message("one").add(path, "contents").create());
- Change change = insert(repo, newChangeForCommit(repo, commit));
- Change.Id id = change.getId();
- int c = id.get();
- String changeId = change.getKey().get();
- requestContext.setContext(newRequestContext(user));
-
- // Ensure one of each type of supported ref is present for the change. If
- // any more refs are added, update this test to reflect them.
-
- // Edit
- gApi.changes().id(changeId).edit().create();
-
- // Star
- gApi.accounts().self().starChange(change.getId().toString());
-
- if (notesMigration.readChanges()) {
- // Robot comment.
- ReviewInput rin = new ReviewInput();
- RobotCommentInput rcin = new RobotCommentInput();
- rcin.robotId = "happyRobot";
- rcin.robotRunId = "1";
- rcin.line = 1;
- rcin.message = "nit: trailing whitespace";
- rcin.path = path;
- rin.robotComments = ImmutableMap.of(path, ImmutableList.of(rcin));
- gApi.changes().id(c).current().review(rin);
- }
-
- // Draft.
- DraftInput din = new DraftInput();
- din.path = path;
- din.line = 1;
- din.message = "draft";
- gApi.changes().id(c).current().createDraft(din);
-
- if (notesMigration.readChanges()) {
- // Force NoteDb primary.
- change = ReviewDbUtil.unwrapDb(db).changes().get(id);
- change.setNoteDbState(NoteDbChangeState.NOTE_DB_PRIMARY_STATE);
- ReviewDbUtil.unwrapDb(db).changes().update(Collections.singleton(change));
- indexer.index(db, change);
- }
-
- QueryOptions opts =
- IndexedChangeQuery.createOptions(indexConfig, 0, 1, StalenessChecker.FIELDS);
- ChangeData cd = indexes.getSearchIndex().get(id, opts).get();
-
- String cs = RefNames.shard(c);
- int u = user.get();
- String us = RefNames.shard(u);
-
- List<String> expectedStates =
- Lists.newArrayList(
- "repo:refs/users/" + us + "/edit-" + c + "/1",
- "All-Users:refs/starred-changes/" + cs + "/" + u);
- if (notesMigration.readChanges()) {
- expectedStates.add("repo:refs/changes/" + cs + "/meta");
- expectedStates.add("repo:refs/changes/" + cs + "/robot-comments");
- expectedStates.add("All-Users:refs/draft-comments/" + cs + "/" + u);
- }
- assertThat(
- cd.getRefStates()
- .stream()
- .map(String::new)
- // Omit SHA-1, we're just concerned with the project/ref names.
- .map(s -> s.substring(0, s.lastIndexOf(':')))
- .collect(toList()))
- .containsExactlyElementsIn(expectedStates);
-
- List<String> expectedPatterns = Lists.newArrayList("repo:refs/users/*/edit-" + c + "/*");
- expectedPatterns.add("All-Users:refs/starred-changes/" + cs + "/*");
- if (notesMigration.readChanges()) {
- expectedPatterns.add("All-Users:refs/draft-comments/" + cs + "/*");
- }
- assertThat(cd.getRefStatePatterns().stream().map(String::new).collect(toList()))
- .containsExactlyElementsIn(expectedPatterns);
- }
-
- @Test
public void watched() throws Exception {
TestRepository<Repo> repo = createProject("repo");
ChangeInserter ins1 = newChangeWithStatus(repo, Change.Status.NEW);
