Upgrade to lucene-7.0.0-snapshot-ad2cb77. (#25349)

Most notable changes:
 - better update concurrency: LUCENE-7868
 - TopDocs.totalHits is now a long: LUCENE-7872
 - QueryBuilder does not remove the boolean query around multi-term synonyms:
   LUCENE-7878
 - removal of Fields: LUCENE-7500

For the `TopDocs.totalHits` change, this PR relies on the fact that the encoding
of vInts and vLongs are compatible: you can write and read with any of them as
long as the value can be represented by a positive int.

4 files changed, 9 insertions, 10 deletions

diff --git a/modules/lang-expression/licenses/lucene-expressions-7.0.0-snapshot-92b1783.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-7.0.0-snapshot-92b1783.jar.sha1
deleted file mode 100644
index 671513e5ac..0000000000
--- a/modules/lang-expression/licenses/lucene-expressions-7.0.0-snapshot-92b1783.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-bcd4b2c3308a284f4d93400a47cb324a3c729aed
\ No newline at end of file
diff --git a/modules/lang-expression/licenses/lucene-expressions-7.0.0-snapshot-ad2cb77.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-7.0.0-snapshot-ad2cb77.jar.sha1
new file mode 100644
index 0000000000..19cb0afb1c
--- /dev/null
+++ b/modules/lang-expression/licenses/lucene-expressions-7.0.0-snapshot-ad2cb77.jar.sha1
@@ -0,0 +1 @@
+6286fec3656b8e8153d33488094d92a134f77e3d
\ No newline at end of file
diff --git a/modules/percolator/src/main/java/org/elasticsearch/percolator/PercolatorFieldMapper.java b/modules/percolator/src/main/java/org/elasticsearch/percolator/PercolatorFieldMapper.java
index 926536d65e..8ce0162266 100644
--- a/modules/percolator/src/main/java/org/elasticsearch/percolator/PercolatorFieldMapper.java
+++ b/modules/percolator/src/main/java/org/elasticsearch/percolator/PercolatorFieldMapper.java
@@ -20,7 +20,7 @@ package org.elasticsearch.percolator;
 
 import org.apache.lucene.document.Field;
 import org.apache.lucene.index.DocValuesType;
-import org.apache.lucene.index.Fields;
+import org.apache.lucene.index.FieldInfo;
 import org.apache.lucene.index.IndexOptions;
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.index.IndexableField;
@@ -196,14 +196,13 @@ public class PercolatorFieldMapper extends FieldMapper {
         Query createCandidateQuery(IndexReader indexReader) throws IOException {
             List<BytesRef> extractedTerms = new ArrayList<>();
             LeafReader reader = indexReader.leaves().get(0).reader();
-            Fields fields = reader.fields();
-            for (String field : fields) {
-                Terms terms = fields.terms(field);
+            for (FieldInfo info : reader.getFieldInfos()) {
+                Terms terms = reader.terms(info.name);
                 if (terms == null) {
                     continue;
                 }
 
-                BytesRef fieldBr = new BytesRef(field);
+                BytesRef fieldBr = new BytesRef(info.name);
                 TermsEnum tenum = terms.iterator();
                 for (BytesRef term = tenum.next(); term != null; term = tenum.next()) {
                     BytesRefBuilder builder = new BytesRefBuilder();
diff --git a/modules/percolator/src/test/java/org/elasticsearch/percolator/PercolateQueryTests.java b/modules/percolator/src/test/java/org/elasticsearch/percolator/PercolateQueryTests.java
index 439ca21777..c76ac14cff 100644
--- a/modules/percolator/src/test/java/org/elasticsearch/percolator/PercolateQueryTests.java
+++ b/modules/percolator/src/test/java/org/elasticsearch/percolator/PercolateQueryTests.java
@@ -119,7 +119,7 @@ public class PercolateQueryTests extends ESTestCase {
         Query query = new ConstantScoreQuery(new PercolateQuery(queryStore, new BytesArray("a"),
                 new TermQuery(new Term("select", "a")), percolateSearcher, new MatchNoDocsQuery("")));
         TopDocs topDocs = shardSearcher.search(query, 10);
-        assertThat(topDocs.totalHits, equalTo(1));
+        assertThat(topDocs.totalHits, equalTo(1L));
         assertThat(topDocs.scoreDocs.length, equalTo(1));
         assertThat(topDocs.scoreDocs[0].doc, equalTo(0));
         Explanation explanation = shardSearcher.explain(query, 0);
@@ -129,7 +129,7 @@ public class PercolateQueryTests extends ESTestCase {
         query = new ConstantScoreQuery(new PercolateQuery(queryStore, new BytesArray("b"),
                 new TermQuery(new Term("select", "b")), percolateSearcher, new MatchNoDocsQuery("")));
         topDocs = shardSearcher.search(query, 10);
-        assertThat(topDocs.totalHits, equalTo(3));
+        assertThat(topDocs.totalHits, equalTo(3L));
         assertThat(topDocs.scoreDocs.length, equalTo(3));
         assertThat(topDocs.scoreDocs[0].doc, equalTo(1));
         explanation = shardSearcher.explain(query, 1);
@@ -149,12 +149,12 @@ public class PercolateQueryTests extends ESTestCase {
         query = new ConstantScoreQuery(new PercolateQuery(queryStore, new BytesArray("c"),
                 new MatchAllDocsQuery(), percolateSearcher, new MatchAllDocsQuery()));
         topDocs = shardSearcher.search(query, 10);
-        assertThat(topDocs.totalHits, equalTo(4));
+        assertThat(topDocs.totalHits, equalTo(4L));
 
         query = new PercolateQuery(queryStore, new BytesArray("{}"), new TermQuery(new Term("select", "b")),
                 percolateSearcher, new MatchNoDocsQuery(""));
         topDocs = shardSearcher.search(query, 10);
-        assertThat(topDocs.totalHits, equalTo(3));
+        assertThat(topDocs.totalHits, equalTo(3L));
         assertThat(topDocs.scoreDocs.length, equalTo(3));
         assertThat(topDocs.scoreDocs[0].doc, equalTo(3));
         explanation = shardSearcher.explain(query, 3);