opendev/gerrit
Code Issues Proposed changes

Notedb: Fully implement deleting draft changes

Browse Source 
Rather than try to work within the strictures of VersionedMetaData,
dedicate a new class ChangeDelete to do this with a simple series of
ref updates.

Although in theory we could do what we do for patch sets and add a
DELETED state to changes, that would be too much of a behavior change
from the existing behavior. We had to do it in the case of patch sets
to avoid rewriting history, but we sidestep that issue here because
deleting refs is not really rewriting history.

Change-Id: Ib200aeea160921dbc9181e0341f3542f05651577
This commit is contained in:
Dave Borowitz
2016-01-28 11:55:11 -05:00
committed by Edwin Kempin
parent 39782443e9
commit b3d7f7328e
6 changed files with 194 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/DeleteDraftPatchSetIT.java
View File

@@ -22,19 +22,30 @@ import com.google.gerrit.acceptance.PushOneCommit;
import com.google.gerrit.acceptance.PushOneCommit.Result;
import com.google.gerrit.acceptance.RestResponse;
import com.google.gerrit.acceptance.RestSession;
import com.google.gerrit.acceptance.TestAccount;
import com.google.gerrit.extensions.api.changes.DraftInput;
import com.google.gerrit.extensions.client.ChangeStatus;
import com.google.gerrit.extensions.common.ChangeInfo;
import com.google.gerrit.extensions.restapi.ResourceNotFoundException;
import com.google.gerrit.reviewdb.client.Change;
import com.google.gerrit.reviewdb.client.PatchSet;
import com.google.gerrit.reviewdb.client.RefNames;
import com.google.gerrit.server.config.AllUsersName;
import com.google.gerrit.server.query.change.ChangeData;
import com.google.gwtorm.server.OrmException;
import com.google.inject.Inject;
import org.eclipse.jgit.lib.Ref;
import org.eclipse.jgit.lib.Repository;
import org.junit.Test;
import java.io.IOException;
public class DeleteDraftPatchSetIT extends AbstractDaemonTest {
@Inject
private AllUsersName allUsers;
@Test
public void deletePatchSetNotDraft() throws Exception {
String changeId = createChange().getChangeId();
@@ -66,6 +77,15 @@ public class DeleteDraftPatchSetIT extends AbstractDaemonTest {
String changeId = createDraftChangeWith2PS();
PatchSet ps = getCurrentPatchSet(changeId);
DraftInput din = new DraftInput();
din.path = "a.txt";
din.message = "comment on a.txt";
gApi.changes().id(changeId).current().createDraft(din);
if (notesMigration.writeChanges()) {
assertThat(getDraftRef(admin, ps.getId().getParentKey())).isNotNull();
}
ChangeData cd = getChange(changeId);
assertThat(cd.patchSets()).hasSize(2);
assertThat(cd.change().currentPatchSetId().get()).isEqualTo(2);
@@ -79,6 +99,20 @@ public class DeleteDraftPatchSetIT extends AbstractDaemonTest {
ps = getCurrentPatchSet(changeId);
deletePatchSet(changeId, ps, adminSession).assertNoContent();
assertThat(queryProvider.get().byKeyPrefix(changeId)).isEmpty();
if (notesMigration.writeChanges()) {
assertThat(getDraftRef(admin, ps.getId().getParentKey())).isNull();
}
exception.expect(ResourceNotFoundException.class);
gApi.changes().id(ps.getId().getParentKey().get());
}
private Ref getDraftRef(TestAccount account, Change.Id changeId)
throws Exception {
try (Repository repo = repoManager.openMetadataRepository(allUsers)) {
return repo.exactRef(RefNames.refsDraftComments(account.id, changeId));
}
}
private String createDraftChangeWith2PS() throws Exception {