opendev/gerrit
Code Issues Proposed changes

NotesMigration: Remove readChangeSequence() method

Browse Source 
Change-Id: I9007cfe083e80b152e83e0bd2c865d2ca9306957
This commit is contained in:
Dave Borowitz
2018-12-12 19:26:18 -08:00
parent 5dd71b5696
commit 6fa0976620
3 changed files with 1 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
java/com/google/gerrit/server/notedb/NotesMigration.java
View File

@@ -45,16 +45,6 @@ public class NotesMigration {
return true; return true;
} }
/**
* Read sequential change ID numbers from NoteDb.
*
* <p>If true, change IDs are read from {@code refs/sequences/changes} in All-Projects. If false,
* change IDs are read from ReviewDb's native sequences.
*/
public final boolean readChangeSequence() {
return true;
}
/** /**
* Disable ReviewDb access for changes. * Disable ReviewDb access for changes.
* *

3
java/com/google/gerrit/server/schema/AllProjectsCreator.java
View File

@@ -264,8 +264,7 @@ public class AllProjectsCreator {
} }
private void initSequences(Repository git, BatchRefUpdate bru) throws IOException { private void initSequences(Repository git, BatchRefUpdate bru) throws IOException {
if (notesMigration.readChangeSequence() if (git.exactRef(REFS_SEQUENCES + Sequences.NAME_CHANGES) == null) {
&& git.exactRef(REFS_SEQUENCES + Sequences.NAME_CHANGES) == null) {
// Can't easily reuse the inserter from MetaDataUpdate, but this shouldn't slow down site // Can't easily reuse the inserter from MetaDataUpdate, but this shouldn't slow down site
// initialization unduly. // initialization unduly.
try (ObjectInserter ins = git.newObjectInserter()) { try (ObjectInserter ins = git.newObjectInserter()) {

1
javatests/com/google/gerrit/acceptance/git/RefAdvertisementIT.java
View File

@@ -368,7 +368,6 @@ public class RefAdvertisementIT extends AbstractDaemonTest {
@Test @Test
public void uploadPackSequencesWithAccessDatabase() throws Exception { public void uploadPackSequencesWithAccessDatabase() throws Exception {
assume().that(notesMigration.readChangeSequence()).isTrue();
try (Repository repo = repoManager.openRepository(allProjects)) { try (Repository repo = repoManager.openRepository(allProjects)) {
assertRefs(repo, newFilter(allProjects, user), true); assertRefs(repo, newFilter(allProjects, user), true);