diff options
3 files changed, 3 insertions, 2 deletions
diff --git a/java/com/google/gerrit/index/query/AndSource.java b/java/com/google/gerrit/index/query/AndSource.java index f7feaa0d35..ebd115bcf4 100644 --- a/java/com/google/gerrit/index/query/AndSource.java +++ b/java/com/google/gerrit/index/query/AndSource.java @@ -62,7 +62,7 @@ public class AndSource<T> extends AndPredicate<T> implements DataSource<T> { int minCardinality = Integer.MAX_VALUE; for (Predicate<T> p : getChildren()) { if (p instanceof DataSource) { - DataSource<T> source = (DataSource<T>) p; + DataSource<?> source = (DataSource<?>) p; int cardinality = source.getCardinality(); c = Math.min(c, source.getCardinality()); diff --git a/java/com/google/gerrit/server/query/change/ChangeStatusPredicate.java b/java/com/google/gerrit/server/query/change/ChangeStatusPredicate.java index ef902b58e7..47445f6e4b 100644 --- a/java/com/google/gerrit/server/query/change/ChangeStatusPredicate.java +++ b/java/com/google/gerrit/server/query/change/ChangeStatusPredicate.java @@ -155,6 +155,7 @@ public final class ChangeStatusPredicate extends ChangeIndexPredicate implements return 50_000; case ABANDONED: return 50_000; + case NEW: default: return 2000; } diff --git a/javatests/com/google/gerrit/server/index/change/ChangeIndexRewriterTest.java b/javatests/com/google/gerrit/server/index/change/ChangeIndexRewriterTest.java index 0a4f31cb0f..8c25edf956 100644 --- a/javatests/com/google/gerrit/server/index/change/ChangeIndexRewriterTest.java +++ b/javatests/com/google/gerrit/server/index/change/ChangeIndexRewriterTest.java @@ -130,7 +130,7 @@ public class ChangeIndexRewriterTest { assertThat(out.getChild(0)).isEqualTo(query(firstIndexedSubQuery)); assertThat(out.getChild(1).getClass()).isSameInstanceAs(OrPredicate.class); - OrPredicate indexedSubTree = (OrPredicate) out.getChild(1); + OrPredicate<ChangeData> indexedSubTree = (OrPredicate<ChangeData>) out.getChild(1); Predicate<ChangeData> secondIndexedSubQuery = parse("foo:a OR file:b"); assertThat(indexedSubTree.getChildren()) |