commit 5394a6eba245ee67bfe0d01819904685548e8c31
author Edwin Kempin <ekempin@google.com> Wed Dec 12 13:59:50 2018 +0100
committer Dave Borowitz <dborowitz@google.com> Fri Dec 14 10:14:02 2018 -0800
tree 2217129070cfa11212235c641721038e640fbc0c
parent f60f7d5ebdf2306b4c088b5da4a6be4b9028fd79

Remove special logic to make NoteDb migration tests pass

These tests are gone.

Change-Id: I9db34cd68c7a3ed607630771efc09170aa5b6bd7
Signed-off-by: Edwin Kempin <ekempin@google.com>

java/com/google/gerrit/server/schema/NoteDbSchemaUpdater.java

diff --git a/java/com/google/gerrit/server/schema/NoteDbSchemaUpdater.java b/java/com/google/gerrit/server/schema/NoteDbSchemaUpdater.java
index 73deb3e..73fab13 100644
--- a/java/com/google/gerrit/server/schema/NoteDbSchemaUpdater.java
+++ b/java/com/google/gerrit/server/schema/NoteDbSchemaUpdater.java
@@ -28,7 +28,6 @@
 import com.google.gerrit.server.git.GitRepositoryManager;
 import com.google.gerrit.server.notedb.NoteDbChangeState.PrimaryStorage;
 import com.google.gerrit.server.notedb.NoteDbSchemaVersionManager;
-import com.google.gerrit.server.notedb.NotesMigration;
 import com.google.gwtorm.server.OrmException;
 import com.google.inject.Inject;
 import java.io.IOException;
@@ -44,7 +43,6 @@
   private final AllUsersName allUsersName;
   private final GitRepositoryManager repoManager;
   private final SchemaCreator schemaCreator;
-  private final NotesMigration notesMigration;
   private final NoteDbSchemaVersionManager versionManager;
   private final NoteDbSchemaVersion.Arguments args;
   private final ImmutableSortedMap<Integer, Class<? extends NoteDbSchemaVersion>> schemaVersions;
@@ -56,7 +54,6 @@
       AllProjectsName allProjectsName,
       GitRepositoryManager repoManager,
       SchemaCreator schemaCreator,
-      NotesMigration notesMigration,
       NoteDbSchemaVersionManager versionManager,
       NoteDbSchemaVersion.Arguments args) {
     this(
@@ -65,7 +62,6 @@
         allUsersName,
         repoManager,
         schemaCreator,
-        notesMigration,
         versionManager,
         args,
         NoteDbSchemaVersions.ALL);
@@ -77,7 +73,6 @@
       AllUsersName allUsersName,
       GitRepositoryManager repoManager,
       SchemaCreator schemaCreator,
-      NotesMigration notesMigration,
       NoteDbSchemaVersionManager versionManager,
       NoteDbSchemaVersion.Arguments args,
       ImmutableSortedMap<Integer, Class<? extends NoteDbSchemaVersion>> schemaVersions) {
@@ -86,19 +81,12 @@
     this.allUsersName = allUsersName;
     this.repoManager = repoManager;
     this.schemaCreator = schemaCreator;
-    this.notesMigration = notesMigration;
     this.versionManager = versionManager;
     this.args = args;
     this.schemaVersions = schemaVersions;
   }
 
   public void update(UpdateUI ui) throws OrmException {
-    if (!notesMigration.commitChangeWrites()) {
-      // TODO(dborowitz): Only necessary to make migration tests pass; remove when NoteDb is the
-      // only option.
-      return;
-    }
-
     ensureSchemaCreated();
 
     int currentVersion = versionManager.read();

java/com/google/gerrit/server/schema/NoteDbSchemaVersionCheck.java

diff --git a/java/com/google/gerrit/server/schema/NoteDbSchemaVersionCheck.java b/java/com/google/gerrit/server/schema/NoteDbSchemaVersionCheck.java
index 9e26ee9..be9aacd 100644
--- a/java/com/google/gerrit/server/schema/NoteDbSchemaVersionCheck.java
+++ b/java/com/google/gerrit/server/schema/NoteDbSchemaVersionCheck.java
@@ -18,7 +18,6 @@
 import com.google.gerrit.lifecycle.LifecycleModule;
 import com.google.gerrit.server.config.SitePaths;
 import com.google.gerrit.server.notedb.NoteDbSchemaVersionManager;
-import com.google.gerrit.server.notedb.NotesMigration;
 import com.google.gwtorm.server.OrmException;
 import com.google.inject.Inject;
 import com.google.inject.Module;
@@ -34,27 +33,17 @@
     };
   }
 
-  private final NotesMigration notesMigration;
   private final NoteDbSchemaVersionManager versionManager;
   private final SitePaths sitePaths;
 
   @Inject
-  NoteDbSchemaVersionCheck(
-      NotesMigration notesMigration,
-      NoteDbSchemaVersionManager versionManager,
-      SitePaths sitePaths) {
-    this.notesMigration = notesMigration;
+  NoteDbSchemaVersionCheck(NoteDbSchemaVersionManager versionManager, SitePaths sitePaths) {
     this.versionManager = versionManager;
     this.sitePaths = sitePaths;
   }
 
   @Override
   public void start() {
-    if (!notesMigration.commitChangeWrites()) {
-      // TODO(dborowitz): Only necessary to make migration tests pass; remove when NoteDb is the
-      // only option.
-      return;
-    }
     try {
       int current = versionManager.read();
       if (current == 0) {

javatests/com/google/gerrit/server/schema/NoteDbSchemaUpdaterTest.java

diff --git a/javatests/com/google/gerrit/server/schema/NoteDbSchemaUpdaterTest.java b/javatests/com/google/gerrit/server/schema/NoteDbSchemaUpdaterTest.java
index eeefd75..6117a4a 100644
--- a/javatests/com/google/gerrit/server/schema/NoteDbSchemaUpdaterTest.java
+++ b/javatests/com/google/gerrit/server/schema/NoteDbSchemaUpdaterTest.java
@@ -30,7 +30,6 @@
 import com.google.gerrit.server.git.GitRepositoryManager;
 import com.google.gerrit.server.notedb.IntBlob;
 import com.google.gerrit.server.notedb.NoteDbSchemaVersionManager;
-import com.google.gerrit.server.notedb.NotesMigration;
 import com.google.gerrit.server.notedb.RepoSequence;
 import com.google.gerrit.testing.GerritBaseTests;
 import com.google.gerrit.testing.InMemoryRepositoryManager;
@@ -123,7 +122,6 @@
               allUsersName,
               repoManager,
               schemaCreator,
-              new NotesMigration(),
               versionManager,
               args,
               ImmutableSortedMap.of(10, TestSchema_10.class, 11, TestSchema_11.class));