Use dummy index module in RebuildNotedb program RebuildNotedb doesn't need the secondary index. Install the dummy index module instead of Lucene or Solr. This will slightly reduce the work needed to add a new secondary index type as we no longer need to also add it here. Change-Id: Ia9222ef0ea13d2a881dcbc31bf56b4def1fd7603
diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/RebuildNotedb.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/RebuildNotedb.java index afbb918..5532abe 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/RebuildNotedb.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/RebuildNotedb.java
@@ -28,7 +28,6 @@ import com.google.gerrit.extensions.events.GitReferenceUpdatedListener; import com.google.gerrit.extensions.registration.DynamicSet; import com.google.gerrit.lifecycle.LifecycleManager; -import com.google.gerrit.lucene.LuceneIndexModule; import com.google.gerrit.pgm.util.BatchProgramModule; import com.google.gerrit.pgm.util.SiteProgram; import com.google.gerrit.pgm.util.ThreadLimiter; @@ -41,18 +40,16 @@ import com.google.gerrit.server.git.MultiProgressMonitor; import com.google.gerrit.server.git.MultiProgressMonitor.Task; import com.google.gerrit.server.git.WorkQueue; -import com.google.gerrit.server.index.IndexModule; +import com.google.gerrit.server.index.DummyIndexModule; import com.google.gerrit.server.index.ReindexAfterUpdate; import com.google.gerrit.server.notedb.ChangeRebuilder; import com.google.gerrit.server.notedb.NoteDbModule; import com.google.gerrit.server.notedb.NotesMigration; -import com.google.gerrit.solr.SolrIndexModule; import com.google.gwtorm.server.OrmException; import com.google.gwtorm.server.SchemaFactory; import com.google.inject.AbstractModule; import com.google.inject.Injector; import com.google.inject.Key; -import com.google.inject.Module; import com.google.inject.TypeLiteral; import org.eclipse.jgit.lib.BatchRefUpdate; @@ -214,18 +211,7 @@ install(new NoteDbModule()); DynamicSet.bind(binder(), GitReferenceUpdatedListener.class).to( ReindexAfterUpdate.class); - Module changeIndexModule; - switch (IndexModule.getIndexType(dbInjector)) { - case LUCENE: - changeIndexModule = new LuceneIndexModule(null, threads, null); - break; - case SOLR: - changeIndexModule = new SolrIndexModule(false, threads, null); - break; - default: - throw new IllegalStateException("unsupported index.type"); - } - install(changeIndexModule); + install(new DummyIndexModule()); } }); }