Upgrade Lucene 8.5 to latest snapshot

buildSrc/version.properties

@@ -1,5 +1,5 @@
 elasticsearch     = 8.0.0
-lucene            = 8.5.0-snapshot-d62f6307658
+lucene            = 8.5.0-snapshot-b01d7cb
 
 bundled_jdk_vendor = adoptopenjdk
 bundled_jdk = 13.0.2+8

modules/lang-expression/licenses/lucene-expressions-8.5.0-snapshot-b01d7cb.jar.sha1

@@ -0,0 +1 @@
+b3d969d1d63fe9500fe5308b1a0c60d84d7bfa92

modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/ScaledFloatFieldMapperTests.java

@@ -77,7 +77,7 @@ public void testDefaults() throws Exception {
         IndexableField[] fields = doc.rootDoc().getFields("field");
         assertEquals(2, fields.length);
         IndexableField pointField = fields[0];
-        assertEquals(1, pointField.fieldType().pointDataDimensionCount());
+        assertEquals(1, pointField.fieldType().pointDimensionCount());
         assertFalse(pointField.fieldType().stored());
         assertEquals(1230, pointField.numericValue().longValue());
         IndexableField dvField = fields[1];
@@ -151,7 +151,7 @@ public void testNoDocValues() throws Exception {
         IndexableField[] fields = doc.rootDoc().getFields("field");
         assertEquals(1, fields.length);
         IndexableField pointField = fields[0];
-        assertEquals(1, pointField.fieldType().pointDataDimensionCount());
+        assertEquals(1, pointField.fieldType().pointDimensionCount());
         assertEquals(1230, pointField.numericValue().longValue());
     }
 
@@ -175,7 +175,7 @@ public void testStore() throws Exception {
         IndexableField[] fields = doc.rootDoc().getFields("field");
         assertEquals(3, fields.length);
         IndexableField pointField = fields[0];
-        assertEquals(1, pointField.fieldType().pointDataDimensionCount());
+        assertEquals(1, pointField.fieldType().pointDimensionCount());
         assertEquals(1230, pointField.numericValue().doubleValue(), 0d);
         IndexableField dvField = fields[1];
         assertEquals(DocValuesType.SORTED_NUMERIC, dvField.fieldType().docValuesType());
@@ -204,7 +204,7 @@ public void testCoerce() throws Exception {
         IndexableField[] fields = doc.rootDoc().getFields("field");
         assertEquals(2, fields.length);
         IndexableField pointField = fields[0];
-        assertEquals(1, pointField.fieldType().pointDataDimensionCount());
+        assertEquals(1, pointField.fieldType().pointDimensionCount());
         assertEquals(1230, pointField.numericValue().longValue());
         IndexableField dvField = fields[1];
         assertEquals(DocValuesType.SORTED_NUMERIC, dvField.fieldType().docValuesType());
@@ -319,7 +319,7 @@ public void testNullValue() throws IOException {
         IndexableField[] fields = doc.rootDoc().getFields("field");
         assertEquals(2, fields.length);
         IndexableField pointField = fields[0];
-        assertEquals(1, pointField.fieldType().pointDataDimensionCount());
+        assertEquals(1, pointField.fieldType().pointDimensionCount());
         assertFalse(pointField.fieldType().stored());
         assertEquals(25, pointField.numericValue().longValue());
         IndexableField dvField = fields[1];

plugins/analysis-icu/licenses/lucene-analyzers-icu-8.5.0-snapshot-b01d7cb.jar.sha1

@@ -0,0 +1 @@
+d81b8f0ecdc67ba74049e65702582fcb8b605cfd

plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.5.0-snapshot-b01d7cb.jar.sha1

@@ -0,0 +1 @@
+13e9fd71cb3992b148728fe4884b7a6d0e26ee78

plugins/analysis-nori/licenses/lucene-analyzers-nori-8.5.0-snapshot-b01d7cb.jar.sha1

@@ -0,0 +1 @@
+58638e06cd1221b1d4de01705882922936ad69c9

plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.5.0-snapshot-b01d7cb.jar.sha1

@@ -0,0 +1 @@
+346c87ed2ef2c6af49a434c568635a50cce64f2e

plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.5.0-snapshot-b01d7cb.jar.sha1

@@ -0,0 +1 @@
+82ab2570c88053439912c5de5ed81cbe4337e450

plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.5.0-snapshot-b01d7cb.jar.sha1

@@ -0,0 +1 @@
+ef0703ff5dc1b704ea3e58596b91e4b08c326d4c

plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.5.0-snapshot-b01d7cb.jar.sha1

@@ -0,0 +1 @@
+9cf8ce62436a3768e18c431cf3be43f5e2672b24

server/licenses/lucene-analyzers-common-8.5.0-snapshot-b01d7cb.jar.sha1

@@ -0,0 +1 @@
+4d358d392a9825c1502499d0a649730208f03777

server/licenses/lucene-backward-codecs-8.5.0-snapshot-b01d7cb.jar.sha1

@@ -0,0 +1 @@
+17a0b6597c5bbe6cc2fc6d46003cdf9bc937c593

server/licenses/lucene-core-8.5.0-snapshot-b01d7cb.jar.sha1

@@ -0,0 +1 @@
+9c54e267bfa2cd1ef904dc6e35b38bbedda4c4b1

server/licenses/lucene-grouping-8.5.0-snapshot-b01d7cb.jar.sha1

@@ -0,0 +1 @@
+a14fb545a10fcead07fbb0d801fdebce88192211

server/licenses/lucene-highlighter-8.5.0-snapshot-b01d7cb.jar.sha1

@@ -0,0 +1 @@
+25314c94f5cbcd8e360b74fb9980fc42e3641c94

server/licenses/lucene-join-8.5.0-snapshot-b01d7cb.jar.sha1

@@ -0,0 +1 @@
+efe41313b6733a0d2764052972c4e27a7ca7636f

server/licenses/lucene-memory-8.5.0-snapshot-b01d7cb.jar.sha1

@@ -0,0 +1 @@
+f19fb11eb40f9d1bf77272de1cbd8c83e6463829

server/licenses/lucene-misc-8.5.0-snapshot-b01d7cb.jar.sha1

@@ -0,0 +1 @@
+4295e60e1079c32dc19d1b070db3e62e04f07232

server/licenses/lucene-queries-8.5.0-snapshot-b01d7cb.jar.sha1

@@ -0,0 +1 @@
+1555f90440c10250e084d36c27e0da0b760d0296

server/licenses/lucene-queryparser-8.5.0-snapshot-b01d7cb.jar.sha1

@@ -0,0 +1 @@
+4fd374ffc3ec3c82d62d0811d78b044833a8dfa1

server/licenses/lucene-sandbox-8.5.0-snapshot-b01d7cb.jar.sha1

@@ -0,0 +1 @@
+9e47dbe97818dd6caccf03e2ead6282d5e86bd3c

server/licenses/lucene-spatial-extras-8.5.0-snapshot-b01d7cb.jar.sha1

@@ -0,0 +1 @@
+bb9fa551d6d0929d5fd37c524c8c284de3f6786e

server/licenses/lucene-spatial3d-8.5.0-snapshot-b01d7cb.jar.sha1

@@ -0,0 +1 @@
+28c935b5eb84a85ac24432c8c630fa4b47f5fd54

server/licenses/lucene-suggest-8.5.0-snapshot-b01d7cb.jar.sha1

@@ -0,0 +1 @@
+25089b0f516df58e95f345504607853e7ba0a35d

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

@@ -440,7 +440,7 @@ protected final void failIfNoDocValues() {
     }
 
     protected final void failIfNotIndexed() {
-        if (indexOptions() == IndexOptions.NONE && pointDataDimensionCount() == 0) {
+        if (indexOptions() == IndexOptions.NONE && pointDimensionCount() == 0) {
             // we throw an IAE rather than an ISE so that it translates to a 4xx code rather than 5xx code on the http layer
             throw new IllegalArgumentException("Cannot search on field [" + name() + "] since it is not indexed.");
         }

x-pack/plugin/frozen-indices/src/main/java/org/elasticsearch/index/engine/RewriteCachingDirectoryReader.java

@@ -114,9 +114,9 @@ private RewriteCachingLeafReader(LeafReader original) throws IOException {
                     if (pointValues != null) { // might not be in this reader
                         byte[] minPackedValue = pointValues.getMinPackedValue();
                         byte[] maxPackedValue = pointValues.getMaxPackedValue();
-                        int numDimensions = pointValues.getNumIndexDimensions();
+                        int numIndexDimensions = pointValues.getNumIndexDimensions();
                         int bytesPerDimension = pointValues.getBytesPerDimension();
-                        int numDataDimensions = pointValues.getNumDataDimensions();
+                        int numDimensions = pointValues.getNumDimensions();
                         long size = pointValues.size();
                         int docCount = pointValues.getDocCount();
                         valuesMap.put(info.name, new PointValues() {
@@ -141,13 +141,13 @@ public byte[] getMaxPackedValue() {
                             }
 
                             @Override
-                            public int getNumDataDimensions() {
-                                return numDataDimensions;
+                            public int getNumDimensions() {
+                                return numDimensions;
                             }
 
                             @Override
                             public int getNumIndexDimensions() {
-                                return numDimensions;
+                                return numIndexDimensions;
                             }
 
                             @Override

x-pack/plugin/spatial/src/test/java/org/apache/lucene/geo/XShapeTestUtil.java

@@ -58,14 +58,14 @@ public static XYPolygon nextPolygon() {
     private static XYPolygon trianglePolygon(XYRectangle box) {
         final float[] polyX = new float[4];
         final float[] polyY = new float[4];
-        polyX[0] = (float)box.minX;
-        polyY[0] = (float)box.minY;
-        polyX[1] = (float)box.minX;
-        polyY[1] = (float)box.minY;
-        polyX[2] = (float)box.minX;
-        polyY[2] = (float)box.minY;
-        polyX[3] = (float)box.minX;
-        polyY[3] = (float)box.minY;
+        polyX[0] = box.minX;
+        polyY[0] = box.minY;
+        polyX[1] = box.minX;
+        polyY[1] = box.minY;
+        polyX[2] = box.minX;
+        polyY[2] = box.minY;
+        polyX[3] = box.minX;
+        polyY[3] = box.minY;
         return new XYPolygon(polyX, polyY);
     }
 
@@ -75,26 +75,26 @@ public static XYRectangle nextBox() {
 
     private static XYRectangle nextBoxInternal() {
         // prevent lines instead of boxes
-        double x0 = nextDouble();
-        double x1 = nextDouble();
+        float x0 = nextFloat();
+        float x1 = nextFloat();
         while (x0 == x1) {
-            x1 = nextDouble();
+            x1 = nextFloat();
         }
         // prevent lines instead of boxes
-        double y0 = nextDouble();
-        double y1 = nextDouble();
+        float y0 = nextFloat();
+        float y1 = nextFloat();
         while (y0 == y1) {
-            y1 = nextDouble();
+            y1 = nextFloat();
         }
 
         if (x1 < x0) {
-            double x = x0;
+            float x = x0;
             x0 = x1;
             x1 = x;
         }
 
         if (y1 < y0) {
-            double y = y0;
+            float y = y0;
             y0 = y1;
             y1 = y;
         }
@@ -105,16 +105,16 @@ private static XYRectangle nextBoxInternal() {
     private static XYPolygon boxPolygon(XYRectangle box) {
         final float[] polyX = new float[5];
         final float[] polyY = new float[5];
-        polyX[0] = (float)box.minX;
-        polyY[0] = (float)box.minY;
-        polyX[1] = (float)box.minX;
-        polyY[1] = (float)box.minY;
-        polyX[2] = (float)box.minX;
-        polyY[2] = (float)box.minY;
-        polyX[3] = (float)box.minX;
-        polyY[3] = (float)box.minY;
-        polyX[4] = (float)box.minX;
-        polyY[4] = (float)box.minY;
+        polyX[0] = box.minX;
+        polyY[0] = box.minY;
+        polyX[1] = box.minX;
+        polyY[1] = box.minY;
+        polyX[2] = box.minX;
+        polyY[2] = box.minY;
+        polyX[3] = box.minX;
+        polyY[3] = box.minY;
+        polyX[4] = box.minX;
+        polyY[4] = box.minY;
         return new XYPolygon(polyX, polyY);
     }
 
@@ -201,6 +201,10 @@ public static double nextDouble() {
         return BiasedNumbers.randomDoubleBetween(random(), -Float.MAX_VALUE, Float.MAX_VALUE);
     }
 
+    public static float nextFloat() {
+        return BiasedNumbers.randomFloatBetween(random(), -Float.MAX_VALUE, Float.MAX_VALUE);
+    }
+
     /** Keep it simple, we don't need to take arbitrary Random for geo tests */
     private static Random random() {
         return RandomizedContext.current().getRandom();

x-pack/plugin/spatial/src/test/java/org/elasticsearch/xpack/spatial/util/ShapeTestUtils.java

@@ -72,12 +72,22 @@ public static Polygon randomPolygon(boolean hasAlt) {
             List<LinearRing> holes = new ArrayList<>();
             for (int i = 0; i < lucenePolygon.numHoles(); i++) {
                 XYPolygon poly = luceneHoles[i];
-                holes.add(linearRing(poly.getPolyX(), poly.getPolyY(), hasAlt));
+                holes.add(linearRing(floatsToDoubles(poly.getPolyX()), floatsToDoubles(poly.getPolyY()), hasAlt));
             }
-            return new Polygon(linearRing(lucenePolygon.getPolyX(), lucenePolygon.getPolyY(), hasAlt), holes);
+            return new Polygon(linearRing(floatsToDoubles(lucenePolygon.getPolyX()), floatsToDoubles(lucenePolygon.getPolyY()), hasAlt), 
+                    holes);
         }
-        return new Polygon(linearRing(lucenePolygon.getPolyX(), lucenePolygon.getPolyY(), hasAlt));
+        return new Polygon(linearRing(floatsToDoubles(lucenePolygon.getPolyX()), floatsToDoubles(lucenePolygon.getPolyY()), hasAlt));
     }
+
+    static double[] floatsToDoubles(float[] f) {
+        double[] d = new double[f.length];
+        for (int i = 0; i < f.length; i++) {
+          d[i] = f[i];
+        }
+        return d;
+      }    
+
 
     public static Rectangle randomRectangle() {
         org.apache.lucene.geo.XYRectangle rectangle = XShapeTestUtil.nextBox();

x-pack/plugin/sql/sql-action/licenses/lucene-core-8.5.0-snapshot-b01d7cb.jar.sha1

@@ -0,0 +1 @@
+9c54e267bfa2cd1ef904dc6e35b38bbedda4c4b1