Rename LEGACY_ID2 field to LEGACY_ID
There is no longer a LEGACY_ID, so we no longer have the confusing
situation where we have a legacy legacy-ID field.
Change-Id: I0ff4942a3d3f3453c354cbdc1ab3eb4fb056f257
diff --git a/gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneChangeIndex.java b/gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneChangeIndex.java
index d3e6628..de860f1 100644
--- a/gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneChangeIndex.java
+++ b/gerrit-lucene/src/main/java/com/google/gerrit/lucene/LuceneChangeIndex.java
@@ -17,7 +17,7 @@
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.collect.Iterables.getOnlyElement;
import static com.google.gerrit.server.git.QueueProvider.QueueType.INTERACTIVE;
-import static com.google.gerrit.server.index.ChangeField.LEGACY_ID2;
+import static com.google.gerrit.server.index.ChangeField.LEGACY_ID;
import static com.google.gerrit.server.index.IndexRewriter.CLOSED_STATUSES;
import static com.google.gerrit.server.index.IndexRewriter.OPEN_STATUSES;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
@@ -134,7 +134,7 @@
private static final String UPDATED_SORT_FIELD =
sortFieldName(ChangeField.UPDATED);
private static final String ID_SORT_FIELD =
- sortFieldName(ChangeField.LEGACY_ID2);
+ sortFieldName(ChangeField.LEGACY_ID);
private static final Map<String, String> CUSTOM_CHAR_MAPPING = ImmutableMap.of(
"_", " ", ".", " ");
@@ -388,7 +388,7 @@
List<ChangeData> result =
Lists.newArrayListWithCapacity(docs.scoreDocs.length);
Set<String> fields = fields(opts);
- String idFieldName = LEGACY_ID2.getName();
+ String idFieldName = LEGACY_ID.getName();
for (int i = opts.start(); i < docs.scoreDocs.length; i++) {
ScoreDoc sd = docs.scoreDocs[i];
Document doc = searchers[sd.shardIndex].doc(sd.doc, fields);
@@ -429,13 +429,13 @@
}
private Set<String> fields(QueryOptions opts) {
- if (schemaHasRequestedField(ChangeField.LEGACY_ID2, opts.fields())
+ if (schemaHasRequestedField(ChangeField.LEGACY_ID, opts.fields())
|| schemaHasRequestedField(ChangeField.CHANGE, opts.fields())) {
return opts.fields();
}
// Request the numeric ID field even if the caller did not request it,
// otherwise we can't actually construct a ChangeData.
- return Sets.union(opts.fields(), ImmutableSet.of(LEGACY_ID2.getName()));
+ return Sets.union(opts.fields(), ImmutableSet.of(LEGACY_ID.getName()));
}
private boolean schemaHasRequestedField(FieldDef<ChangeData, ?> field,
@@ -556,7 +556,7 @@
FieldDef<ChangeData, ?> f = values.getField();
// Add separate DocValues fields for those fields needed for sorting.
- if (f == ChangeField.LEGACY_ID2) {
+ if (f == ChangeField.LEGACY_ID) {
int v = (Integer) getOnlyElement(values.getValues());
doc.add(new NumericDocValuesField(sortFieldName(f), v));
} else if (f == ChangeField.UPDATED) {
diff --git a/gerrit-lucene/src/main/java/com/google/gerrit/lucene/QueryBuilder.java b/gerrit-lucene/src/main/java/com/google/gerrit/lucene/QueryBuilder.java
index 43c681f..7f26d83 100644
--- a/gerrit-lucene/src/main/java/com/google/gerrit/lucene/QueryBuilder.java
+++ b/gerrit-lucene/src/main/java/com/google/gerrit/lucene/QueryBuilder.java
@@ -14,7 +14,7 @@
package com.google.gerrit.lucene;
-import static com.google.gerrit.server.index.ChangeField.LEGACY_ID2;
+import static com.google.gerrit.server.index.ChangeField.LEGACY_ID;
import static org.apache.lucene.search.BooleanClause.Occur.MUST;
import static org.apache.lucene.search.BooleanClause.Occur.MUST_NOT;
import static org.apache.lucene.search.BooleanClause.Occur.SHOULD;
@@ -51,11 +51,11 @@
public class QueryBuilder {
public static Term idTerm(ChangeData cd) {
- return intTerm(LEGACY_ID2.getName(), cd.getId().get());
+ return intTerm(LEGACY_ID.getName(), cd.getId().get());
}
public static Term idTerm(Change.Id id) {
- return intTerm(LEGACY_ID2.getName(), id.get());
+ return intTerm(LEGACY_ID.getName(), id.get());
}
private final org.apache.lucene.util.QueryBuilder queryBuilder;
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/ChangeField.java b/gerrit-server/src/main/java/com/google/gerrit/server/index/ChangeField.java
index 5abb78e..0234dc2 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/index/ChangeField.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/index/ChangeField.java
@@ -66,7 +66,7 @@
*/
public class ChangeField {
/** Legacy change ID. */
- public static final FieldDef<ChangeData, Integer> LEGACY_ID2 =
+ public static final FieldDef<ChangeData, Integer> LEGACY_ID =
new FieldDef.Single<ChangeData, Integer>("legacy_id",
FieldType.INTEGER, true) {
@Override
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/index/ChangeSchemas.java b/gerrit-server/src/main/java/com/google/gerrit/server/index/ChangeSchemas.java
index 4f19f2a..cb257c6 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/index/ChangeSchemas.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/index/ChangeSchemas.java
@@ -31,7 +31,7 @@
/** Secondary index schemas for changes. */
public class ChangeSchemas {
static final Schema<ChangeData> V25 = schema(
- ChangeField.LEGACY_ID2,
+ ChangeField.LEGACY_ID,
ChangeField.ID,
ChangeField.STATUS,
ChangeField.PROJECT,
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/LegacyChangeIdPredicate.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/LegacyChangeIdPredicate.java
index c4fd04e..f4a1550 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/LegacyChangeIdPredicate.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/LegacyChangeIdPredicate.java
@@ -14,7 +14,7 @@
package com.google.gerrit.server.query.change;
-import static com.google.gerrit.server.index.ChangeField.LEGACY_ID2;
+import static com.google.gerrit.server.index.ChangeField.LEGACY_ID;
import com.google.gerrit.reviewdb.client.Change;
import com.google.gerrit.server.index.IndexPredicate;
@@ -24,7 +24,7 @@
private final Change.Id id;
LegacyChangeIdPredicate(Change.Id id) {
- super(LEGACY_ID2, ChangeQueryBuilder.FIELD_CHANGE, id.toString());
+ super(LEGACY_ID, ChangeQueryBuilder.FIELD_CHANGE, id.toString());
this.id = id;
}
