opendev/gerrit
Code Issues Proposed changes

NoteDbSchemaUpdater: Inline NoteDb config option names

Browse Source 
This check is going to persist through 3.0, so it will outlive these
constants in the NotesMigration class.

Change-Id: I954a8c289c63dc16b62cbc412a5aa578ad7d6bd0
This commit is contained in:
Dave Borowitz
2018-12-12 14:34:19 -08:00
parent 1724144c31
commit 7ebe906eaa
1 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
java/com/google/gerrit/server/schema/NoteDbSchemaUpdater.java
View File

@@ -15,12 +15,6 @@
package com.google.gerrit.server.schema; package com.google.gerrit.server.schema;
import static com.google.common.collect.ImmutableList.toImmutableList; import static com.google.common.collect.ImmutableList.toImmutableList;
import static com.google.gerrit.server.notedb.NoteDbTable.CHANGES;
import static com.google.gerrit.server.notedb.NotesMigration.DISABLE_REVIEW_DB;
import static com.google.gerrit.server.notedb.NotesMigration.PRIMARY_STORAGE;
import static com.google.gerrit.server.notedb.NotesMigration.READ;
import static com.google.gerrit.server.notedb.NotesMigration.SECTION_NOTE_DB;
import static com.google.gerrit.server.notedb.NotesMigration.WRITE;
import com.google.common.annotations.VisibleForTesting; import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
@@ -144,11 +138,11 @@ public class NoteDbSchemaUpdater {
// * Completed the change migration to NoteDB. // * Completed the change migration to NoteDB.
// * Ran schema upgrades from a 2.16 final release. // * Ran schema upgrades from a 2.16 final release.
if (!cfg.getBoolean(SECTION_NOTE_DB, CHANGES.key(), WRITE, false) if (!cfg.getBoolean("noteDb", "changes", "write", false)
|| !cfg.getBoolean(SECTION_NOTE_DB, CHANGES.key(), READ, false) || !cfg.getBoolean("noteDb", "changes", "read", false)
|| cfg.getEnum(SECTION_NOTE_DB, CHANGES.key(), PRIMARY_STORAGE, PrimaryStorage.REVIEW_DB) || cfg.getEnum("noteDb", "changes", "primaryStorage", PrimaryStorage.REVIEW_DB)
!= PrimaryStorage.NOTE_DB != PrimaryStorage.NOTE_DB
|| !cfg.getBoolean(SECTION_NOTE_DB, CHANGES.key(), DISABLE_REVIEW_DB, false)) { || !cfg.getBoolean("noteDb", "changes", "disableReviewDb", false)) {
throw new OrmException( throw new OrmException(
"You appear to be upgrading from a 2.x site, but the NoteDb change migration was" "You appear to be upgrading from a 2.x site, but the NoteDb change migration was"
+ " not completed. See documentation:\n" + " not completed. See documentation:\n"