diff --git a/buildSrc/version.properties b/buildSrc/version.properties index 14eec1efe1c0b..d8cd559cc2def 100644 --- a/buildSrc/version.properties +++ b/buildSrc/version.properties @@ -1,5 +1,5 @@ elasticsearch = 6.6.0 -lucene = 7.6.0-snapshot-f9598f335b +lucene = 7.5.0 # optional dependencies spatial4j = 0.7 diff --git a/docs/Versions.asciidoc b/docs/Versions.asciidoc index 92c065fd3d4c7..2981bce61899e 100644 --- a/docs/Versions.asciidoc +++ b/docs/Versions.asciidoc @@ -1,7 +1,7 @@ :version: 6.6.0 :major-version: 6.x -:lucene_version: 7.6.0 -:lucene_version_path: 7_6_0 +:lucene_version: 7.5.0 +:lucene_version_path: 7_5_0 :branch: 6.x :jdk: 1.8.0_131 :jdk_major: 8 diff --git a/modules/lang-expression/licenses/lucene-expressions-7.5.0.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-7.5.0.jar.sha1 new file mode 100644 index 0000000000000..7c391c8fbd1cf --- /dev/null +++ b/modules/lang-expression/licenses/lucene-expressions-7.5.0.jar.sha1 @@ -0,0 +1 @@ +4566befa0926231cfc86692809bba4f636836a58 \ No newline at end of file diff --git a/modules/lang-expression/licenses/lucene-expressions-7.6.0-snapshot-f9598f335b.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-7.6.0-snapshot-f9598f335b.jar.sha1 deleted file mode 100644 index ca7f638b808b0..0000000000000 --- a/modules/lang-expression/licenses/lucene-expressions-7.6.0-snapshot-f9598f335b.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -717fb4e5f1c1667819465805858731d6683f3ab4 \ No newline at end of file diff --git a/modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/ScaledFloatFieldMapperTests.java b/modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/ScaledFloatFieldMapperTests.java index 22971f1484f57..70d1c6169d0a6 100644 --- a/modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/ScaledFloatFieldMapperTests.java +++ b/modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/ScaledFloatFieldMapperTests.java @@ -75,7 +75,7 @@ public void testDefaults() throws Exception { IndexableField[] fields = doc.rootDoc().getFields("field"); assertEquals(2, fields.length); IndexableField pointField = fields[0]; - assertEquals(1, pointField.fieldType().pointIndexDimensionCount()); + assertEquals(1, pointField.fieldType().pointDimensionCount()); assertFalse(pointField.fieldType().stored()); assertEquals(1230, pointField.numericValue().longValue()); IndexableField dvField = fields[1]; @@ -149,7 +149,7 @@ public void testNoDocValues() throws Exception { IndexableField[] fields = doc.rootDoc().getFields("field"); assertEquals(1, fields.length); IndexableField pointField = fields[0]; - assertEquals(1, pointField.fieldType().pointIndexDimensionCount()); + assertEquals(1, pointField.fieldType().pointDimensionCount()); assertEquals(1230, pointField.numericValue().longValue()); } @@ -173,7 +173,7 @@ public void testStore() throws Exception { IndexableField[] fields = doc.rootDoc().getFields("field"); assertEquals(3, fields.length); IndexableField pointField = fields[0]; - assertEquals(1, pointField.fieldType().pointIndexDimensionCount()); + assertEquals(1, pointField.fieldType().pointDimensionCount()); assertEquals(1230, pointField.numericValue().doubleValue(), 0d); IndexableField dvField = fields[1]; assertEquals(DocValuesType.SORTED_NUMERIC, dvField.fieldType().docValuesType()); @@ -202,7 +202,7 @@ public void testCoerce() throws Exception { IndexableField[] fields = doc.rootDoc().getFields("field"); assertEquals(2, fields.length); IndexableField pointField = fields[0]; - assertEquals(1, pointField.fieldType().pointIndexDimensionCount()); + assertEquals(1, pointField.fieldType().pointDimensionCount()); assertEquals(1230, pointField.numericValue().longValue()); IndexableField dvField = fields[1]; assertEquals(DocValuesType.SORTED_NUMERIC, dvField.fieldType().docValuesType()); @@ -317,7 +317,7 @@ public void testNullValue() throws IOException { IndexableField[] fields = doc.rootDoc().getFields("field"); assertEquals(2, fields.length); IndexableField pointField = fields[0]; - assertEquals(1, pointField.fieldType().pointIndexDimensionCount()); + assertEquals(1, pointField.fieldType().pointDimensionCount()); assertFalse(pointField.fieldType().stored()); assertEquals(25, pointField.numericValue().longValue()); IndexableField dvField = fields[1]; 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 24b333bed6643..23839a3a635ab 100644 --- a/modules/percolator/src/main/java/org/elasticsearch/percolator/PercolatorFieldMapper.java +++ b/modules/percolator/src/main/java/org/elasticsearch/percolator/PercolatorFieldMapper.java @@ -341,7 +341,7 @@ Tuple, Map>> extractTermsAndRanges(IndexRead extractedTerms.add(builder.toBytesRef()); } } - if (info.getPointIndexDimensionCount() == 1) { // not != 0 because range fields are not supported + if (info.getPointDimensionCount() == 1) { // not != 0 because range fields are not supported PointValues values = reader.getPointValues(info.name); List encodedPointValues = new ArrayList<>(); encodedPointValues.add(values.getMinPackedValue().clone()); diff --git a/plugins/analysis-icu/licenses/lucene-analyzers-icu-7.5.0.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analyzers-icu-7.5.0.jar.sha1 new file mode 100644 index 0000000000000..fca8c55d842be --- /dev/null +++ b/plugins/analysis-icu/licenses/lucene-analyzers-icu-7.5.0.jar.sha1 @@ -0,0 +1 @@ +d156361604898e3d9e5c751c9308b7b856eec523 \ No newline at end of file diff --git a/plugins/analysis-icu/licenses/lucene-analyzers-icu-7.6.0-snapshot-f9598f335b.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analyzers-icu-7.6.0-snapshot-f9598f335b.jar.sha1 deleted file mode 100644 index ca19e2c37d9eb..0000000000000 --- a/plugins/analysis-icu/licenses/lucene-analyzers-icu-7.6.0-snapshot-f9598f335b.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -4eaf937aa95487a518d458666da78b68fff35ef4 \ No newline at end of file diff --git a/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-7.5.0.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-7.5.0.jar.sha1 new file mode 100644 index 0000000000000..dd14f717dba43 --- /dev/null +++ b/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-7.5.0.jar.sha1 @@ -0,0 +1 @@ +d412659d8b0dd6a579888cab192fe86d468953f3 \ No newline at end of file diff --git a/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-7.6.0-snapshot-f9598f335b.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-7.6.0-snapshot-f9598f335b.jar.sha1 deleted file mode 100644 index 29593925f9050..0000000000000 --- a/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-7.6.0-snapshot-f9598f335b.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -cdb7c83e29aa6c365e2c06c843ddfe16cfba12cc \ No newline at end of file diff --git a/plugins/analysis-nori/licenses/lucene-analyzers-nori-7.5.0.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analyzers-nori-7.5.0.jar.sha1 new file mode 100644 index 0000000000000..0987a33f65af2 --- /dev/null +++ b/plugins/analysis-nori/licenses/lucene-analyzers-nori-7.5.0.jar.sha1 @@ -0,0 +1 @@ +9fdfafd182aa18dc42854f595bed9c65319786a5 \ No newline at end of file diff --git a/plugins/analysis-nori/licenses/lucene-analyzers-nori-7.6.0-snapshot-f9598f335b.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analyzers-nori-7.6.0-snapshot-f9598f335b.jar.sha1 deleted file mode 100644 index c43883bd34046..0000000000000 --- a/plugins/analysis-nori/licenses/lucene-analyzers-nori-7.6.0-snapshot-f9598f335b.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -00cb9ce94be5f24bf6e35e4a8cfe641b01c37cf3 \ No newline at end of file diff --git a/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-7.5.0.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-7.5.0.jar.sha1 new file mode 100644 index 0000000000000..5ccd99775fb57 --- /dev/null +++ b/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-7.5.0.jar.sha1 @@ -0,0 +1 @@ +708120bc7ce6d6bde1a4a30b6bb7edeee1fc17ed \ No newline at end of file diff --git a/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-7.6.0-snapshot-f9598f335b.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-7.6.0-snapshot-f9598f335b.jar.sha1 deleted file mode 100644 index cb2d33a265c5f..0000000000000 --- a/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-7.6.0-snapshot-f9598f335b.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -5fa1fa9c15ff4646dca8bf68696cfb4f85adbe15 \ No newline at end of file diff --git a/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-7.5.0.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-7.5.0.jar.sha1 new file mode 100644 index 0000000000000..78d18568a8f43 --- /dev/null +++ b/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-7.5.0.jar.sha1 @@ -0,0 +1 @@ +ec339902ac6c05440340732b992dd3b73d66d899 \ No newline at end of file diff --git a/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-7.6.0-snapshot-f9598f335b.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-7.6.0-snapshot-f9598f335b.jar.sha1 deleted file mode 100644 index f5adb601ba30a..0000000000000 --- a/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-7.6.0-snapshot-f9598f335b.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -54790d0478d6411ae9a237b4d29056030e48b87e \ No newline at end of file diff --git a/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-7.5.0.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-7.5.0.jar.sha1 new file mode 100644 index 0000000000000..94fa78a5da2a8 --- /dev/null +++ b/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-7.5.0.jar.sha1 @@ -0,0 +1 @@ +a32e24d0781b97b1f2a3e86268d188180f4e41cb \ No newline at end of file diff --git a/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-7.6.0-snapshot-f9598f335b.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-7.6.0-snapshot-f9598f335b.jar.sha1 deleted file mode 100644 index cb9b2365db7fb..0000000000000 --- a/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-7.6.0-snapshot-f9598f335b.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -d240eff790c236180562f20b697db2915d0100cf \ No newline at end of file diff --git a/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-7.5.0.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-7.5.0.jar.sha1 new file mode 100644 index 0000000000000..fdbbc34edbba4 --- /dev/null +++ b/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-7.5.0.jar.sha1 @@ -0,0 +1 @@ +ceafdf4a0d8cc9d61110c9ac6ba610e8485620b9 \ No newline at end of file diff --git a/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-7.6.0-snapshot-f9598f335b.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-7.6.0-snapshot-f9598f335b.jar.sha1 deleted file mode 100644 index dfde53098f73b..0000000000000 --- a/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-7.6.0-snapshot-f9598f335b.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -6bde728277806062a9473626c312a52c52b6f72a \ No newline at end of file diff --git a/plugins/mapper-size/src/test/java/org/elasticsearch/index/mapper/size/SizeMappingTests.java b/plugins/mapper-size/src/test/java/org/elasticsearch/index/mapper/size/SizeMappingTests.java index 1eae00ea49087..e710a5971173e 100644 --- a/plugins/mapper-size/src/test/java/org/elasticsearch/index/mapper/size/SizeMappingTests.java +++ b/plugins/mapper-size/src/test/java/org/elasticsearch/index/mapper/size/SizeMappingTests.java @@ -63,7 +63,7 @@ public void testSizeEnabled() throws Exception { boolean points = false; for (IndexableField field : doc.rootDoc().getFields("_size")) { stored |= field.fieldType().stored(); - points |= field.fieldType().pointIndexDimensionCount() > 0; + points |= field.fieldType().pointDimensionCount() > 0; } assertTrue(stored); assertTrue(points); diff --git a/server/licenses/lucene-analyzers-common-7.5.0.jar.sha1 b/server/licenses/lucene-analyzers-common-7.5.0.jar.sha1 new file mode 100644 index 0000000000000..644e74b25e959 --- /dev/null +++ b/server/licenses/lucene-analyzers-common-7.5.0.jar.sha1 @@ -0,0 +1 @@ +e7fbdfc2297c3ff5d194d7bef95810504e52710e \ No newline at end of file diff --git a/server/licenses/lucene-analyzers-common-7.6.0-snapshot-f9598f335b.jar.sha1 b/server/licenses/lucene-analyzers-common-7.6.0-snapshot-f9598f335b.jar.sha1 deleted file mode 100644 index 36e0c85b2b588..0000000000000 --- a/server/licenses/lucene-analyzers-common-7.6.0-snapshot-f9598f335b.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -57a504b6795f22a25b8a1f054d9943039a85a18d \ No newline at end of file diff --git a/server/licenses/lucene-backward-codecs-7.5.0.jar.sha1 b/server/licenses/lucene-backward-codecs-7.5.0.jar.sha1 new file mode 100644 index 0000000000000..40b47aea708cd --- /dev/null +++ b/server/licenses/lucene-backward-codecs-7.5.0.jar.sha1 @@ -0,0 +1 @@ +3ebd10f4a1fe71a92b69c0d653136bcf9790a165 \ No newline at end of file diff --git a/server/licenses/lucene-backward-codecs-7.6.0-snapshot-f9598f335b.jar.sha1 b/server/licenses/lucene-backward-codecs-7.6.0-snapshot-f9598f335b.jar.sha1 deleted file mode 100644 index 146a816d44c76..0000000000000 --- a/server/licenses/lucene-backward-codecs-7.6.0-snapshot-f9598f335b.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -77e50b66ce562a20b55a7580c2d5be6ee37ff23c \ No newline at end of file diff --git a/server/licenses/lucene-core-7.5.0.jar.sha1 b/server/licenses/lucene-core-7.5.0.jar.sha1 new file mode 100644 index 0000000000000..d3e7ba985dfed --- /dev/null +++ b/server/licenses/lucene-core-7.5.0.jar.sha1 @@ -0,0 +1 @@ +736e94305e2a0e803563c5b184877df5c7d4cb69 \ No newline at end of file diff --git a/server/licenses/lucene-core-7.6.0-snapshot-f9598f335b.jar.sha1 b/server/licenses/lucene-core-7.6.0-snapshot-f9598f335b.jar.sha1 deleted file mode 100644 index d8d15caa0b4c3..0000000000000 --- a/server/licenses/lucene-core-7.6.0-snapshot-f9598f335b.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ec080318251807172626c0ba8dc931276d52b15e \ No newline at end of file diff --git a/server/licenses/lucene-grouping-7.5.0.jar.sha1 b/server/licenses/lucene-grouping-7.5.0.jar.sha1 new file mode 100644 index 0000000000000..e801ae199c658 --- /dev/null +++ b/server/licenses/lucene-grouping-7.5.0.jar.sha1 @@ -0,0 +1 @@ +f326a63640a288c302c713fcf2965fdc827b3cca \ No newline at end of file diff --git a/server/licenses/lucene-grouping-7.6.0-snapshot-f9598f335b.jar.sha1 b/server/licenses/lucene-grouping-7.6.0-snapshot-f9598f335b.jar.sha1 deleted file mode 100644 index 7a8008878c2dc..0000000000000 --- a/server/licenses/lucene-grouping-7.6.0-snapshot-f9598f335b.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -3855c79ab2ca091e84ba46d8326a149f1d67bb51 \ No newline at end of file diff --git a/server/licenses/lucene-highlighter-7.5.0.jar.sha1 b/server/licenses/lucene-highlighter-7.5.0.jar.sha1 new file mode 100644 index 0000000000000..bd71986c8c24d --- /dev/null +++ b/server/licenses/lucene-highlighter-7.5.0.jar.sha1 @@ -0,0 +1 @@ +59420a5e30f12885f160e49bb975ab6b5985bd3d \ No newline at end of file diff --git a/server/licenses/lucene-highlighter-7.6.0-snapshot-f9598f335b.jar.sha1 b/server/licenses/lucene-highlighter-7.6.0-snapshot-f9598f335b.jar.sha1 deleted file mode 100644 index 46d63211696f0..0000000000000 --- a/server/licenses/lucene-highlighter-7.6.0-snapshot-f9598f335b.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -236febdc0f3211640b265d4a6a682f98481d0e20 \ No newline at end of file diff --git a/server/licenses/lucene-join-7.5.0.jar.sha1 b/server/licenses/lucene-join-7.5.0.jar.sha1 new file mode 100644 index 0000000000000..f80a5f6fe678f --- /dev/null +++ b/server/licenses/lucene-join-7.5.0.jar.sha1 @@ -0,0 +1 @@ +065d3c275b094383640d393579cdb7aff22bcd1d \ No newline at end of file diff --git a/server/licenses/lucene-join-7.6.0-snapshot-f9598f335b.jar.sha1 b/server/licenses/lucene-join-7.6.0-snapshot-f9598f335b.jar.sha1 deleted file mode 100644 index 19f31755df727..0000000000000 --- a/server/licenses/lucene-join-7.6.0-snapshot-f9598f335b.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -b5ce0f6d8a6730bbcfd187401168052bd2c8450b \ No newline at end of file diff --git a/server/licenses/lucene-memory-7.5.0.jar.sha1 b/server/licenses/lucene-memory-7.5.0.jar.sha1 new file mode 100644 index 0000000000000..d535e0bae6459 --- /dev/null +++ b/server/licenses/lucene-memory-7.5.0.jar.sha1 @@ -0,0 +1 @@ +b8cc0c311a823287264653fbd05f866e059d303c \ No newline at end of file diff --git a/server/licenses/lucene-memory-7.6.0-snapshot-f9598f335b.jar.sha1 b/server/licenses/lucene-memory-7.6.0-snapshot-f9598f335b.jar.sha1 deleted file mode 100644 index 69f88a20d3e96..0000000000000 --- a/server/licenses/lucene-memory-7.6.0-snapshot-f9598f335b.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -3794e1321c23187399c0b246548827a7613ea15c \ No newline at end of file diff --git a/server/licenses/lucene-misc-7.5.0.jar.sha1 b/server/licenses/lucene-misc-7.5.0.jar.sha1 new file mode 100644 index 0000000000000..a3bd848e17905 --- /dev/null +++ b/server/licenses/lucene-misc-7.5.0.jar.sha1 @@ -0,0 +1 @@ +60d0a02b9297b5423d5400a6b0aa114915232b60 \ No newline at end of file diff --git a/server/licenses/lucene-misc-7.6.0-snapshot-f9598f335b.jar.sha1 b/server/licenses/lucene-misc-7.6.0-snapshot-f9598f335b.jar.sha1 deleted file mode 100644 index 6f3e0b71cc3a5..0000000000000 --- a/server/licenses/lucene-misc-7.6.0-snapshot-f9598f335b.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -605faa9cdb9ba356e289cb5be02fa687d5de1efb \ No newline at end of file diff --git a/server/licenses/lucene-queries-7.5.0.jar.sha1 b/server/licenses/lucene-queries-7.5.0.jar.sha1 new file mode 100644 index 0000000000000..1c6c12f5b563d --- /dev/null +++ b/server/licenses/lucene-queries-7.5.0.jar.sha1 @@ -0,0 +1 @@ +bfbf786b75c60a25daf33d389efd6458e17218d9 \ No newline at end of file diff --git a/server/licenses/lucene-queries-7.6.0-snapshot-f9598f335b.jar.sha1 b/server/licenses/lucene-queries-7.6.0-snapshot-f9598f335b.jar.sha1 deleted file mode 100644 index 221e60a9fd14a..0000000000000 --- a/server/licenses/lucene-queries-7.6.0-snapshot-f9598f335b.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -12ecd339212886c2b37934ef2a3af4c85d89b4e3 \ No newline at end of file diff --git a/server/licenses/lucene-queryparser-7.5.0.jar.sha1 b/server/licenses/lucene-queryparser-7.5.0.jar.sha1 new file mode 100644 index 0000000000000..d5fb221371a2a --- /dev/null +++ b/server/licenses/lucene-queryparser-7.5.0.jar.sha1 @@ -0,0 +1 @@ +3eefb522e150f2ba0009df20f3bcfa91d60e7090 \ No newline at end of file diff --git a/server/licenses/lucene-queryparser-7.6.0-snapshot-f9598f335b.jar.sha1 b/server/licenses/lucene-queryparser-7.6.0-snapshot-f9598f335b.jar.sha1 deleted file mode 100644 index 000f3fbf36352..0000000000000 --- a/server/licenses/lucene-queryparser-7.6.0-snapshot-f9598f335b.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -a74e9bac2cd10c878cb6aa005753267958a52101 \ No newline at end of file diff --git a/server/licenses/lucene-sandbox-7.5.0.jar.sha1 b/server/licenses/lucene-sandbox-7.5.0.jar.sha1 new file mode 100644 index 0000000000000..85730c40bed38 --- /dev/null +++ b/server/licenses/lucene-sandbox-7.5.0.jar.sha1 @@ -0,0 +1 @@ +9fa3bb1c81179e112a62c0db6749767127c616bd \ No newline at end of file diff --git a/server/licenses/lucene-sandbox-7.6.0-snapshot-f9598f335b.jar.sha1 b/server/licenses/lucene-sandbox-7.6.0-snapshot-f9598f335b.jar.sha1 deleted file mode 100644 index 605843f5fd9c2..0000000000000 --- a/server/licenses/lucene-sandbox-7.6.0-snapshot-f9598f335b.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -a1bb75649b0252e4ae8f9140eb9a457b68e3f8aa \ No newline at end of file diff --git a/server/licenses/lucene-spatial-7.5.0.jar.sha1 b/server/licenses/lucene-spatial-7.5.0.jar.sha1 new file mode 100644 index 0000000000000..ad600d067e3de --- /dev/null +++ b/server/licenses/lucene-spatial-7.5.0.jar.sha1 @@ -0,0 +1 @@ +8de64a6a8ad22b5849f2ab5f824917723de7a349 \ No newline at end of file diff --git a/server/licenses/lucene-spatial-7.6.0-snapshot-f9598f335b.jar.sha1 b/server/licenses/lucene-spatial-7.6.0-snapshot-f9598f335b.jar.sha1 deleted file mode 100644 index a11485f5d86c7..0000000000000 --- a/server/licenses/lucene-spatial-7.6.0-snapshot-f9598f335b.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -38ef3c295d4d8b79490ff8e9451e4e65f3e6212e \ No newline at end of file diff --git a/server/licenses/lucene-spatial-extras-7.5.0.jar.sha1 b/server/licenses/lucene-spatial-extras-7.5.0.jar.sha1 new file mode 100644 index 0000000000000..0c3b0dd3a6b44 --- /dev/null +++ b/server/licenses/lucene-spatial-extras-7.5.0.jar.sha1 @@ -0,0 +1 @@ +b0892bbc0dc16ca07cf98897df3b3e9ed3069615 \ No newline at end of file diff --git a/server/licenses/lucene-spatial-extras-7.6.0-snapshot-f9598f335b.jar.sha1 b/server/licenses/lucene-spatial-extras-7.6.0-snapshot-f9598f335b.jar.sha1 deleted file mode 100644 index 76518e44c5466..0000000000000 --- a/server/licenses/lucene-spatial-extras-7.6.0-snapshot-f9598f335b.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ba81a0520b8e085a7890d91c9a90343d21bbbc65 \ No newline at end of file diff --git a/server/licenses/lucene-spatial3d-7.5.0.jar.sha1 b/server/licenses/lucene-spatial3d-7.5.0.jar.sha1 new file mode 100644 index 0000000000000..8ea67d1bde5f9 --- /dev/null +++ b/server/licenses/lucene-spatial3d-7.5.0.jar.sha1 @@ -0,0 +1 @@ +672920a7fb48624bcb84ce0ee67dd0c7bc080c94 \ No newline at end of file diff --git a/server/licenses/lucene-spatial3d-7.6.0-snapshot-f9598f335b.jar.sha1 b/server/licenses/lucene-spatial3d-7.6.0-snapshot-f9598f335b.jar.sha1 deleted file mode 100644 index 4598466e048f7..0000000000000 --- a/server/licenses/lucene-spatial3d-7.6.0-snapshot-f9598f335b.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -edb2e853646d236154050fa8f1e68f908e73d10a \ No newline at end of file diff --git a/server/licenses/lucene-suggest-7.5.0.jar.sha1 b/server/licenses/lucene-suggest-7.5.0.jar.sha1 new file mode 100644 index 0000000000000..8de76642e9996 --- /dev/null +++ b/server/licenses/lucene-suggest-7.5.0.jar.sha1 @@ -0,0 +1 @@ +aa7d170871711ebd4dbd367d7b8ee0f1eb5e88b7 \ No newline at end of file diff --git a/server/licenses/lucene-suggest-7.6.0-snapshot-f9598f335b.jar.sha1 b/server/licenses/lucene-suggest-7.6.0-snapshot-f9598f335b.jar.sha1 deleted file mode 100644 index 4013d790cfb1f..0000000000000 --- a/server/licenses/lucene-suggest-7.6.0-snapshot-f9598f335b.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ee715c9d8dc562b98572eb036b2aee356c23ae23 \ No newline at end of file diff --git a/server/src/main/java/org/elasticsearch/Version.java b/server/src/main/java/org/elasticsearch/Version.java index a4ab0d3907d94..3d82b51b7a633 100644 --- a/server/src/main/java/org/elasticsearch/Version.java +++ b/server/src/main/java/org/elasticsearch/Version.java @@ -187,7 +187,7 @@ public class Version implements Comparable, ToXContentFragment { public static final int V_6_5_0_ID = 6050099; public static final Version V_6_5_0 = new Version(V_6_5_0_ID, org.apache.lucene.util.Version.LUCENE_7_5_0); public static final int V_6_6_0_ID = 6060099; - public static final Version V_6_6_0 = new Version(V_6_6_0_ID, org.apache.lucene.util.Version.LUCENE_7_6_0); + public static final Version V_6_6_0 = new Version(V_6_6_0_ID, org.apache.lucene.util.Version.LUCENE_7_5_0); public static final Version CURRENT = V_6_6_0; diff --git a/server/src/main/java/org/elasticsearch/index/engine/TranslogLeafReader.java b/server/src/main/java/org/elasticsearch/index/engine/TranslogLeafReader.java index 23d1f8b4f77c2..22577362b9acc 100644 --- a/server/src/main/java/org/elasticsearch/index/engine/TranslogLeafReader.java +++ b/server/src/main/java/org/elasticsearch/index/engine/TranslogLeafReader.java @@ -57,16 +57,16 @@ final class TranslogLeafReader extends LeafReader { private final Translog.Index operation; private static final FieldInfo FAKE_SOURCE_FIELD = new FieldInfo(SourceFieldMapper.NAME, 1, false, false, false, IndexOptions.NONE, DocValuesType.NONE, -1, Collections.emptyMap(), - 0, 0, 0, false); + 0, 0, false); private static final FieldInfo FAKE_ROUTING_FIELD = new FieldInfo(RoutingFieldMapper.NAME, 2, false, false, false, IndexOptions.NONE, DocValuesType.NONE, -1, Collections.emptyMap(), - 0, 0, 0, false); + 0, 0, false); private static final FieldInfo FAKE_ID_FIELD = new FieldInfo(IdFieldMapper.NAME, 3, false, false, false, IndexOptions.NONE, DocValuesType.NONE, -1, Collections.emptyMap(), - 0, 0, 0, false); + 0, 0, false); private static final FieldInfo FAKE_UID_FIELD = new FieldInfo(UidFieldMapper.NAME, 4, false, false, false, IndexOptions.NONE, DocValuesType.NONE, -1, Collections.emptyMap(), - 0, 0, 0, false); + 0, 0, false); private final Version indexVersionCreated; TranslogLeafReader(Translog.Index operation, Version indexVersionCreated) { diff --git a/server/src/main/java/org/elasticsearch/index/mapper/MappedFieldType.java b/server/src/main/java/org/elasticsearch/index/mapper/MappedFieldType.java index 4d3a498a9ba01..cceff797520fd 100644 --- a/server/src/main/java/org/elasticsearch/index/mapper/MappedFieldType.java +++ b/server/src/main/java/org/elasticsearch/index/mapper/MappedFieldType.java @@ -448,7 +448,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."); } diff --git a/server/src/test/java/org/elasticsearch/index/mapper/DateFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/DateFieldMapperTests.java index d0f9d57a86347..a913a0f2ceb80 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/DateFieldMapperTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/DateFieldMapperTests.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().pointIndexDimensionCount()); + assertEquals(1, pointField.fieldType().pointDimensionCount()); assertEquals(8, pointField.fieldType().pointNumBytes()); assertFalse(pointField.fieldType().stored()); assertEquals(1457654400000L, pointField.numericValue().longValue()); @@ -128,7 +128,7 @@ public void testNoDocValues() throws Exception { IndexableField[] fields = doc.rootDoc().getFields("field"); assertEquals(1, fields.length); IndexableField pointField = fields[0]; - assertEquals(1, pointField.fieldType().pointIndexDimensionCount()); + assertEquals(1, pointField.fieldType().pointDimensionCount()); } public void testStore() throws Exception { @@ -150,7 +150,7 @@ public void testStore() throws Exception { IndexableField[] fields = doc.rootDoc().getFields("field"); assertEquals(3, fields.length); IndexableField pointField = fields[0]; - assertEquals(1, pointField.fieldType().pointIndexDimensionCount()); + assertEquals(1, pointField.fieldType().pointDimensionCount()); IndexableField dvField = fields[1]; assertEquals(DocValuesType.SORTED_NUMERIC, dvField.fieldType().docValuesType()); IndexableField storedField = fields[2]; @@ -304,7 +304,7 @@ public void testNullValue() throws IOException { IndexableField[] fields = doc.rootDoc().getFields("field"); assertEquals(2, fields.length); IndexableField pointField = fields[0]; - assertEquals(1, pointField.fieldType().pointIndexDimensionCount()); + assertEquals(1, pointField.fieldType().pointDimensionCount()); assertEquals(8, pointField.fieldType().pointNumBytes()); assertFalse(pointField.fieldType().stored()); assertEquals(1457654400000L, pointField.numericValue().longValue()); diff --git a/server/src/test/java/org/elasticsearch/index/mapper/IpFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/IpFieldMapperTests.java index 1ad3cb8baa839..df60333c30dc8 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/IpFieldMapperTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/IpFieldMapperTests.java @@ -78,7 +78,7 @@ public void testDefaults() throws Exception { IndexableField[] fields = doc.rootDoc().getFields("field"); assertEquals(2, fields.length); IndexableField pointField = fields[0]; - assertEquals(1, pointField.fieldType().pointIndexDimensionCount()); + assertEquals(1, pointField.fieldType().pointDimensionCount()); assertEquals(16, pointField.fieldType().pointNumBytes()); assertFalse(pointField.fieldType().stored()); assertEquals(new BytesRef(InetAddressPoint.encode(InetAddresses.forString("::1"))), pointField.binaryValue()); @@ -129,7 +129,7 @@ public void testNoDocValues() throws Exception { IndexableField[] fields = doc.rootDoc().getFields("field"); assertEquals(1, fields.length); IndexableField pointField = fields[0]; - assertEquals(1, pointField.fieldType().pointIndexDimensionCount()); + assertEquals(1, pointField.fieldType().pointDimensionCount()); assertEquals(new BytesRef(InetAddressPoint.encode(InetAddresses.forString("::1"))), pointField.binaryValue()); } @@ -152,7 +152,7 @@ public void testStore() throws Exception { IndexableField[] fields = doc.rootDoc().getFields("field"); assertEquals(3, fields.length); IndexableField pointField = fields[0]; - assertEquals(1, pointField.fieldType().pointIndexDimensionCount()); + assertEquals(1, pointField.fieldType().pointDimensionCount()); IndexableField dvField = fields[1]; assertEquals(DocValuesType.SORTED_SET, dvField.fieldType().docValuesType()); IndexableField storedField = fields[2]; @@ -240,7 +240,7 @@ public void testNullValue() throws IOException { IndexableField[] fields = doc.rootDoc().getFields("field"); assertEquals(2, fields.length); IndexableField pointField = fields[0]; - assertEquals(1, pointField.fieldType().pointIndexDimensionCount()); + assertEquals(1, pointField.fieldType().pointDimensionCount()); assertEquals(16, pointField.fieldType().pointNumBytes()); assertFalse(pointField.fieldType().stored()); assertEquals(new BytesRef(InetAddressPoint.encode(InetAddresses.forString("::1"))), pointField.binaryValue()); diff --git a/server/src/test/java/org/elasticsearch/index/mapper/IpRangeFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/IpRangeFieldMapperTests.java index 2c70b25d6a446..e16b04748a18b 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/IpRangeFieldMapperTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/IpRangeFieldMapperTests.java @@ -71,7 +71,7 @@ public void testStoreCidr() throws Exception { IndexableField dvField = fields[0]; assertEquals(DocValuesType.BINARY, dvField.fieldType().docValuesType()); IndexableField pointField = fields[1]; - assertEquals(2, pointField.fieldType().pointIndexDimensionCount()); + assertEquals(2, pointField.fieldType().pointDimensionCount()); IndexableField storedField = fields[2]; assertTrue(storedField.fieldType().stored()); String strVal = diff --git a/server/src/test/java/org/elasticsearch/index/mapper/NumberFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/NumberFieldMapperTests.java index 304d4b6aba373..02d7cea2f4362 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/NumberFieldMapperTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/NumberFieldMapperTests.java @@ -67,7 +67,7 @@ public void doTestDefaults(String type) throws Exception { IndexableField[] fields = doc.rootDoc().getFields("field"); assertEquals(2, fields.length); IndexableField pointField = fields[0]; - assertEquals(1, pointField.fieldType().pointIndexDimensionCount()); + assertEquals(1, pointField.fieldType().pointDimensionCount()); assertFalse(pointField.fieldType().stored()); assertEquals(123, pointField.numericValue().doubleValue(), 0d); IndexableField dvField = fields[1]; @@ -118,7 +118,7 @@ public void doTestNoDocValues(String type) throws Exception { IndexableField[] fields = doc.rootDoc().getFields("field"); assertEquals(1, fields.length); IndexableField pointField = fields[0]; - assertEquals(1, pointField.fieldType().pointIndexDimensionCount()); + assertEquals(1, pointField.fieldType().pointDimensionCount()); assertEquals(123, pointField.numericValue().doubleValue(), 0d); } @@ -142,7 +142,7 @@ public void doTestStore(String type) throws Exception { IndexableField[] fields = doc.rootDoc().getFields("field"); assertEquals(3, fields.length); IndexableField pointField = fields[0]; - assertEquals(1, pointField.fieldType().pointIndexDimensionCount()); + assertEquals(1, pointField.fieldType().pointDimensionCount()); assertEquals(123, pointField.numericValue().doubleValue(), 0d); IndexableField dvField = fields[1]; assertEquals(DocValuesType.SORTED_NUMERIC, dvField.fieldType().docValuesType()); @@ -171,7 +171,7 @@ public void doTestCoerce(String type) throws IOException { IndexableField[] fields = doc.rootDoc().getFields("field"); assertEquals(2, fields.length); IndexableField pointField = fields[0]; - assertEquals(1, pointField.fieldType().pointIndexDimensionCount()); + assertEquals(1, pointField.fieldType().pointDimensionCount()); assertEquals(123, pointField.numericValue().doubleValue(), 0d); IndexableField dvField = fields[1]; assertEquals(DocValuesType.SORTED_NUMERIC, dvField.fieldType().docValuesType()); @@ -345,7 +345,7 @@ protected void doTestNullValue(String type) throws IOException { IndexableField[] fields = doc.rootDoc().getFields("field"); assertEquals(2, fields.length); IndexableField pointField = fields[0]; - assertEquals(1, pointField.fieldType().pointIndexDimensionCount()); + assertEquals(1, pointField.fieldType().pointDimensionCount()); assertFalse(pointField.fieldType().stored()); assertEquals(123, pointField.numericValue().doubleValue(), 0d); IndexableField dvField = fields[1]; diff --git a/server/src/test/java/org/elasticsearch/index/mapper/RangeFieldMapperTests.java b/server/src/test/java/org/elasticsearch/index/mapper/RangeFieldMapperTests.java index 1f8b0b58af813..00068f76e753d 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/RangeFieldMapperTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/RangeFieldMapperTests.java @@ -136,7 +136,7 @@ public void doTestDefaults(String type) throws Exception { assertEquals(DocValuesType.BINARY, dvField.fieldType().docValuesType()); IndexableField pointField = fields[1]; - assertEquals(2, pointField.fieldType().pointIndexDimensionCount()); + assertEquals(2, pointField.fieldType().pointDimensionCount()); assertFalse(pointField.fieldType().stored()); } @@ -188,7 +188,7 @@ protected void doTestNoDocValues(String type) throws Exception { IndexableField[] fields = doc.rootDoc().getFields("field"); assertEquals(1, fields.length); IndexableField pointField = fields[0]; - assertEquals(2, pointField.fieldType().pointIndexDimensionCount()); + assertEquals(2, pointField.fieldType().pointDimensionCount()); } @Override @@ -216,7 +216,7 @@ protected void doTestStore(String type) throws Exception { IndexableField dvField = fields[0]; assertEquals(DocValuesType.BINARY, dvField.fieldType().docValuesType()); IndexableField pointField = fields[1]; - assertEquals(2, pointField.fieldType().pointIndexDimensionCount()); + assertEquals(2, pointField.fieldType().pointDimensionCount()); IndexableField storedField = fields[2]; assertTrue(storedField.fieldType().stored()); String strVal = "5"; @@ -255,7 +255,7 @@ public void doTestCoerce(String type) throws IOException { IndexableField dvField = fields[0]; assertEquals(DocValuesType.BINARY, dvField.fieldType().docValuesType()); IndexableField pointField = fields[1]; - assertEquals(2, pointField.fieldType().pointIndexDimensionCount()); + assertEquals(2, pointField.fieldType().pointDimensionCount()); // date_range ignores the coerce parameter and epoch_millis date format truncates floats (see issue: #14641) if (type.equals("date_range") == false) { @@ -353,7 +353,7 @@ protected void doTestNullValue(String type) throws IOException { IndexableField dvField = fields[0]; assertEquals(DocValuesType.BINARY, dvField.fieldType().docValuesType()); IndexableField pointField = fields[1]; - assertEquals(2, pointField.fieldType().pointIndexDimensionCount()); + assertEquals(2, pointField.fieldType().pointDimensionCount()); assertFalse(pointField.fieldType().stored()); storedField = fields[2]; assertTrue(storedField.fieldType().stored()); @@ -406,7 +406,7 @@ public void doTestNoBounds(String type) throws IOException { IndexableField dvField = fields[0]; assertEquals(DocValuesType.BINARY, dvField.fieldType().docValuesType()); IndexableField pointField = fields[1]; - assertEquals(2, pointField.fieldType().pointIndexDimensionCount()); + assertEquals(2, pointField.fieldType().pointDimensionCount()); assertFalse(pointField.fieldType().stored()); IndexableField storedField = fields[2]; assertTrue(storedField.fieldType().stored()); diff --git a/server/src/test/java/org/elasticsearch/search/lookup/LeafFieldsLookupTests.java b/server/src/test/java/org/elasticsearch/search/lookup/LeafFieldsLookupTests.java index 02a775983f68d..5523bcca51263 100644 --- a/server/src/test/java/org/elasticsearch/search/lookup/LeafFieldsLookupTests.java +++ b/server/src/test/java/org/elasticsearch/search/lookup/LeafFieldsLookupTests.java @@ -67,7 +67,7 @@ public void setUp() throws Exception { when(mapperService.fullName("alias")).thenReturn(fieldType); FieldInfo mockFieldInfo = new FieldInfo("field", 1, false, false, true, - IndexOptions.NONE, DocValuesType.NONE, -1, Collections.emptyMap(), 0, 0, 0, false); + IndexOptions.NONE, DocValuesType.NONE, -1, Collections.emptyMap(), 0, 0, false); LeafReader leafReader = mock(LeafReader.class); doAnswer(invocation -> { diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/snapshots/SourceOnlySnapshot.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/snapshots/SourceOnlySnapshot.java index 709d523216e07..dc4601ae82d5a 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/snapshots/SourceOnlySnapshot.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/snapshots/SourceOnlySnapshot.java @@ -197,7 +197,7 @@ private SegmentCommitInfo syncSegment(SegmentCommitInfo segmentCommitInfo, LiveD List fieldInfoCopy = new ArrayList<>(fieldInfos.size()); for (FieldInfo fieldInfo : fieldInfos) { fieldInfoCopy.add(new FieldInfo(fieldInfo.name, fieldInfo.number, - false, false, false, IndexOptions.NONE, DocValuesType.NONE, -1, fieldInfo.attributes(), 0, 0, 0, + false, false, false, IndexOptions.NONE, DocValuesType.NONE, -1, fieldInfo.attributes(), 0, 0, fieldInfo.isSoftDeletesField())); } FieldInfos newFieldInfos = new FieldInfos(fieldInfoCopy.toArray(new FieldInfo[0])); diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/authz/accesscontrol/FieldSubsetReaderTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/authz/accesscontrol/FieldSubsetReaderTests.java index 340b399dc7f23..e71b0e5e8bdc1 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/authz/accesscontrol/FieldSubsetReaderTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/authz/accesscontrol/FieldSubsetReaderTests.java @@ -148,7 +148,7 @@ public void testPoints() throws Exception { assertEquals(Integer.BYTES, points.getBytesPerDimension()); // number of dimensions - assertEquals(1, points.getNumIndexDimensions()); + assertEquals(1, points.getNumDimensions()); // walk the trees: we should see stuff in fieldA AtomicBoolean sawDoc = new AtomicBoolean(false); diff --git a/x-pack/plugin/sql/sql-action/licenses/lucene-core-7.5.0.jar.sha1 b/x-pack/plugin/sql/sql-action/licenses/lucene-core-7.5.0.jar.sha1 new file mode 100644 index 0000000000000..d3e7ba985dfed --- /dev/null +++ b/x-pack/plugin/sql/sql-action/licenses/lucene-core-7.5.0.jar.sha1 @@ -0,0 +1 @@ +736e94305e2a0e803563c5b184877df5c7d4cb69 \ No newline at end of file diff --git a/x-pack/plugin/sql/sql-action/licenses/lucene-core-7.6.0-snapshot-f9598f335b.jar.sha1 b/x-pack/plugin/sql/sql-action/licenses/lucene-core-7.6.0-snapshot-f9598f335b.jar.sha1 deleted file mode 100644 index d8d15caa0b4c3..0000000000000 --- a/x-pack/plugin/sql/sql-action/licenses/lucene-core-7.6.0-snapshot-f9598f335b.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ec080318251807172626c0ba8dc931276d52b15e \ No newline at end of file