opendev/gerrit
Code Issues Proposed changes

LuceneVersionManager: Pass "changes_" prefix as argument

Browse Source 
Change-Id: I9a3feb4846781710eaaa6b60eb09697d78809202
This commit is contained in:
Dave Borowitz
2016-03-16 12:11:38 +01:00
parent 063e852ebc
commit ff5a38a390
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneChangeIndex.java
View File

@@ -16,6 +16,7 @@ package com.google.gerrit.lucene;
import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.collect.Iterables.getOnlyElement; import static com.google.common.collect.Iterables.getOnlyElement;
import static com.google.gerrit.lucene.LuceneVersionManager.CHANGES_PREFIX;
import static com.google.gerrit.server.git.QueueProvider.QueueType.INTERACTIVE; import static com.google.gerrit.server.git.QueueProvider.QueueType.INTERACTIVE;
import static com.google.gerrit.server.index.change.ChangeField.CHANGE; import static com.google.gerrit.server.index.change.ChangeField.CHANGE;
import static com.google.gerrit.server.index.change.ChangeField.LEGACY_ID; import static com.google.gerrit.server.index.change.ChangeField.LEGACY_ID;
@@ -187,7 +188,7 @@ public class LuceneChangeIndex implements ChangeIndex {
closedIndex = new SubIndex(new RAMDirectory(), "ramClosed", closedConfig, closedIndex = new SubIndex(new RAMDirectory(), "ramClosed", closedConfig,
searcherFactory); searcherFactory);
} else { } else {
Path dir = LuceneVersionManager.getDir(sitePaths, schema); Path dir = LuceneVersionManager.getDir(sitePaths, CHANGES_PREFIX, schema);
openIndex = new SubIndex(dir.resolve(CHANGES_OPEN), openConfig, openIndex = new SubIndex(dir.resolve(CHANGES_OPEN), openConfig,
searcherFactory); searcherFactory);
closedIndex = new SubIndex(dir.resolve(CHANGES_CLOSED), closedConfig, closedIndex = new SubIndex(dir.resolve(CHANGES_CLOSED), closedConfig,

8
gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneVersionManager.java
View File

@@ -50,7 +50,7 @@ public class LuceneVersionManager implements LifecycleListener {
private static final Logger log = LoggerFactory private static final Logger log = LoggerFactory
.getLogger(LuceneVersionManager.class); .getLogger(LuceneVersionManager.class);
private static final String CHANGES_PREFIX = "changes_"; static final String CHANGES_PREFIX = "changes_";
private static class Version { private static class Version {
private final Schema<ChangeData> schema; private final Schema<ChangeData> schema;
@@ -68,9 +68,9 @@ public class LuceneVersionManager implements LifecycleListener {
} }
} }
static Path getDir(SitePaths sitePaths, Schema<ChangeData> schema) { static Path getDir(SitePaths sitePaths, String prefix, Schema<?> schema) {
return sitePaths.index_dir.resolve(String.format("%s%04d", return sitePaths.index_dir.resolve(String.format("%s%04d",
CHANGES_PREFIX, schema.getVersion())); prefix, schema.getVersion()));
} }
static FileBasedConfig loadGerritIndexConfig(SitePaths sitePaths) static FileBasedConfig loadGerritIndexConfig(SitePaths sitePaths)
@@ -224,7 +224,7 @@ public class LuceneVersionManager implements LifecycleListener {
private TreeMap<Integer, Version> scanVersions(Config cfg) { private TreeMap<Integer, Version> scanVersions(Config cfg) {
TreeMap<Integer, Version> versions = Maps.newTreeMap(); TreeMap<Integer, Version> versions = Maps.newTreeMap();
for (Schema<ChangeData> schema : ChangeSchemas.ALL.values()) { for (Schema<ChangeData> schema : ChangeSchemas.ALL.values()) {
Path p = getDir(sitePaths, schema); Path p = getDir(sitePaths, CHANGES_PREFIX, schema);
boolean isDir = Files.isDirectory(p); boolean isDir = Files.isDirectory(p);
if (Files.exists(p) && !isDir) { if (Files.exists(p) && !isDir) {
log.warn("Not a directory: %s", p.toAbsolutePath()); log.warn("Not a directory: %s", p.toAbsolutePath());