opendev/gerrit
Code Issues Proposed changes

FieldType: Remove unnecessary KEYWORD type

Browse Source 
Elasticsearch 5 split string type in two: keyword (also known as exact
in gerrit index type system) and text (also known as full text in gerrit
index type system).  During migration from Elasticsearch 2 to 5 exact
type was erroneously split in exact and keyword types, that are the same.

This reverts commit 506125e71a.
This reverts commit 09fdc3eaad.

Change-Id: I788e4d06d490687508c4bfd1703037a268fe31a5
This commit is contained in:
David Ostrovsky
2018-06-05 20:38:34 +02:00
committed by David Pursehouse
parent 852e5ac7ac
commit 0f6c9bd34c
8 changed files with 12 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gerrit-lucene/src/main/java/com/google/gerrit/lucene/AbstractLuceneIndex.java
View File

@@ -337,7 +337,7 @@ public abstract class AbstractLuceneIndex<K, V> implements Index<K, V> {
for (Object value : values.getValues()) {
doc.add(new LongField(name, ((Timestamp) value).getTime(), store));
}
} else if (type == FieldType.KEYWORD || type == FieldType.EXACT || type == FieldType.PREFIX) {
} else if (type == FieldType.EXACT || type == FieldType.PREFIX) {
for (Object value : values.getValues()) {
doc.add(new StringField(name, (String) value, store));
}

2
gerrit-lucene/src/main/java/com/google/gerrit/lucene/QueryBuilder.java
View File

@@ -148,7 +148,7 @@ public class QueryBuilder<V> {
return intRangeQuery(p);
} else if (type == FieldType.TIMESTAMP) {
return timestampQuery(p);
} else if (type == FieldType.EXACT || type == FieldType.KEYWORD) {
} else if (type == FieldType.EXACT) {
return exactQuery(p);
} else if (type == FieldType.PREFIX) {
return prefixQuery(p);