Remove 6.0 version constant uses (elastic#41965)

This commit removes all uses of the 6.0 version constants, since master
no longer needs to know about them.

Author: rjernst

client/rest-high-level/src/test/java/org/elasticsearch/client/core/MainResponseTests.java

@@ -38,7 +38,7 @@ protected org.elasticsearch.action.main.MainResponse createServerTestInstance()
         ClusterName clusterName = new ClusterName(randomAlphaOfLength(10));
         String nodeName = randomAlphaOfLength(10);
         final String date = new Date(randomNonNegativeLong()).toString();
-        Version version = VersionUtils.randomVersionBetween(random(), Version.V_6_0_1, Version.CURRENT);
+        Version version = VersionUtils.randomIndexCompatibleVersion(random());
         Build build = new Build(
             Build.Flavor.UNKNOWN, Build.Type.UNKNOWN, randomAlphaOfLength(8), date, randomBoolean(),
             version.toString()

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

@@ -261,7 +261,7 @@ Query percolateQuery(String name, PercolateQuery.QueryStore queryStore, List<Byt
             }
             Query filter = null;
             if (excludeNestedDocuments) {
-                filter = Queries.newNonNestedFilter(indexVersion);
+                filter = Queries.newNonNestedFilter();
             }
             return new PercolateQuery(name, queryStore, documents, candidateQuery, searcher, filter, verifiedMatchesQuery);
         }

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

@@ -30,7 +30,6 @@
 import org.apache.lucene.search.Weight;
 import org.apache.lucene.util.BitSet;
 import org.apache.lucene.util.BitSetIterator;
-import org.elasticsearch.Version;
 import org.elasticsearch.common.document.DocumentField;
 import org.elasticsearch.common.lucene.search.Queries;
 import org.elasticsearch.search.SearchHit;
@@ -73,8 +72,7 @@ static void innerHitsExecute(Query mainQuery,
         for (PercolateQuery percolateQuery : percolateQueries) {
             String fieldName = singlePercolateQuery ? FIELD_NAME_PREFIX : FIELD_NAME_PREFIX + "_" + percolateQuery.getName();
             IndexSearcher percolatorIndexSearcher = percolateQuery.getPercolatorIndexSearcher();
-            Query nonNestedQuery = Queries.newNonNestedFilter(Version.CURRENT);
-            Weight weight = percolatorIndexSearcher.createWeight(percolatorIndexSearcher.rewrite(nonNestedQuery),
+            Weight weight = percolatorIndexSearcher.createWeight(percolatorIndexSearcher.rewrite(Queries.newNonNestedFilter()),
                     ScoreMode.COMPLETE_NO_SCORES, 1f);
             Scorer s = weight.scorer(percolatorIndexSearcher.getIndexReader().leaves().get(0));
             int memoryIndexMaxDoc = percolatorIndexSearcher.getIndexReader().maxDoc();

modules/percolator/src/test/java/org/elasticsearch/percolator/PercolatorFieldMapperTests.java

@@ -399,26 +399,6 @@ public void testCreateCandidateQuery() throws Exception {
         assertThat(t.v1().clauses().get(2).getQuery().toString(), containsString(fieldName + ".extraction_result:failed"));
     }
 
-    public void testCreateCandidateQuery_oldIndex() throws Exception {
-        addQueryFieldMappings();
-
-        MemoryIndex memoryIndex = new MemoryIndex(false);
-        memoryIndex.addField("field1", "value1", new WhitespaceAnalyzer());
-        IndexReader indexReader = memoryIndex.createSearcher().getIndexReader();
-
-        Tuple<BooleanQuery, Boolean> t = fieldType.createCandidateQuery(indexReader, Version.CURRENT);
-        assertTrue(t.v2());
-        assertEquals(2, t.v1().clauses().size());
-        assertThat(t.v1().clauses().get(0).getQuery(), instanceOf(CoveringQuery.class));
-        assertThat(t.v1().clauses().get(1).getQuery(), instanceOf(TermQuery.class));
-
-        t = fieldType.createCandidateQuery(indexReader, Version.V_6_0_0);
-        assertTrue(t.v2());
-        assertEquals(2, t.v1().clauses().size());
-        assertThat(t.v1().clauses().get(0).getQuery(), instanceOf(TermInSetQuery.class));
-        assertThat(t.v1().clauses().get(1).getQuery(), instanceOf(TermQuery.class));
-    }
-
     public void testExtractTermsAndRanges_numberFields() throws Exception {
         addQueryFieldMappings();
 

modules/percolator/src/test/java/org/elasticsearch/percolator/QueryAnalyzerTests.java

@@ -333,12 +333,6 @@ public void testExtractQueryMetadata_booleanQueryWithMustNot() {
         assertThat(result.verified, is(false));
         assertThat(result.minimumShouldMatch, equalTo(0));
         assertTermsEqual(result.extractions);
-
-        result = analyze(booleanQuery, Version.CURRENT);
-        assertThat(result.matchAllDocs, is(true));
-        assertThat(result.verified, is(false));
-        assertThat(result.minimumShouldMatch, equalTo(0));
-        assertTermsEqual(result.extractions);
     }
 
     public void testExactMatch_booleanQuery() {

rest-api-spec/src/main/resources/rest-api-spec/test/search/10_source_filtering.yml

@@ -165,20 +165,6 @@ setup:
         docvalue_fields: [ "count" ]
   - match: { hits.hits.0.fields.count: [1] }
 
----
-"docvalue_fields with default format":
-  - skip:
-      features: warnings
-  - do:
-      warnings:
-        - "[use_field_mapping] is a special format that was only used to ease the transition to 7.x. It has become the default and shouldn't be set explicitly anymore."
-      search:
-        body:
-          docvalue_fields:
-            - field: "count"
-              format: "use_field_mapping"
-  - match: { hits.hits.0.fields.count: [1] }
-
 ---
 "docvalue_fields with explicit format":
 

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

@@ -46,12 +46,6 @@ public class Version implements Comparable<Version>, ToXContentFragment {
      */
     public static final int V_EMPTY_ID = 0;
     public static final Version V_EMPTY = new Version(V_EMPTY_ID, org.apache.lucene.util.Version.LATEST);
-    public static final int V_6_0_0_ID = 6000099;
-    public static final Version V_6_0_0 =
-        new Version(V_6_0_0_ID, org.apache.lucene.util.Version.LUCENE_7_0_1);
-    public static final int V_6_0_1_ID = 6000199;
-    public static final Version V_6_0_1 =
-        new Version(V_6_0_1_ID, org.apache.lucene.util.Version.LUCENE_7_0_1);
     public static final int V_6_1_0_ID = 6010099;
     public static final Version V_6_1_0 = new Version(V_6_1_0_ID, org.apache.lucene.util.Version.LUCENE_7_1_0);
     public static final int V_6_1_1_ID = 6010199;
@@ -212,10 +206,6 @@ public static Version fromId(int id) {
                 return V_6_1_1;
             case V_6_1_0_ID:
                 return V_6_1_0;
-            case V_6_0_1_ID:
-                return V_6_0_1;
-            case V_6_0_0_ID:
-                return V_6_0_0;
             case V_EMPTY_ID:
                 return V_EMPTY;
             default:

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

@@ -31,7 +31,6 @@
 import org.apache.lucene.search.Query;
 import org.apache.lucene.util.BytesRef;
 import org.elasticsearch.ElasticsearchException;
-import org.elasticsearch.Version;
 import org.elasticsearch.common.Nullable;
 import org.elasticsearch.index.mapper.SeqNoFieldMapper;
 import org.elasticsearch.index.mapper.TypeFieldMapper;
@@ -72,17 +71,9 @@ public static Query newNestedFilter() {
 
     /**
      * Creates a new non-nested docs query
-     * @param indexVersionCreated the index version created since newer indices can identify a parent field more efficiently
      */
-    public static Query newNonNestedFilter(Version indexVersionCreated) {
-        if (indexVersionCreated.onOrAfter(Version.V_6_1_0)) {
-            return new DocValuesFieldExistsQuery(SeqNoFieldMapper.PRIMARY_TERM_NAME);
-        } else {
-            return new BooleanQuery.Builder()
-                .add(new MatchAllDocsQuery(), Occur.FILTER)
-                .add(newNestedFilter(), Occur.MUST_NOT)
-                .build();
-        }
+    public static Query newNonNestedFilter() {
+        return new DocValuesFieldExistsQuery(SeqNoFieldMapper.PRIMARY_TERM_NAME);
     }
 
     public static BooleanQuery filtered(@Nullable Query query, @Nullable Query filter) {

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

@@ -251,7 +251,7 @@ public IndexWarmer.TerminationHandle warmReader(final IndexShard indexShard, fin
             }
 
             if (hasNested) {
-                warmUp.add(Queries.newNonNestedFilter(indexSettings.getIndexVersionCreated()));
+                warmUp.add(Queries.newNonNestedFilter());
             }
 
             final CountDownLatch latch = new CountDownLatch(searcher.reader().leaves().size() * warmUp.size());

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

@@ -140,7 +140,7 @@ public Query termsQuery(List<?> values, QueryShardContext context) {
                     .anyMatch(indexType::equals)) {
                 if (context.getMapperService().hasNested()) {
                     // type filters are expected not to match nested docs
-                    return Queries.newNonNestedFilter(context.indexVersionCreated());
+                    return Queries.newNonNestedFilter();
                 } else {
                     return new MatchAllDocsQuery();
                 }