Skip to content

Commit 319f53b

Browse files
talevytalevy
committed
remove handling of 6.1.x versions
relates to refactoring initiative elastic#41164.
1 parent 70eb812 commit 319f53b

File tree

43 files changed

+98
-322
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+98
-322
lines changed

‎modules/percolator/src/main/java/org/elasticsearch/percolator/PercolateQueryBuilder.java

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -293,17 +293,9 @@ protected void doWriteTo(StreamOutput out) throws IOException {
293293
} else {
294294
out.writeBoolean(false);
295295
}
296-
if (out.getVersion().onOrAfter(Version.V_6_1_0)) {
297-
out.writeVInt(documents.size());
298-
for (BytesReference document : documents) {
299-
out.writeBytesReference(document);
300-
}
301-
} else {
302-
if (documents.size() > 1) {
303-
throw new IllegalArgumentException("Nodes prior to 6.1.0 cannot accept multiple documents");
304-
}
305-
BytesReference doc = documents.isEmpty() ? null : documents.iterator().next();
306-
out.writeOptionalBytesReference(doc);
296+
out.writeVInt(documents.size());
297+
for (BytesReference document : documents) {
298+
out.writeBytesReference(document);
307299
}
308300
if (documents.isEmpty() == false) {
309301
out.writeEnum(documentXContentType);

‎modules/percolator/src/main/java/org/elasticsearch/percolator/PercolatorFieldMapper.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ Query percolateQuery(String name, PercolateQuery.QueryStore queryStore, List<Byt
261261
}
262262
Query filter = null;
263263
if (excludeNestedDocuments) {
264-
filter = Queries.newNonNestedFilter(indexVersion);
264+
filter = Queries.newNonNestedFilter();
265265
}
266266
return new PercolateQuery(name, queryStore, documents, candidateQuery, searcher, filter, verifiedMatchesQuery);
267267
}
@@ -285,7 +285,7 @@ Tuple<BooleanQuery, Boolean> createCandidateQuery(IndexReader indexReader, Versi
285285
}
286286

287287
BooleanQuery.Builder candidateQuery = new BooleanQuery.Builder();
288-
if (canUseMinimumShouldMatchField && indexVersion.onOrAfter(Version.V_6_1_0)) {
288+
if (canUseMinimumShouldMatchField) {
289289
LongValuesSource valuesSource = LongValuesSource.fromIntField(minimumShouldMatchField.name());
290290
for (BytesRef extractedTerm : extractedTerms) {
291291
subQueries.add(new TermQuery(new Term(queryTermsField.name(), extractedTerm)));
@@ -471,9 +471,7 @@ void processQuery(Query query, ParseContext context) {
471471
for (IndexableField field : fields) {
472472
context.doc().add(field);
473473
}
474-
if (indexVersionCreated.onOrAfter(Version.V_6_1_0)) {
475-
doc.add(new NumericDocValuesField(minimumShouldMatchFieldMapper.name(), result.minimumShouldMatch));
476-
}
474+
doc.add(new NumericDocValuesField(minimumShouldMatchFieldMapper.name(), result.minimumShouldMatch));
477475
}
478476

479477
static Query parseQuery(QueryShardContext context, boolean mapUnmappedFieldsAsString, XContentParser parser) throws IOException {

‎modules/percolator/src/main/java/org/elasticsearch/percolator/PercolatorMatchedSlotSubFetchPhase.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
import org.apache.lucene.search.Weight;
3131
import org.apache.lucene.util.BitSet;
3232
import org.apache.lucene.util.BitSetIterator;
33-
import org.elasticsearch.Version;
3433
import org.elasticsearch.common.document.DocumentField;
3534
import org.elasticsearch.common.lucene.search.Queries;
3635
import org.elasticsearch.search.SearchHit;
@@ -73,7 +72,7 @@ static void innerHitsExecute(Query mainQuery,
7372
for (PercolateQuery percolateQuery : percolateQueries) {
7473
String fieldName = singlePercolateQuery ? FIELD_NAME_PREFIX : FIELD_NAME_PREFIX + "_" + percolateQuery.getName();
7574
IndexSearcher percolatorIndexSearcher = percolateQuery.getPercolatorIndexSearcher();
76-
Query nonNestedQuery = Queries.newNonNestedFilter(Version.CURRENT);
75+
Query nonNestedQuery = Queries.newNonNestedFilter();
7776
Weight weight = percolatorIndexSearcher.createWeight(percolatorIndexSearcher.rewrite(nonNestedQuery),
7877
ScoreMode.COMPLETE_NO_SCORES, 1f);
7978
Scorer s = weight.scorer(percolatorIndexSearcher.getIndexReader().leaves().get(0));

‎modules/percolator/src/test/java/org/elasticsearch/percolator/CandidateQueryTests.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@
9797
import org.elasticsearch.index.mapper.ParseContext;
9898
import org.elasticsearch.plugins.Plugin;
9999
import org.elasticsearch.test.ESSingleNodeTestCase;
100+
import org.elasticsearch.test.VersionUtils;
100101
import org.junit.After;
101102
import org.junit.Before;
102103

@@ -593,7 +594,7 @@ public void testRangeQueries() throws Exception {
593594
IndexSearcher shardSearcher = newSearcher(directoryReader);
594595
shardSearcher.setQueryCache(null);
595596

596-
Version v = Version.V_6_1_0;
597+
Version v = VersionUtils.randomIndexCompatibleVersion(random());
597598
MemoryIndex memoryIndex = MemoryIndex.fromDocument(Collections.singleton(new IntPoint("int_field", 3)), new WhitespaceAnalyzer());
598599
IndexSearcher percolateSearcher = memoryIndex.createSearcher();
599600
Query query = fieldType.percolateQuery("_name", queryStore, Collections.singletonList(new BytesArray("{}")),

‎server/src/main/java/org/elasticsearch/Version.java

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -52,16 +52,6 @@ public class Version implements Comparable<Version>, ToXContentFragment {
5252
public static final int V_6_0_1_ID = 6000199;
5353
public static final Version V_6_0_1 =
5454
new Version(V_6_0_1_ID, org.apache.lucene.util.Version.LUCENE_7_0_1);
55-
public static final int V_6_1_0_ID = 6010099;
56-
public static final Version V_6_1_0 = new Version(V_6_1_0_ID, org.apache.lucene.util.Version.LUCENE_7_1_0);
57-
public static final int V_6_1_1_ID = 6010199;
58-
public static final Version V_6_1_1 = new Version(V_6_1_1_ID, org.apache.lucene.util.Version.LUCENE_7_1_0);
59-
public static final int V_6_1_2_ID = 6010299;
60-
public static final Version V_6_1_2 = new Version(V_6_1_2_ID, org.apache.lucene.util.Version.LUCENE_7_1_0);
61-
public static final int V_6_1_3_ID = 6010399;
62-
public static final Version V_6_1_3 = new Version(V_6_1_3_ID, org.apache.lucene.util.Version.LUCENE_7_1_0);
63-
public static final int V_6_1_4_ID = 6010499;
64-
public static final Version V_6_1_4 = new Version(V_6_1_4_ID, org.apache.lucene.util.Version.LUCENE_7_1_0);
6555
// The below version is missing from the 7.3 JAR
6656
private static final org.apache.lucene.util.Version LUCENE_7_2_1 = org.apache.lucene.util.Version.fromBits(7, 2, 1);
6757
public static final int V_6_2_0_ID = 6020099;
@@ -202,16 +192,6 @@ public static Version fromId(int id) {
202192
return V_6_2_1;
203193
case V_6_2_0_ID:
204194
return V_6_2_0;
205-
case V_6_1_4_ID:
206-
return V_6_1_4;
207-
case V_6_1_3_ID:
208-
return V_6_1_3;
209-
case V_6_1_2_ID:
210-
return V_6_1_2;
211-
case V_6_1_1_ID:
212-
return V_6_1_1;
213-
case V_6_1_0_ID:
214-
return V_6_1_0;
215195
case V_6_0_1_ID:
216196
return V_6_0_1;
217197
case V_6_0_0_ID:

‎server/src/main/java/org/elasticsearch/common/lucene/search/Queries.java

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
import org.apache.lucene.search.Query;
3232
import org.apache.lucene.util.BytesRef;
3333
import org.elasticsearch.ElasticsearchException;
34-
import org.elasticsearch.Version;
3534
import org.elasticsearch.common.Nullable;
3635
import org.elasticsearch.index.mapper.SeqNoFieldMapper;
3736
import org.elasticsearch.index.mapper.TypeFieldMapper;
@@ -72,17 +71,9 @@ public static Query newNestedFilter() {
7271

7372
/**
7473
* Creates a new non-nested docs query
75-
* @param indexVersionCreated the index version created since newer indices can identify a parent field more efficiently
7674
*/
77-
public static Query newNonNestedFilter(Version indexVersionCreated) {
78-
if (indexVersionCreated.onOrAfter(Version.V_6_1_0)) {
75+
public static Query newNonNestedFilter() {
7976
return new DocValuesFieldExistsQuery(SeqNoFieldMapper.PRIMARY_TERM_NAME);
80-
} else {
81-
return new BooleanQuery.Builder()
82-
.add(new MatchAllDocsQuery(), Occur.FILTER)
83-
.add(newNestedFilter(), Occur.MUST_NOT)
84-
.build();
85-
}
8677
}
8778

8879
public static BooleanQuery filtered(@Nullable Query query, @Nullable Query filter) {

‎server/src/main/java/org/elasticsearch/index/cache/bitset/BitsetFilterCache.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ public IndexWarmer.TerminationHandle warmReader(final IndexShard indexShard, fin
251251
}
252252

253253
if (hasNested) {
254-
warmUp.add(Queries.newNonNestedFilter(indexSettings.getIndexVersionCreated()));
254+
warmUp.add(Queries.newNonNestedFilter());
255255
}
256256

257257
final CountDownLatch latch = new CountDownLatch(searcher.reader().leaves().size() * warmUp.size());

‎server/src/main/java/org/elasticsearch/index/mapper/FieldNamesFieldMapper.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import org.apache.lucene.index.IndexOptions;
2525
import org.apache.lucene.index.IndexableField;
2626
import org.apache.lucene.search.Query;
27-
import org.elasticsearch.Version;
2827
import org.elasticsearch.common.logging.DeprecationLogger;
2928
import org.elasticsearch.common.lucene.Lucene;
3029
import org.elasticsearch.common.settings.Settings;
@@ -202,10 +201,7 @@ public void preParse(ParseContext context) {
202201
}
203202

204203
@Override
205-
public void postParse(ParseContext context) throws IOException {
206-
if (context.indexSettings().getIndexVersionCreated().before(Version.V_6_1_0)) {
207-
super.parse(context);
208-
}
204+
public void postParse(ParseContext context) {
209205
}
210206

211207
@Override

‎server/src/main/java/org/elasticsearch/index/mapper/SeqNoFieldMapper.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import org.apache.lucene.search.MatchNoDocsQuery;
2929
import org.apache.lucene.search.Query;
3030
import org.apache.lucene.util.BytesRef;
31-
import org.elasticsearch.Version;
3231
import org.elasticsearch.common.Nullable;
3332
import org.elasticsearch.common.settings.Settings;
3433
import org.elasticsearch.common.xcontent.XContentBuilder;
@@ -255,15 +254,9 @@ public void postParse(ParseContext context) throws IOException {
255254
// we share the parent docs fields to ensure good compression
256255
SequenceIDFields seqID = context.seqID();
257256
assert seqID != null;
258-
final Version versionCreated = context.mapperService().getIndexSettings().getIndexVersionCreated();
259-
final boolean includePrimaryTerm = versionCreated.before(Version.V_6_1_0);
260257
for (Document doc : context.nonRootDocuments()) {
261258
doc.add(seqID.seqNo);
262259
doc.add(seqID.seqNoDocValue);
263-
if (includePrimaryTerm) {
264-
// primary terms are used to distinguish between parent and nested docs since 6.1.0
265-
doc.add(seqID.primaryTerm);
266-
}
267260
}
268261
}
269262

‎server/src/main/java/org/elasticsearch/index/mapper/TypeFieldMapper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ public Query termsQuery(List<?> values, QueryShardContext context) {
140140
.anyMatch(indexType::equals)) {
141141
if (context.getMapperService().hasNested()) {
142142
// type filters are expected not to match nested docs
143-
return Queries.newNonNestedFilter(context.indexVersionCreated());
143+
return Queries.newNonNestedFilter();
144144
} else {
145145
return new MatchAllDocsQuery();
146146
}

‎server/src/main/java/org/elasticsearch/index/query/ExistsQueryBuilder.java

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,11 @@
1919

2020
package org.elasticsearch.index.query;
2121

22-
import org.apache.lucene.index.Term;
2322
import org.apache.lucene.search.BooleanClause;
2423
import org.apache.lucene.search.BooleanClause.Occur;
2524
import org.apache.lucene.search.BooleanQuery;
2625
import org.apache.lucene.search.ConstantScoreQuery;
2726
import org.apache.lucene.search.Query;
28-
import org.apache.lucene.search.TermQuery;
29-
import org.elasticsearch.Version;
3027
import org.elasticsearch.common.ParseField;
3128
import org.elasticsearch.common.ParsingException;
3229
import org.elasticsearch.common.Strings;
@@ -148,10 +145,6 @@ public static Query newFilter(QueryShardContext context, String fieldPattern) {
148145
fields = context.simpleMatchToIndexNames(fieldPattern);
149146
}
150147

151-
if (context.indexVersionCreated().before(Version.V_6_1_0)) {
152-
return newLegacyExistsQuery(context, fields);
153-
}
154-
155148
if (fields.size() == 1) {
156149
String field = fields.iterator().next();
157150
return newFieldExistsQuery(context, field);
@@ -164,28 +157,6 @@ public static Query newFilter(QueryShardContext context, String fieldPattern) {
164157
return new ConstantScoreQuery(boolFilterBuilder.build());
165158
}
166159

167-
private static Query newLegacyExistsQuery(QueryShardContext context, Collection<String> fields) {
168-
// We create TermsQuery directly here rather than using FieldNamesFieldType.termsQuery()
169-
// so we don't end up with deprecation warnings
170-
if (fields.size() == 1) {
171-
Query filter = newLegacyExistsQuery(context, fields.iterator().next());
172-
return new ConstantScoreQuery(filter);
173-
}
174-
175-
BooleanQuery.Builder boolFilterBuilder = new BooleanQuery.Builder();
176-
for (String field : fields) {
177-
Query filter = newLegacyExistsQuery(context, field);
178-
boolFilterBuilder.add(filter, BooleanClause.Occur.SHOULD);
179-
}
180-
return new ConstantScoreQuery(boolFilterBuilder.build());
181-
}
182-
183-
private static Query newLegacyExistsQuery(QueryShardContext context, String field) {
184-
MappedFieldType fieldType = context.fieldMapper(field);
185-
String fieldName = fieldType != null ? fieldType.name() : field;
186-
return new TermQuery(new Term(FieldNamesFieldMapper.NAME, fieldName));
187-
}
188-
189160
private static Query newFieldExistsQuery(QueryShardContext context, String field) {
190161
MappedFieldType fieldType = context.getMapperService().fullName(field);
191162
if (fieldType == null) {

‎server/src/main/java/org/elasticsearch/index/query/NestedQueryBuilder.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ protected Query doToQuery(QueryShardContext context) throws IOException {
281281
Query innerQuery;
282282
ObjectMapper objectMapper = context.nestedScope().getObjectMapper();
283283
if (objectMapper == null) {
284-
parentFilter = context.bitsetFilter(Queries.newNonNestedFilter(context.indexVersionCreated()));
284+
parentFilter = context.bitsetFilter(Queries.newNonNestedFilter());
285285
} else {
286286
parentFilter = context.bitsetFilter(objectMapper.nestedTypeFilter());
287287
}
@@ -388,7 +388,7 @@ public TopDocsAndMaxScore[] topDocs(SearchHit[] hits) throws IOException {
388388
SearchHit hit = hits[i];
389389
Query rawParentFilter;
390390
if (parentObjectMapper == null) {
391-
rawParentFilter = Queries.newNonNestedFilter(context.indexShard().indexSettings().getIndexVersionCreated());
391+
rawParentFilter = Queries.newNonNestedFilter();
392392
} else {
393393
rawParentFilter = parentObjectMapper.nestedTypeFilter();
394394
}

‎server/src/main/java/org/elasticsearch/index/shard/ShardSplittingQuery.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ public float matchCost() {
341341
*/
342342
private static BitSetProducer newParentDocBitSetProducer(Version indexVersionCreated) {
343343
return context -> {
344-
Query query = Queries.newNonNestedFilter(indexVersionCreated);
344+
Query query = Queries.newNonNestedFilter();
345345
final IndexReaderContext topLevelContext = ReaderUtil.getTopLevelContext(context);
346346
final IndexSearcher searcher = new IndexSearcher(topLevelContext);
347347
searcher.setQueryCache(null);

‎server/src/main/java/org/elasticsearch/search/DefaultSearchContext.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ public Query buildFilteredQuery(Query query) {
278278
&& typeFilter == null // when a _type filter is set, it will automatically exclude nested docs
279279
&& new NestedHelper(mapperService()).mightMatchNestedDocs(query)
280280
&& (aliasFilter == null || new NestedHelper(mapperService()).mightMatchNestedDocs(aliasFilter))) {
281-
filters.add(Queries.newNonNestedFilter(mapperService().getIndexSettings().getIndexVersionCreated()));
281+
filters.add(Queries.newNonNestedFilter());
282282
}
283283

284284
if (aliasFilter != null) {

‎server/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/NestedAggregator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public class NestedAggregator extends BucketsAggregator implements SingleBucketA
6666
super(name, factories, context, parentAggregator, pipelineAggregators, metaData);
6767

6868
Query parentFilter = parentObjectMapper != null ? parentObjectMapper.nestedTypeFilter()
69-
: Queries.newNonNestedFilter(context.mapperService().getIndexSettings().getIndexVersionCreated());
69+
: Queries.newNonNestedFilter();
7070
this.parentFilter = context.bitsetFilterCache().getBitSetProducer(parentFilter);
7171
this.childFilter = childObjectMapper.nestedTypeFilter();
7272
this.collectsFromSingleBucket = collectsFromSingleBucket;

‎server/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/ReverseNestedAggregator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public ReverseNestedAggregator(String name, AggregatorFactories factories, Objec
5454
throws IOException {
5555
super(name, factories, context, parent, pipelineAggregators, metaData);
5656
if (objectMapper == null) {
57-
parentFilter = Queries.newNonNestedFilter(context.mapperService().getIndexSettings().getIndexVersionCreated());
57+
parentFilter = Queries.newNonNestedFilter();
5858
} else {
5959
parentFilter = objectMapper.nestedTypeFilter();
6060
}

‎server/src/main/java/org/elasticsearch/search/fetch/FetchPhase.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ public void execute(SearchContext context) {
190190
private int findRootDocumentIfNested(SearchContext context, LeafReaderContext subReaderContext, int subDocId) throws IOException {
191191
if (context.mapperService().hasNested()) {
192192
BitSet bits = context.bitsetFilterCache()
193-
.getBitSetProducer(Queries.newNonNestedFilter(context.indexShard().indexSettings().getIndexVersionCreated()))
193+
.getBitSetProducer(Queries.newNonNestedFilter())
194194
.getBitSet(subReaderContext);
195195
if (!bits.get(subDocId)) {
196196
return bits.nextSetBit(subDocId);
@@ -363,7 +363,7 @@ private SearchHit.NestedIdentity getInternalNestedIdentity(SearchContext context
363363
}
364364
parentFilter = nestedParentObjectMapper.nestedTypeFilter();
365365
} else {
366-
parentFilter = Queries.newNonNestedFilter(context.indexShard().indexSettings().getIndexVersionCreated());
366+
parentFilter = Queries.newNonNestedFilter();
367367
}
368368

369369
Query childFilter = nestedObjectMapper.nestedTypeFilter();

‎server/src/main/java/org/elasticsearch/search/sort/SortBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ protected static Nested resolveNested(QueryShardContext context, NestedSortBuild
185185
final ObjectMapper objectMapper = context.nestedScope().getObjectMapper();
186186
final Query parentQuery;
187187
if (objectMapper == null) {
188-
parentQuery = Queries.newNonNestedFilter(context.indexVersionCreated());
188+
parentQuery = Queries.newNonNestedFilter();
189189
} else {
190190
parentQuery = objectMapper.nestedTypeFilter();
191191
}

‎server/src/test/java/org/elasticsearch/common/lucene/search/QueriesTests.java

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -20,33 +20,21 @@
2020
package org.elasticsearch.common.lucene.search;
2121

2222
import org.apache.lucene.index.Term;
23-
import org.apache.lucene.search.BooleanClause;
2423
import org.apache.lucene.search.BooleanClause.Occur;
2524
import org.apache.lucene.search.BooleanQuery;
2625
import org.apache.lucene.search.DocValuesFieldExistsQuery;
2726
import org.apache.lucene.search.MatchAllDocsQuery;
2827
import org.apache.lucene.search.TermQuery;
29-
import org.elasticsearch.Version;
3028
import org.elasticsearch.index.mapper.SeqNoFieldMapper;
3129
import org.elasticsearch.test.ESTestCase;
32-
import org.elasticsearch.test.VersionUtils;
3330

3431
public class QueriesTests extends ESTestCase {
3532

3633
public void testNonNestedQuery() {
37-
for (Version version : VersionUtils.allVersions()) {
38-
// This is a custom query that extends AutomatonQuery and want to make sure the equals method works
39-
assertEquals(Queries.newNonNestedFilter(version), Queries.newNonNestedFilter(version));
40-
assertEquals(Queries.newNonNestedFilter(version).hashCode(), Queries.newNonNestedFilter(version).hashCode());
41-
if (version.onOrAfter(Version.V_6_1_0)) {
42-
assertEquals(Queries.newNonNestedFilter(version), new DocValuesFieldExistsQuery(SeqNoFieldMapper.PRIMARY_TERM_NAME));
43-
} else {
44-
assertEquals(Queries.newNonNestedFilter(version), new BooleanQuery.Builder()
45-
.add(new MatchAllDocsQuery(), BooleanClause.Occur.FILTER)
46-
.add(Queries.newNestedFilter(), BooleanClause.Occur.MUST_NOT)
47-
.build());
48-
}
49-
}
34+
// This is a custom query that extends AutomatonQuery and want to make sure the equals method works
35+
assertEquals(Queries.newNonNestedFilter(), Queries.newNonNestedFilter());
36+
assertEquals(Queries.newNonNestedFilter().hashCode(), Queries.newNonNestedFilter().hashCode());
37+
assertEquals(Queries.newNonNestedFilter(), new DocValuesFieldExistsQuery(SeqNoFieldMapper.PRIMARY_TERM_NAME));
5038
}
5139

5240
public void testIsNegativeQuery() {

0 commit comments

Comments
 (0)