opendev/gerrit
Code Issues Proposed changes

Switch to Lucene 4.6 in code

Browse Source 
This change introduces new index schema version.
Change-Id: Ib05e2769692eb61e9adc2d7053140cad42ee5781
This commit is contained in:
David Ostrovsky
2013-11-26 09:01:19 +01:00
committed by Dave Borowitz
parent 20d672e49f
commit 71f734b5c1
4 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -118,12 +118,16 @@ public class LuceneChangeIndex implements ChangeIndex {
ImmutableMap.builder();
@SuppressWarnings("deprecation")
Version lucene43 = Version.LUCENE_43;
@SuppressWarnings("deprecation")
Version lucene44 = Version.LUCENE_44;
for (Map.Entry<Integer, Schema<ChangeData>> e
: ChangeSchemas.ALL.entrySet()) {
if (e.getKey() <= 3) {
versions.put(e.getValue(), lucene43);
} else if (e.getKey() <= 5) {
versions.put(e.getValue(), lucene44);
} else {
versions.put(e.getValue(), Version.LUCENE_44);
versions.put(e.getValue(), Version.LUCENE_46);
}
}
LUCENE_VERSIONS = versions.build();

2
gerrit-server/src/main/java/com/google/gerrit/server/documentation/QueryDocumentationExecutor.java
View File

@@ -45,7 +45,7 @@ public class QueryDocumentationExecutor {
LoggerFactory.getLogger(QueryDocumentationExecutor.class);
private static final String INDEX_PATH = "index.zip";
private static final Version LUCENE_VERSION = Version.LUCENE_44;
private static final Version LUCENE_VERSION = Version.LUCENE_46;
private IndexSearcher searcher;
private QueryParser parser;

3
gerrit-server/src/main/java/com/google/gerrit/server/index/ChangeSchemas.java
View File

@@ -118,6 +118,9 @@ public class ChangeSchemas {
ChangeField.APPROVAL,
ChangeField.MERGEABLE);
// For upgrade to Lucene 4.6.0 index format only.
static final Schema<ChangeData> V6 = release(V5.getFields().values());
private static Schema<ChangeData> release(Collection<FieldDef<ChangeData, ?>> fields) {
return new Schema<ChangeData>(true, fields);
}

2
lib/asciidoctor/java/DocIndexer.java
View File

@@ -42,7 +42,7 @@ import java.util.List;
import java.util.zip.ZipOutputStream;
public class DocIndexer {
private static final Version LUCENE_VERSION = Version.LUCENE_44;
private static final Version LUCENE_VERSION = Version.LUCENE_46;
@Option(name = "-z", usage = "output zip file")
private String zipFile;