From 9198bcf78e4ff75ddefeceebb7b139c9485e2b4c Mon Sep 17 00:00:00 2001 From: Yogesh Gaikwad <902768+bizybot@users.noreply.github.com> Date: Fri, 27 Jul 2018 12:01:52 +1000 Subject: [PATCH 1/5] [Kerberos] Avoid vagrant update on precommit (#32416) This commit avoids dependency during compile on copy keytab to be present in the generated sources so pre-commit does not stall for updating vagrant box. Closes#32387 --- x-pack/qa/kerberos-tests/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x-pack/qa/kerberos-tests/build.gradle b/x-pack/qa/kerberos-tests/build.gradle index 2981c0e4ec686..d2818bfc127e5 100644 --- a/x-pack/qa/kerberos-tests/build.gradle +++ b/x-pack/qa/kerberos-tests/build.gradle @@ -121,7 +121,7 @@ integTestRunner { if (project.rootProject.vagrantSupported == false) { integTest.enabled = false } else { - project.sourceSets.test.output.dir(generatedResources, builtBy: copyKeytabToGeneratedResources) + project.sourceSets.test.output.dir(generatedResources) integTestCluster.dependsOn krb5AddPrincipals, krb5kdcFixture, copyKeytabToGeneratedResources integTest.finalizedBy project(':test:fixtures:krb5kdc-fixture').halt } From 53ff06e621213cb007d0e03b8ec8d80431d9186a Mon Sep 17 00:00:00 2001 From: Jim Ferenczi Date: Fri, 27 Jul 2018 08:28:51 +0200 Subject: [PATCH 2/5] Upgrade to Lucene-7.5.0-snapshot-608f0277b0 (#32390) The main highlight is the removal of the reclaim_deletes_weight in the TieredMergePolicy. The es setting index.merge.policy.reclaim_deletes_weight is deprecated in this commit and the value is ignored. The new merge policy setting setDeletesPctAllowed should be added in a follow up. --- buildSrc/version.properties | 2 +- docs/Versions.asciidoc | 4 ++-- .../licenses/lucene-expressions-7.4.0.jar.sha1 | 1 - ...ne-expressions-7.5.0-snapshot-608f0277b0.jar.sha1 | 1 + plugins/analysis-icu/build.gradle | 2 +- plugins/analysis-icu/licenses/icu4j-61.1.jar.sha1 | 1 - plugins/analysis-icu/licenses/icu4j-62.1.jar.sha1 | 1 + .../licenses/lucene-analyzers-icu-7.4.0.jar.sha1 | 1 - ...-analyzers-icu-7.5.0-snapshot-608f0277b0.jar.sha1 | 1 + .../lucene-analyzers-kuromoji-7.4.0.jar.sha1 | 1 - ...yzers-kuromoji-7.5.0-snapshot-608f0277b0.jar.sha1 | 1 + .../licenses/lucene-analyzers-nori-7.4.0.jar.sha1 | 1 - ...analyzers-nori-7.5.0-snapshot-608f0277b0.jar.sha1 | 1 + .../lucene-analyzers-phonetic-7.4.0.jar.sha1 | 1 - ...yzers-phonetic-7.5.0-snapshot-608f0277b0.jar.sha1 | 1 + .../licenses/lucene-analyzers-smartcn-7.4.0.jar.sha1 | 1 - ...lyzers-smartcn-7.5.0-snapshot-608f0277b0.jar.sha1 | 1 + .../licenses/lucene-analyzers-stempel-7.4.0.jar.sha1 | 1 - ...lyzers-stempel-7.5.0-snapshot-608f0277b0.jar.sha1 | 1 + .../lucene-analyzers-morfologik-7.4.0.jar.sha1 | 1 - ...ers-morfologik-7.5.0-snapshot-608f0277b0.jar.sha1 | 1 + .../index/store/SmbMMapDirectoryTests.java | 8 ++++++++ .../index/store/SmbSimpleFSDirectoryTests.java | 8 ++++++++ .../licenses/lucene-analyzers-common-7.4.0.jar.sha1 | 1 - ...alyzers-common-7.5.0-snapshot-608f0277b0.jar.sha1 | 1 + .../licenses/lucene-backward-codecs-7.4.0.jar.sha1 | 1 - ...ackward-codecs-7.5.0-snapshot-608f0277b0.jar.sha1 | 1 + server/licenses/lucene-core-7.4.0.jar.sha1 | 1 - .../lucene-core-7.5.0-snapshot-608f0277b0.jar.sha1 | 1 + server/licenses/lucene-grouping-7.4.0.jar.sha1 | 1 - ...ucene-grouping-7.5.0-snapshot-608f0277b0.jar.sha1 | 1 + server/licenses/lucene-highlighter-7.4.0.jar.sha1 | 1 - ...ne-highlighter-7.5.0-snapshot-608f0277b0.jar.sha1 | 1 + server/licenses/lucene-join-7.4.0.jar.sha1 | 1 - .../lucene-join-7.5.0-snapshot-608f0277b0.jar.sha1 | 1 + server/licenses/lucene-memory-7.4.0.jar.sha1 | 1 - .../lucene-memory-7.5.0-snapshot-608f0277b0.jar.sha1 | 1 + server/licenses/lucene-misc-7.4.0.jar.sha1 | 1 - .../lucene-misc-7.5.0-snapshot-608f0277b0.jar.sha1 | 1 + server/licenses/lucene-queries-7.4.0.jar.sha1 | 1 - ...lucene-queries-7.5.0-snapshot-608f0277b0.jar.sha1 | 1 + server/licenses/lucene-queryparser-7.4.0.jar.sha1 | 1 - ...ne-queryparser-7.5.0-snapshot-608f0277b0.jar.sha1 | 1 + server/licenses/lucene-sandbox-7.4.0.jar.sha1 | 1 - ...lucene-sandbox-7.5.0-snapshot-608f0277b0.jar.sha1 | 1 + server/licenses/lucene-spatial-7.4.0.jar.sha1 | 1 - ...lucene-spatial-7.5.0-snapshot-608f0277b0.jar.sha1 | 1 + server/licenses/lucene-spatial-extras-7.4.0.jar.sha1 | 1 - ...spatial-extras-7.5.0-snapshot-608f0277b0.jar.sha1 | 1 + server/licenses/lucene-spatial3d-7.4.0.jar.sha1 | 1 - ...cene-spatial3d-7.5.0-snapshot-608f0277b0.jar.sha1 | 1 + server/licenses/lucene-suggest-7.4.0.jar.sha1 | 1 - ...lucene-suggest-7.5.0-snapshot-608f0277b0.jar.sha1 | 1 + server/src/main/java/org/elasticsearch/Version.java | 2 +- .../org/elasticsearch/index/EsTieredMergePolicy.java | 11 +---------- .../java/org/elasticsearch/index/IndexSettings.java | 1 - .../org/elasticsearch/index/MergePolicyConfig.java | 7 +------ .../index/EsTieredMergePolicyTests.java | 12 ++---------- .../index/MergePolicySettingsTests.java | 5 ----- .../sql-action/licenses/lucene-core-7.4.0.jar.sha1 | 1 - .../lucene-core-7.5.0-snapshot-608f0277b0.jar.sha1 | 1 + 61 files changed, 50 insertions(+), 62 deletions(-) delete mode 100644 modules/lang-expression/licenses/lucene-expressions-7.4.0.jar.sha1 create mode 100644 modules/lang-expression/licenses/lucene-expressions-7.5.0-snapshot-608f0277b0.jar.sha1 delete mode 100644 plugins/analysis-icu/licenses/icu4j-61.1.jar.sha1 create mode 100644 plugins/analysis-icu/licenses/icu4j-62.1.jar.sha1 delete mode 100644 plugins/analysis-icu/licenses/lucene-analyzers-icu-7.4.0.jar.sha1 create mode 100644 plugins/analysis-icu/licenses/lucene-analyzers-icu-7.5.0-snapshot-608f0277b0.jar.sha1 delete mode 100644 plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-7.4.0.jar.sha1 create mode 100644 plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-7.5.0-snapshot-608f0277b0.jar.sha1 delete mode 100644 plugins/analysis-nori/licenses/lucene-analyzers-nori-7.4.0.jar.sha1 create mode 100644 plugins/analysis-nori/licenses/lucene-analyzers-nori-7.5.0-snapshot-608f0277b0.jar.sha1 delete mode 100644 plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-7.4.0.jar.sha1 create mode 100644 plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-7.5.0-snapshot-608f0277b0.jar.sha1 delete mode 100644 plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-7.4.0.jar.sha1 create mode 100644 plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-7.5.0-snapshot-608f0277b0.jar.sha1 delete mode 100644 plugins/analysis-stempel/licenses/lucene-analyzers-stempel-7.4.0.jar.sha1 create mode 100644 plugins/analysis-stempel/licenses/lucene-analyzers-stempel-7.5.0-snapshot-608f0277b0.jar.sha1 delete mode 100644 plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-7.4.0.jar.sha1 create mode 100644 plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-7.5.0-snapshot-608f0277b0.jar.sha1 delete mode 100644 server/licenses/lucene-analyzers-common-7.4.0.jar.sha1 create mode 100644 server/licenses/lucene-analyzers-common-7.5.0-snapshot-608f0277b0.jar.sha1 delete mode 100644 server/licenses/lucene-backward-codecs-7.4.0.jar.sha1 create mode 100644 server/licenses/lucene-backward-codecs-7.5.0-snapshot-608f0277b0.jar.sha1 delete mode 100644 server/licenses/lucene-core-7.4.0.jar.sha1 create mode 100644 server/licenses/lucene-core-7.5.0-snapshot-608f0277b0.jar.sha1 delete mode 100644 server/licenses/lucene-grouping-7.4.0.jar.sha1 create mode 100644 server/licenses/lucene-grouping-7.5.0-snapshot-608f0277b0.jar.sha1 delete mode 100644 server/licenses/lucene-highlighter-7.4.0.jar.sha1 create mode 100644 server/licenses/lucene-highlighter-7.5.0-snapshot-608f0277b0.jar.sha1 delete mode 100644 server/licenses/lucene-join-7.4.0.jar.sha1 create mode 100644 server/licenses/lucene-join-7.5.0-snapshot-608f0277b0.jar.sha1 delete mode 100644 server/licenses/lucene-memory-7.4.0.jar.sha1 create mode 100644 server/licenses/lucene-memory-7.5.0-snapshot-608f0277b0.jar.sha1 delete mode 100644 server/licenses/lucene-misc-7.4.0.jar.sha1 create mode 100644 server/licenses/lucene-misc-7.5.0-snapshot-608f0277b0.jar.sha1 delete mode 100644 server/licenses/lucene-queries-7.4.0.jar.sha1 create mode 100644 server/licenses/lucene-queries-7.5.0-snapshot-608f0277b0.jar.sha1 delete mode 100644 server/licenses/lucene-queryparser-7.4.0.jar.sha1 create mode 100644 server/licenses/lucene-queryparser-7.5.0-snapshot-608f0277b0.jar.sha1 delete mode 100644 server/licenses/lucene-sandbox-7.4.0.jar.sha1 create mode 100644 server/licenses/lucene-sandbox-7.5.0-snapshot-608f0277b0.jar.sha1 delete mode 100644 server/licenses/lucene-spatial-7.4.0.jar.sha1 create mode 100644 server/licenses/lucene-spatial-7.5.0-snapshot-608f0277b0.jar.sha1 delete mode 100644 server/licenses/lucene-spatial-extras-7.4.0.jar.sha1 create mode 100644 server/licenses/lucene-spatial-extras-7.5.0-snapshot-608f0277b0.jar.sha1 delete mode 100644 server/licenses/lucene-spatial3d-7.4.0.jar.sha1 create mode 100644 server/licenses/lucene-spatial3d-7.5.0-snapshot-608f0277b0.jar.sha1 delete mode 100644 server/licenses/lucene-suggest-7.4.0.jar.sha1 create mode 100644 server/licenses/lucene-suggest-7.5.0-snapshot-608f0277b0.jar.sha1 delete mode 100644 x-pack/plugin/sql/sql-action/licenses/lucene-core-7.4.0.jar.sha1 create mode 100644 x-pack/plugin/sql/sql-action/licenses/lucene-core-7.5.0-snapshot-608f0277b0.jar.sha1 diff --git a/buildSrc/version.properties b/buildSrc/version.properties index 17e5cb5ff01f5..023d5d5b8dc2b 100644 --- a/buildSrc/version.properties +++ b/buildSrc/version.properties @@ -1,5 +1,5 @@ elasticsearch = 7.0.0-alpha1 -lucene = 7.4.0 +lucene = 7.5.0-snapshot-608f0277b0 # optional dependencies spatial4j = 0.7 diff --git a/docs/Versions.asciidoc b/docs/Versions.asciidoc index 948a3387f0350..6e127a6ccfc69 100644 --- a/docs/Versions.asciidoc +++ b/docs/Versions.asciidoc @@ -1,7 +1,7 @@ :version: 7.0.0-alpha1 :major-version: 7.x -:lucene_version: 7.4.0 -:lucene_version_path: 7_4_0 +:lucene_version: 7.5.0 +:lucene_version_path: 7_5_0 :branch: master :jdk: 1.8.0_131 :jdk_major: 8 diff --git a/modules/lang-expression/licenses/lucene-expressions-7.4.0.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-7.4.0.jar.sha1 deleted file mode 100644 index 2b14a61f264fa..0000000000000 --- a/modules/lang-expression/licenses/lucene-expressions-7.4.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -9f0a326f7ec1671ffb07f95b27f1a5812b7dc1c3 \ No newline at end of file diff --git a/modules/lang-expression/licenses/lucene-expressions-7.5.0-snapshot-608f0277b0.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-7.5.0-snapshot-608f0277b0.jar.sha1 new file mode 100644 index 0000000000000..908f70131b39d --- /dev/null +++ b/modules/lang-expression/licenses/lucene-expressions-7.5.0-snapshot-608f0277b0.jar.sha1 @@ -0,0 +1 @@ +bd7d8078a2d0ad11a24f54156cc015630c96858a \ No newline at end of file diff --git a/plugins/analysis-icu/build.gradle b/plugins/analysis-icu/build.gradle index 4d6f9310cdd03..ad5a7b7c57b61 100644 --- a/plugins/analysis-icu/build.gradle +++ b/plugins/analysis-icu/build.gradle @@ -30,7 +30,7 @@ forbiddenApis { dependencies { compile "org.apache.lucene:lucene-analyzers-icu:${versions.lucene}" - compile 'com.ibm.icu:icu4j:61.1' + compile 'com.ibm.icu:icu4j:62.1' } dependencyLicenses { diff --git a/plugins/analysis-icu/licenses/icu4j-61.1.jar.sha1 b/plugins/analysis-icu/licenses/icu4j-61.1.jar.sha1 deleted file mode 100644 index 7b7fcfe1c794b..0000000000000 --- a/plugins/analysis-icu/licenses/icu4j-61.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -28d33b5e44e72edcc66a5da7a34a42147f38d987 \ No newline at end of file diff --git a/plugins/analysis-icu/licenses/icu4j-62.1.jar.sha1 b/plugins/analysis-icu/licenses/icu4j-62.1.jar.sha1 new file mode 100644 index 0000000000000..c24c69cf4b90f --- /dev/null +++ b/plugins/analysis-icu/licenses/icu4j-62.1.jar.sha1 @@ -0,0 +1 @@ +7a4d00d5ec5febd252a6182e8b6e87a0a9821f81 \ No newline at end of file diff --git a/plugins/analysis-icu/licenses/lucene-analyzers-icu-7.4.0.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analyzers-icu-7.4.0.jar.sha1 deleted file mode 100644 index b5291b30c7de8..0000000000000 --- a/plugins/analysis-icu/licenses/lucene-analyzers-icu-7.4.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -394e811e9d9bf0b9fba837f7ceca9e8f3e39d1c2 \ No newline at end of file diff --git a/plugins/analysis-icu/licenses/lucene-analyzers-icu-7.5.0-snapshot-608f0277b0.jar.sha1 b/plugins/analysis-icu/licenses/lucene-analyzers-icu-7.5.0-snapshot-608f0277b0.jar.sha1 new file mode 100644 index 0000000000000..5b6947a9c7578 --- /dev/null +++ b/plugins/analysis-icu/licenses/lucene-analyzers-icu-7.5.0-snapshot-608f0277b0.jar.sha1 @@ -0,0 +1 @@ +7a37816def72a748416c4ae8b0f6817e30efb99f \ No newline at end of file diff --git a/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-7.4.0.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-7.4.0.jar.sha1 deleted file mode 100644 index 49f55bea5e687..0000000000000 --- a/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-7.4.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -5cd56acfa16ba20e19b5d21d90b510eada841431 \ No newline at end of file diff --git a/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-7.5.0-snapshot-608f0277b0.jar.sha1 b/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-7.5.0-snapshot-608f0277b0.jar.sha1 new file mode 100644 index 0000000000000..d39638c188466 --- /dev/null +++ b/plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-7.5.0-snapshot-608f0277b0.jar.sha1 @@ -0,0 +1 @@ +ca7437178cdbf7b8bfe0d75c75e3c8eb93925724 \ No newline at end of file diff --git a/plugins/analysis-nori/licenses/lucene-analyzers-nori-7.4.0.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analyzers-nori-7.4.0.jar.sha1 deleted file mode 100644 index c4b61b763b483..0000000000000 --- a/plugins/analysis-nori/licenses/lucene-analyzers-nori-7.4.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -db7b56f4cf533ad9022d2312c5ee48331edccca3 \ No newline at end of file diff --git a/plugins/analysis-nori/licenses/lucene-analyzers-nori-7.5.0-snapshot-608f0277b0.jar.sha1 b/plugins/analysis-nori/licenses/lucene-analyzers-nori-7.5.0-snapshot-608f0277b0.jar.sha1 new file mode 100644 index 0000000000000..21c25d2bb2404 --- /dev/null +++ b/plugins/analysis-nori/licenses/lucene-analyzers-nori-7.5.0-snapshot-608f0277b0.jar.sha1 @@ -0,0 +1 @@ +3f5dec44f380d6d58bc1c8aec51964fcb5390b60 \ No newline at end of file diff --git a/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-7.4.0.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-7.4.0.jar.sha1 deleted file mode 100644 index 779cac9761242..0000000000000 --- a/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-7.4.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -e8dba4d28a595eab2e8fb6095d1ac5f2d3872144 \ No newline at end of file diff --git a/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-7.5.0-snapshot-608f0277b0.jar.sha1 b/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-7.5.0-snapshot-608f0277b0.jar.sha1 new file mode 100644 index 0000000000000..f58c597eadd6d --- /dev/null +++ b/plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-7.5.0-snapshot-608f0277b0.jar.sha1 @@ -0,0 +1 @@ +453bf1d60df0415439095624e0b3e42492ad4716 \ No newline at end of file diff --git a/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-7.4.0.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-7.4.0.jar.sha1 deleted file mode 100644 index cf5c49a2759c9..0000000000000 --- a/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-7.4.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -1243c771ee824c46a3d66ae3e4256d919fc06fbe \ No newline at end of file diff --git a/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-7.5.0-snapshot-608f0277b0.jar.sha1 b/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-7.5.0-snapshot-608f0277b0.jar.sha1 new file mode 100644 index 0000000000000..8ccec8dbf3786 --- /dev/null +++ b/plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-7.5.0-snapshot-608f0277b0.jar.sha1 @@ -0,0 +1 @@ +70095a45257bca9f46629b5fb6cedf9eff5e2b07 \ No newline at end of file diff --git a/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-7.4.0.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-7.4.0.jar.sha1 deleted file mode 100644 index 830b9ccf9cbe2..0000000000000 --- a/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-7.4.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -c783794b0d20d8dc1285edc7701f386b1f0e2fb8 \ No newline at end of file diff --git a/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-7.5.0-snapshot-608f0277b0.jar.sha1 b/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-7.5.0-snapshot-608f0277b0.jar.sha1 new file mode 100644 index 0000000000000..ec9c33119f556 --- /dev/null +++ b/plugins/analysis-stempel/licenses/lucene-analyzers-stempel-7.5.0-snapshot-608f0277b0.jar.sha1 @@ -0,0 +1 @@ +7199d6962d268b7877f7b5160e98e4ff21cce5c7 \ No newline at end of file diff --git a/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-7.4.0.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-7.4.0.jar.sha1 deleted file mode 100644 index a96e05f5e3b87..0000000000000 --- a/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-7.4.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -9438efa504a89afb6cb4c66448c257f865164d23 \ No newline at end of file diff --git a/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-7.5.0-snapshot-608f0277b0.jar.sha1 b/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-7.5.0-snapshot-608f0277b0.jar.sha1 new file mode 100644 index 0000000000000..ba9148ef1b32a --- /dev/null +++ b/plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-7.5.0-snapshot-608f0277b0.jar.sha1 @@ -0,0 +1 @@ +12aff508d39d206a1aead5013ecd11882062eb06 \ No newline at end of file diff --git a/plugins/store-smb/src/test/java/org/elasticsearch/index/store/SmbMMapDirectoryTests.java b/plugins/store-smb/src/test/java/org/elasticsearch/index/store/SmbMMapDirectoryTests.java index 3dad35adaa207..f4f6bed7f0406 100644 --- a/plugins/store-smb/src/test/java/org/elasticsearch/index/store/SmbMMapDirectoryTests.java +++ b/plugins/store-smb/src/test/java/org/elasticsearch/index/store/SmbMMapDirectoryTests.java @@ -30,4 +30,12 @@ public class SmbMMapDirectoryTests extends EsBaseDirectoryTestCase { protected Directory getDirectory(Path file) throws IOException { return new SmbDirectoryWrapper(new MMapDirectory(file)); } + + @Override + public void testCreateOutputForExistingFile() throws IOException { + /** + * This test is disabled because {@link SmbDirectoryWrapper} opens existing file + * with an explicit StandardOpenOption.TRUNCATE_EXISTING option. + */ + } } diff --git a/plugins/store-smb/src/test/java/org/elasticsearch/index/store/SmbSimpleFSDirectoryTests.java b/plugins/store-smb/src/test/java/org/elasticsearch/index/store/SmbSimpleFSDirectoryTests.java index 659f6eff7ac75..c20b3bc28635b 100644 --- a/plugins/store-smb/src/test/java/org/elasticsearch/index/store/SmbSimpleFSDirectoryTests.java +++ b/plugins/store-smb/src/test/java/org/elasticsearch/index/store/SmbSimpleFSDirectoryTests.java @@ -30,4 +30,12 @@ public class SmbSimpleFSDirectoryTests extends EsBaseDirectoryTestCase { protected Directory getDirectory(Path file) throws IOException { return new SmbDirectoryWrapper(new SimpleFSDirectory(file)); } + + @Override + public void testCreateOutputForExistingFile() throws IOException { + /** + * This test is disabled because {@link SmbDirectoryWrapper} opens existing file + * with an explicit StandardOpenOption.TRUNCATE_EXISTING option. + */ + } } diff --git a/server/licenses/lucene-analyzers-common-7.4.0.jar.sha1 b/server/licenses/lucene-analyzers-common-7.4.0.jar.sha1 deleted file mode 100644 index 928cc6dea046c..0000000000000 --- a/server/licenses/lucene-analyzers-common-7.4.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -e1afb580df500626a1c695e0fc9a7e8a8f58bcac \ No newline at end of file diff --git a/server/licenses/lucene-analyzers-common-7.5.0-snapshot-608f0277b0.jar.sha1 b/server/licenses/lucene-analyzers-common-7.5.0-snapshot-608f0277b0.jar.sha1 new file mode 100644 index 0000000000000..8b2a098a3a2eb --- /dev/null +++ b/server/licenses/lucene-analyzers-common-7.5.0-snapshot-608f0277b0.jar.sha1 @@ -0,0 +1 @@ +d27958843ca118db2ffd2c242ae3761bd5a47328 \ No newline at end of file diff --git a/server/licenses/lucene-backward-codecs-7.4.0.jar.sha1 b/server/licenses/lucene-backward-codecs-7.4.0.jar.sha1 deleted file mode 100644 index a94663119e7d6..0000000000000 --- a/server/licenses/lucene-backward-codecs-7.4.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -a6ad941ef1fdad48673ed511631b7e48a9456bf7 \ No newline at end of file diff --git a/server/licenses/lucene-backward-codecs-7.5.0-snapshot-608f0277b0.jar.sha1 b/server/licenses/lucene-backward-codecs-7.5.0-snapshot-608f0277b0.jar.sha1 new file mode 100644 index 0000000000000..d8496a0a86ae2 --- /dev/null +++ b/server/licenses/lucene-backward-codecs-7.5.0-snapshot-608f0277b0.jar.sha1 @@ -0,0 +1 @@ +7ea220ba8e4accb8b04e280463042ad470e23bc0 \ No newline at end of file diff --git a/server/licenses/lucene-core-7.4.0.jar.sha1 b/server/licenses/lucene-core-7.4.0.jar.sha1 deleted file mode 100644 index 80ba6c76aa301..0000000000000 --- a/server/licenses/lucene-core-7.4.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -730d9ac80436c8cbc0b2a8a749259be536b97316 \ No newline at end of file diff --git a/server/licenses/lucene-core-7.5.0-snapshot-608f0277b0.jar.sha1 b/server/licenses/lucene-core-7.5.0-snapshot-608f0277b0.jar.sha1 new file mode 100644 index 0000000000000..d38fb392c350b --- /dev/null +++ b/server/licenses/lucene-core-7.5.0-snapshot-608f0277b0.jar.sha1 @@ -0,0 +1 @@ +471096d6e92338b208aa91f3a85feb2f9cfc4afd \ No newline at end of file diff --git a/server/licenses/lucene-grouping-7.4.0.jar.sha1 b/server/licenses/lucene-grouping-7.4.0.jar.sha1 deleted file mode 100644 index 5b781d26829ed..0000000000000 --- a/server/licenses/lucene-grouping-7.4.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -56f99858a4421a517b52da36a222debcccab80c6 \ No newline at end of file diff --git a/server/licenses/lucene-grouping-7.5.0-snapshot-608f0277b0.jar.sha1 b/server/licenses/lucene-grouping-7.5.0-snapshot-608f0277b0.jar.sha1 new file mode 100644 index 0000000000000..7f83082fa0c1d --- /dev/null +++ b/server/licenses/lucene-grouping-7.5.0-snapshot-608f0277b0.jar.sha1 @@ -0,0 +1 @@ +f0af947c60d24f779c22f774e81ebd7dd91cc932 \ No newline at end of file diff --git a/server/licenses/lucene-highlighter-7.4.0.jar.sha1 b/server/licenses/lucene-highlighter-7.4.0.jar.sha1 deleted file mode 100644 index e1ebb95fe1b05..0000000000000 --- a/server/licenses/lucene-highlighter-7.4.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -5266b45d7f049662817d739881765904621876d0 \ No newline at end of file diff --git a/server/licenses/lucene-highlighter-7.5.0-snapshot-608f0277b0.jar.sha1 b/server/licenses/lucene-highlighter-7.5.0-snapshot-608f0277b0.jar.sha1 new file mode 100644 index 0000000000000..6b9f2cb724dd0 --- /dev/null +++ b/server/licenses/lucene-highlighter-7.5.0-snapshot-608f0277b0.jar.sha1 @@ -0,0 +1 @@ +fbc83ac5a0139ed7e7faf6c95a2718f46f28c641 \ No newline at end of file diff --git a/server/licenses/lucene-join-7.4.0.jar.sha1 b/server/licenses/lucene-join-7.4.0.jar.sha1 deleted file mode 100644 index ff81c33c3f860..0000000000000 --- a/server/licenses/lucene-join-7.4.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -c77154d18c4944ceb6ce0741060632f57d623fdc \ No newline at end of file diff --git a/server/licenses/lucene-join-7.5.0-snapshot-608f0277b0.jar.sha1 b/server/licenses/lucene-join-7.5.0-snapshot-608f0277b0.jar.sha1 new file mode 100644 index 0000000000000..a085943140ec2 --- /dev/null +++ b/server/licenses/lucene-join-7.5.0-snapshot-608f0277b0.jar.sha1 @@ -0,0 +1 @@ +30adfe493982b0db059dc243e269eea38d850d46 \ No newline at end of file diff --git a/server/licenses/lucene-memory-7.4.0.jar.sha1 b/server/licenses/lucene-memory-7.4.0.jar.sha1 deleted file mode 100644 index 7c0117dff6b68..0000000000000 --- a/server/licenses/lucene-memory-7.4.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -186ff981feec1bdbf1a6236e786ec171b5fbe3e0 \ No newline at end of file diff --git a/server/licenses/lucene-memory-7.5.0-snapshot-608f0277b0.jar.sha1 b/server/licenses/lucene-memory-7.5.0-snapshot-608f0277b0.jar.sha1 new file mode 100644 index 0000000000000..7acc70be15182 --- /dev/null +++ b/server/licenses/lucene-memory-7.5.0-snapshot-608f0277b0.jar.sha1 @@ -0,0 +1 @@ +656f304261d9aad05070fb68593beffafe9147e3 \ No newline at end of file diff --git a/server/licenses/lucene-misc-7.4.0.jar.sha1 b/server/licenses/lucene-misc-7.4.0.jar.sha1 deleted file mode 100644 index 5cdf6810fa57c..0000000000000 --- a/server/licenses/lucene-misc-7.4.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -bf844bb6f6d84da19e8c79ce5fbb4cf6d00f2611 \ No newline at end of file diff --git a/server/licenses/lucene-misc-7.5.0-snapshot-608f0277b0.jar.sha1 b/server/licenses/lucene-misc-7.5.0-snapshot-608f0277b0.jar.sha1 new file mode 100644 index 0000000000000..e46b138ba7b21 --- /dev/null +++ b/server/licenses/lucene-misc-7.5.0-snapshot-608f0277b0.jar.sha1 @@ -0,0 +1 @@ +8bf22ad81a7480c255b55bada401eb131bfdb4df \ No newline at end of file diff --git a/server/licenses/lucene-queries-7.4.0.jar.sha1 b/server/licenses/lucene-queries-7.4.0.jar.sha1 deleted file mode 100644 index 198890379374f..0000000000000 --- a/server/licenses/lucene-queries-7.4.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -229a50e6d9d4db076f671c230d493000c6e2972c \ No newline at end of file diff --git a/server/licenses/lucene-queries-7.5.0-snapshot-608f0277b0.jar.sha1 b/server/licenses/lucene-queries-7.5.0-snapshot-608f0277b0.jar.sha1 new file mode 100644 index 0000000000000..a7114feef6282 --- /dev/null +++ b/server/licenses/lucene-queries-7.5.0-snapshot-608f0277b0.jar.sha1 @@ -0,0 +1 @@ +edb3de4d68a34c1e1ca08f79fe4d103b10e98ad1 \ No newline at end of file diff --git a/server/licenses/lucene-queryparser-7.4.0.jar.sha1 b/server/licenses/lucene-queryparser-7.4.0.jar.sha1 deleted file mode 100644 index afdc275afe2b3..0000000000000 --- a/server/licenses/lucene-queryparser-7.4.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -8e58add0d0c39df97d07c8e343041989bf4b3a3f \ No newline at end of file diff --git a/server/licenses/lucene-queryparser-7.5.0-snapshot-608f0277b0.jar.sha1 b/server/licenses/lucene-queryparser-7.5.0-snapshot-608f0277b0.jar.sha1 new file mode 100644 index 0000000000000..cf3011c9a45d0 --- /dev/null +++ b/server/licenses/lucene-queryparser-7.5.0-snapshot-608f0277b0.jar.sha1 @@ -0,0 +1 @@ +7ece30d5f1e18d96f61644451c858c3d9960558f \ No newline at end of file diff --git a/server/licenses/lucene-sandbox-7.4.0.jar.sha1 b/server/licenses/lucene-sandbox-7.4.0.jar.sha1 deleted file mode 100644 index 81ae3bddd0709..0000000000000 --- a/server/licenses/lucene-sandbox-7.4.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -1692604fa06a945d1ee19939022ef1a912235db3 \ No newline at end of file diff --git a/server/licenses/lucene-sandbox-7.5.0-snapshot-608f0277b0.jar.sha1 b/server/licenses/lucene-sandbox-7.5.0-snapshot-608f0277b0.jar.sha1 new file mode 100644 index 0000000000000..30513e58bf6bb --- /dev/null +++ b/server/licenses/lucene-sandbox-7.5.0-snapshot-608f0277b0.jar.sha1 @@ -0,0 +1 @@ +ad3bd0c2ed96556193c7215bef328e689d0b157f \ No newline at end of file diff --git a/server/licenses/lucene-spatial-7.4.0.jar.sha1 b/server/licenses/lucene-spatial-7.4.0.jar.sha1 deleted file mode 100644 index cc3f31340b9a2..0000000000000 --- a/server/licenses/lucene-spatial-7.4.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -847d2f897961124e2fc7d5e55d8309635bb026bc \ No newline at end of file diff --git a/server/licenses/lucene-spatial-7.5.0-snapshot-608f0277b0.jar.sha1 b/server/licenses/lucene-spatial-7.5.0-snapshot-608f0277b0.jar.sha1 new file mode 100644 index 0000000000000..6146b055c13f0 --- /dev/null +++ b/server/licenses/lucene-spatial-7.5.0-snapshot-608f0277b0.jar.sha1 @@ -0,0 +1 @@ +8a6bd97e39ee5af60126adbe8c8375dc41b1ea8e \ No newline at end of file diff --git a/server/licenses/lucene-spatial-extras-7.4.0.jar.sha1 b/server/licenses/lucene-spatial-extras-7.4.0.jar.sha1 deleted file mode 100644 index 3f05790e430f5..0000000000000 --- a/server/licenses/lucene-spatial-extras-7.4.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -586892eefc0546643d7f5d7f83659c7db0d534ff \ No newline at end of file diff --git a/server/licenses/lucene-spatial-extras-7.5.0-snapshot-608f0277b0.jar.sha1 b/server/licenses/lucene-spatial-extras-7.5.0-snapshot-608f0277b0.jar.sha1 new file mode 100644 index 0000000000000..c812f0449271d --- /dev/null +++ b/server/licenses/lucene-spatial-extras-7.5.0-snapshot-608f0277b0.jar.sha1 @@ -0,0 +1 @@ +07e748d2d80000a7a213f3405b82b6e26b452948 \ No newline at end of file diff --git a/server/licenses/lucene-spatial3d-7.4.0.jar.sha1 b/server/licenses/lucene-spatial3d-7.4.0.jar.sha1 deleted file mode 100644 index 8c767b16c538b..0000000000000 --- a/server/licenses/lucene-spatial3d-7.4.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -32cd2854f39ff453a5d128ce40e11eea4168abbf \ No newline at end of file diff --git a/server/licenses/lucene-spatial3d-7.5.0-snapshot-608f0277b0.jar.sha1 b/server/licenses/lucene-spatial3d-7.5.0-snapshot-608f0277b0.jar.sha1 new file mode 100644 index 0000000000000..b5ad83ac9fe13 --- /dev/null +++ b/server/licenses/lucene-spatial3d-7.5.0-snapshot-608f0277b0.jar.sha1 @@ -0,0 +1 @@ +fd737bd5562f3943618ee7e73a0aaffb6319fdb2 \ No newline at end of file diff --git a/server/licenses/lucene-suggest-7.4.0.jar.sha1 b/server/licenses/lucene-suggest-7.4.0.jar.sha1 deleted file mode 100644 index 59d59cf79413a..0000000000000 --- a/server/licenses/lucene-suggest-7.4.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -0cdc1a512032f8b23dd4b1add0f5cd06325addc3 \ No newline at end of file diff --git a/server/licenses/lucene-suggest-7.5.0-snapshot-608f0277b0.jar.sha1 b/server/licenses/lucene-suggest-7.5.0-snapshot-608f0277b0.jar.sha1 new file mode 100644 index 0000000000000..452b96420f8d7 --- /dev/null +++ b/server/licenses/lucene-suggest-7.5.0-snapshot-608f0277b0.jar.sha1 @@ -0,0 +1 @@ +ff3f260d1dc8c18bc67f3c33aa84a0ad290daac5 \ 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 1fefbad0d7406..e2ade3396189c 100644 --- a/server/src/main/java/org/elasticsearch/Version.java +++ b/server/src/main/java/org/elasticsearch/Version.java @@ -182,7 +182,7 @@ public class Version implements Comparable, ToXContentFragment { public static final Version V_6_5_0 = new Version(V_6_5_0_ID, org.apache.lucene.util.Version.LUCENE_7_4_0); public static final int V_7_0_0_alpha1_ID = 7000001; public static final Version V_7_0_0_alpha1 = - new Version(V_7_0_0_alpha1_ID, org.apache.lucene.util.Version.LUCENE_7_4_0); + new Version(V_7_0_0_alpha1_ID, org.apache.lucene.util.Version.LUCENE_7_5_0); public static final Version CURRENT = V_7_0_0_alpha1; static { diff --git a/server/src/main/java/org/elasticsearch/index/EsTieredMergePolicy.java b/server/src/main/java/org/elasticsearch/index/EsTieredMergePolicy.java index 27a8396190362..68edf3a9b1881 100644 --- a/server/src/main/java/org/elasticsearch/index/EsTieredMergePolicy.java +++ b/server/src/main/java/org/elasticsearch/index/EsTieredMergePolicy.java @@ -52,7 +52,7 @@ public MergeSpecification findForcedMerges(SegmentInfos infos, int maxSegmentCou @Override public MergeSpecification findForcedDeletesMerges(SegmentInfos infos, MergeContext mergeContext) throws IOException { - return forcedMergePolicy.findForcedDeletesMerges(infos, mergeContext); + return forcedMergePolicy.findForcedDeletesMerges(infos, mergeContext); } public void setForceMergeDeletesPctAllowed(double forceMergeDeletesPctAllowed) { @@ -108,13 +108,4 @@ public void setSegmentsPerTier(double segmentsPerTier) { public double getSegmentsPerTier() { return regularMergePolicy.getSegmentsPerTier(); } - - public void setReclaimDeletesWeight(double reclaimDeletesWeight) { - regularMergePolicy.setReclaimDeletesWeight(reclaimDeletesWeight); - forcedMergePolicy.setReclaimDeletesWeight(reclaimDeletesWeight); - } - - public double getReclaimDeletesWeight() { - return regularMergePolicy.getReclaimDeletesWeight(); - } } diff --git a/server/src/main/java/org/elasticsearch/index/IndexSettings.java b/server/src/main/java/org/elasticsearch/index/IndexSettings.java index 08cacee6ae0d3..486515e675562 100644 --- a/server/src/main/java/org/elasticsearch/index/IndexSettings.java +++ b/server/src/main/java/org/elasticsearch/index/IndexSettings.java @@ -416,7 +416,6 @@ public IndexSettings(final IndexMetaData indexMetaData, final Settings nodeSetti scopedSettings.addSettingsUpdateConsumer(MergePolicyConfig.INDEX_MERGE_POLICY_MAX_MERGE_AT_ONCE_EXPLICIT_SETTING, mergePolicyConfig::setMaxMergesAtOnceExplicit); scopedSettings.addSettingsUpdateConsumer(MergePolicyConfig.INDEX_MERGE_POLICY_MAX_MERGED_SEGMENT_SETTING, mergePolicyConfig::setMaxMergedSegment); scopedSettings.addSettingsUpdateConsumer(MergePolicyConfig.INDEX_MERGE_POLICY_SEGMENTS_PER_TIER_SETTING, mergePolicyConfig::setSegmentsPerTier); - scopedSettings.addSettingsUpdateConsumer(MergePolicyConfig.INDEX_MERGE_POLICY_RECLAIM_DELETES_WEIGHT_SETTING, mergePolicyConfig::setReclaimDeletesWeight); scopedSettings.addSettingsUpdateConsumer(MergeSchedulerConfig.MAX_THREAD_COUNT_SETTING, MergeSchedulerConfig.MAX_MERGE_COUNT_SETTING, mergeSchedulerConfig::setMaxThreadAndMergeCount); diff --git a/server/src/main/java/org/elasticsearch/index/MergePolicyConfig.java b/server/src/main/java/org/elasticsearch/index/MergePolicyConfig.java index b6c1e124a638e..8a264cd3cb7e0 100644 --- a/server/src/main/java/org/elasticsearch/index/MergePolicyConfig.java +++ b/server/src/main/java/org/elasticsearch/index/MergePolicyConfig.java @@ -150,7 +150,7 @@ public final class MergePolicyConfig { Property.Dynamic, Property.IndexScope); public static final Setting INDEX_MERGE_POLICY_RECLAIM_DELETES_WEIGHT_SETTING = Setting.doubleSetting("index.merge.policy.reclaim_deletes_weight", DEFAULT_RECLAIM_DELETES_WEIGHT, 0.0d, - Property.Dynamic, Property.IndexScope); + Property.Dynamic, Property.IndexScope, Property.Deprecated); public static final String INDEX_MERGE_ENABLED = "index.merge.enabled"; // don't convert to Setting<> and register... we only set this in tests and register via a plugin @@ -176,17 +176,12 @@ public final class MergePolicyConfig { mergePolicy.setMaxMergeAtOnceExplicit(maxMergeAtOnceExplicit); mergePolicy.setMaxMergedSegmentMB(maxMergedSegment.getMbFrac()); mergePolicy.setSegmentsPerTier(segmentsPerTier); - mergePolicy.setReclaimDeletesWeight(reclaimDeletesWeight); if (logger.isTraceEnabled()) { logger.trace("using [tiered] merge mergePolicy with expunge_deletes_allowed[{}], floor_segment[{}], max_merge_at_once[{}], max_merge_at_once_explicit[{}], max_merged_segment[{}], segments_per_tier[{}], reclaim_deletes_weight[{}]", forceMergeDeletesPctAllowed, floorSegment, maxMergeAtOnce, maxMergeAtOnceExplicit, maxMergedSegment, segmentsPerTier, reclaimDeletesWeight); } } - void setReclaimDeletesWeight(Double reclaimDeletesWeight) { - mergePolicy.setReclaimDeletesWeight(reclaimDeletesWeight); - } - void setSegmentsPerTier(Double segmentsPerTier) { mergePolicy.setSegmentsPerTier(segmentsPerTier); } diff --git a/server/src/test/java/org/elasticsearch/index/EsTieredMergePolicyTests.java b/server/src/test/java/org/elasticsearch/index/EsTieredMergePolicyTests.java index fdee707d97a69..30f73b887f76f 100644 --- a/server/src/test/java/org/elasticsearch/index/EsTieredMergePolicyTests.java +++ b/server/src/test/java/org/elasticsearch/index/EsTieredMergePolicyTests.java @@ -29,16 +29,14 @@ public void testDefaults() { assertEquals( new TieredMergePolicy().getMaxMergedSegmentMB(), policy.regularMergePolicy.getMaxMergedSegmentMB(), 0d); - // TODO: fix when incorporating https://issues.apache.org/jira/browse/LUCENE-8398, the first divisor must be a double - assertEquals(Long.MAX_VALUE / 1024 / 1024.0, policy.forcedMergePolicy.getMaxMergedSegmentMB(), 0d); + assertEquals(Long.MAX_VALUE / 1024.0 / 1024.0, policy.forcedMergePolicy.getMaxMergedSegmentMB(), 0d); } public void testSetMaxMergedSegmentMB() { EsTieredMergePolicy policy = new EsTieredMergePolicy(); policy.setMaxMergedSegmentMB(10 * 1024); assertEquals(10 * 1024, policy.regularMergePolicy.getMaxMergedSegmentMB(), 0d); - // TODO: fix when incorporating https://issues.apache.org/jira/browse/LUCENE-8398, the first divisor must be a double - assertEquals(Long.MAX_VALUE / 1024 / 1024.0, policy.forcedMergePolicy.getMaxMergedSegmentMB(), 0d); + assertEquals(Long.MAX_VALUE / 1024.0 / 1024.0, policy.forcedMergePolicy.getMaxMergedSegmentMB(), 0d); } public void testSetForceMergeDeletesPctAllowed() { @@ -71,10 +69,4 @@ public void testSetSegmentsPerTier() { policy.setSegmentsPerTier(42); assertEquals(42, policy.regularMergePolicy.getSegmentsPerTier(), 0); } - - public void testSetReclaimDeletesWeight() { - EsTieredMergePolicy policy = new EsTieredMergePolicy(); - policy.setReclaimDeletesWeight(42); - assertEquals(42, policy.regularMergePolicy.getReclaimDeletesWeight(), 0); - } } diff --git a/server/src/test/java/org/elasticsearch/index/MergePolicySettingsTests.java b/server/src/test/java/org/elasticsearch/index/MergePolicySettingsTests.java index d8b03ffeedbfc..a837009556410 100644 --- a/server/src/test/java/org/elasticsearch/index/MergePolicySettingsTests.java +++ b/server/src/test/java/org/elasticsearch/index/MergePolicySettingsTests.java @@ -96,10 +96,6 @@ public void testTieredMergePolicySettingsUpdate() throws IOException { indexSettings.updateIndexMetaData(newIndexMeta("index", Settings.builder().put(MergePolicyConfig.INDEX_MERGE_POLICY_MAX_MERGED_SEGMENT_SETTING.getKey(), new ByteSizeValue(MergePolicyConfig.DEFAULT_MAX_MERGED_SEGMENT.getBytes() + 1)).build())); assertEquals(((EsTieredMergePolicy) indexSettings.getMergePolicy()).getMaxMergedSegmentMB(), new ByteSizeValue(MergePolicyConfig.DEFAULT_MAX_MERGED_SEGMENT.getBytes() + 1).getMbFrac(), 0.0001); - assertEquals(((EsTieredMergePolicy) indexSettings.getMergePolicy()).getReclaimDeletesWeight(), MergePolicyConfig.DEFAULT_RECLAIM_DELETES_WEIGHT, 0); - indexSettings.updateIndexMetaData(newIndexMeta("index", Settings.builder().put(MergePolicyConfig.INDEX_MERGE_POLICY_RECLAIM_DELETES_WEIGHT_SETTING.getKey(), MergePolicyConfig.DEFAULT_RECLAIM_DELETES_WEIGHT + 1).build())); - assertEquals(((EsTieredMergePolicy) indexSettings.getMergePolicy()).getReclaimDeletesWeight(), MergePolicyConfig.DEFAULT_RECLAIM_DELETES_WEIGHT + 1, 0); - assertEquals(((EsTieredMergePolicy) indexSettings.getMergePolicy()).getSegmentsPerTier(), MergePolicyConfig.DEFAULT_SEGMENTS_PER_TIER, 0); indexSettings.updateIndexMetaData(newIndexMeta("index", Settings.builder().put(MergePolicyConfig.INDEX_MERGE_POLICY_SEGMENTS_PER_TIER_SETTING.getKey(), MergePolicyConfig.DEFAULT_SEGMENTS_PER_TIER + 1).build())); assertEquals(((EsTieredMergePolicy) indexSettings.getMergePolicy()).getSegmentsPerTier(), MergePolicyConfig.DEFAULT_SEGMENTS_PER_TIER + 1, 0); @@ -110,7 +106,6 @@ public void testTieredMergePolicySettingsUpdate() throws IOException { assertEquals(((EsTieredMergePolicy) indexSettings.getMergePolicy()).getMaxMergeAtOnce(), MergePolicyConfig.DEFAULT_MAX_MERGE_AT_ONCE); assertEquals(((EsTieredMergePolicy) indexSettings.getMergePolicy()).getMaxMergeAtOnceExplicit(), MergePolicyConfig.DEFAULT_MAX_MERGE_AT_ONCE_EXPLICIT); assertEquals(((EsTieredMergePolicy) indexSettings.getMergePolicy()).getMaxMergedSegmentMB(), new ByteSizeValue(MergePolicyConfig.DEFAULT_MAX_MERGED_SEGMENT.getBytes() + 1).getMbFrac(), 0.0001); - assertEquals(((EsTieredMergePolicy) indexSettings.getMergePolicy()).getReclaimDeletesWeight(), MergePolicyConfig.DEFAULT_RECLAIM_DELETES_WEIGHT, 0); assertEquals(((EsTieredMergePolicy) indexSettings.getMergePolicy()).getSegmentsPerTier(), MergePolicyConfig.DEFAULT_SEGMENTS_PER_TIER, 0); } diff --git a/x-pack/plugin/sql/sql-action/licenses/lucene-core-7.4.0.jar.sha1 b/x-pack/plugin/sql/sql-action/licenses/lucene-core-7.4.0.jar.sha1 deleted file mode 100644 index 80ba6c76aa301..0000000000000 --- a/x-pack/plugin/sql/sql-action/licenses/lucene-core-7.4.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -730d9ac80436c8cbc0b2a8a749259be536b97316 \ No newline at end of file diff --git a/x-pack/plugin/sql/sql-action/licenses/lucene-core-7.5.0-snapshot-608f0277b0.jar.sha1 b/x-pack/plugin/sql/sql-action/licenses/lucene-core-7.5.0-snapshot-608f0277b0.jar.sha1 new file mode 100644 index 0000000000000..d38fb392c350b --- /dev/null +++ b/x-pack/plugin/sql/sql-action/licenses/lucene-core-7.5.0-snapshot-608f0277b0.jar.sha1 @@ -0,0 +1 @@ +471096d6e92338b208aa91f3a85feb2f9cfc4afd \ No newline at end of file From 5decb23687eb19ed1d229c19382897f5010fb5ed Mon Sep 17 00:00:00 2001 From: Jim Ferenczi Date: Fri, 27 Jul 2018 10:50:22 +0200 Subject: [PATCH 3/5] bump lucene version after backport --- server/src/main/java/org/elasticsearch/Version.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/main/java/org/elasticsearch/Version.java b/server/src/main/java/org/elasticsearch/Version.java index e2ade3396189c..a815a9711d023 100644 --- a/server/src/main/java/org/elasticsearch/Version.java +++ b/server/src/main/java/org/elasticsearch/Version.java @@ -179,7 +179,7 @@ public class Version implements Comparable, ToXContentFragment { public static final int V_6_4_0_ID = 6040099; public static final Version V_6_4_0 = new Version(V_6_4_0_ID, org.apache.lucene.util.Version.LUCENE_7_4_0); 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_4_0); + 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_7_0_0_alpha1_ID = 7000001; public static final Version V_7_0_0_alpha1 = new Version(V_7_0_0_alpha1_ID, org.apache.lucene.util.Version.LUCENE_7_5_0); From 83d007e7bee9763ab4b15553110d1b7a829f614b Mon Sep 17 00:00:00 2001 From: javanna Date: Fri, 27 Jul 2018 11:50:13 +0200 Subject: [PATCH 4/5] [TEST] Mute failing testConvertLongHexError See #32370 --- .../ingest/common/ConvertProcessorTests.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/modules/ingest-common/src/test/java/org/elasticsearch/ingest/common/ConvertProcessorTests.java b/modules/ingest-common/src/test/java/org/elasticsearch/ingest/common/ConvertProcessorTests.java index ae27c7850daf3..500f1aa1719c3 100644 --- a/modules/ingest-common/src/test/java/org/elasticsearch/ingest/common/ConvertProcessorTests.java +++ b/modules/ingest-common/src/test/java/org/elasticsearch/ingest/common/ConvertProcessorTests.java @@ -19,11 +19,6 @@ package org.elasticsearch.ingest.common; -import org.elasticsearch.ingest.IngestDocument; -import org.elasticsearch.ingest.Processor; -import org.elasticsearch.ingest.RandomDocumentPicks; -import org.elasticsearch.test.ESTestCase; - import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; @@ -31,12 +26,17 @@ import java.util.Locale; import java.util.Map; +import org.elasticsearch.ingest.IngestDocument; +import org.elasticsearch.ingest.Processor; +import org.elasticsearch.ingest.RandomDocumentPicks; +import org.elasticsearch.test.ESTestCase; + import static org.elasticsearch.ingest.IngestDocumentMatcher.assertIngestDocument; import static org.elasticsearch.ingest.common.ConvertProcessor.Type; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.sameInstance; import static org.hamcrest.Matchers.not; +import static org.hamcrest.Matchers.sameInstance; public class ConvertProcessorTests extends ESTestCase { @@ -138,6 +138,7 @@ public void testConvertLongLeadingZero() throws Exception { assertThat(ingestDocument.getFieldValue(fieldName, Long.class), equalTo(10L)); } + @AwaitsFix( bugUrl = "https://github.com/elastic/elasticsearch/issues/32370") public void testConvertLongHexError() { IngestDocument ingestDocument = RandomDocumentPicks.randomIngestDocument(random()); String value = "0x" + randomAlphaOfLengthBetween(1, 10); From 7aa53654976ce9c9932d36dca8ed81a342cce70b Mon Sep 17 00:00:00 2001 From: javanna Date: Fri, 27 Jul 2018 14:41:32 +0200 Subject: [PATCH 5/5] [TEST] Mute failing InternalEngineTests#testSeqNoAndCheckpoints --- .../index/engine/InternalEngineTests.java | 68 +++++++++---------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/server/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java b/server/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java index 87b63dfdef832..f47cd11e1b4ec 100644 --- a/server/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java +++ b/server/src/test/java/org/elasticsearch/index/engine/InternalEngineTests.java @@ -19,9 +19,41 @@ package org.elasticsearch.index.engine; +import java.io.IOException; +import java.io.UncheckedIOException; +import java.nio.charset.Charset; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Base64; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Queue; +import java.util.Set; +import java.util.concurrent.BrokenBarrierException; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.CyclicBarrier; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.concurrent.atomic.AtomicLong; +import java.util.concurrent.atomic.AtomicReference; +import java.util.function.BiFunction; +import java.util.function.Function; +import java.util.function.LongSupplier; +import java.util.function.Supplier; +import java.util.function.ToLongBiFunction; +import java.util.stream.Collectors; +import java.util.stream.LongStream; + import com.carrotsearch.hppc.cursors.ObjectObjectCursor; import com.carrotsearch.randomizedtesting.generators.RandomNumbers; - import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -123,39 +155,6 @@ import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; -import java.io.IOException; -import java.io.UncheckedIOException; -import java.nio.charset.Charset; -import java.nio.file.Files; -import java.nio.file.Path; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Base64; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Queue; -import java.util.Set; -import java.util.concurrent.BrokenBarrierException; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.CyclicBarrier; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.concurrent.atomic.AtomicLong; -import java.util.concurrent.atomic.AtomicReference; -import java.util.function.BiFunction; -import java.util.function.Function; -import java.util.function.LongSupplier; -import java.util.function.Supplier; -import java.util.function.ToLongBiFunction; -import java.util.stream.Collectors; -import java.util.stream.LongStream; - import static java.util.Collections.emptyMap; import static java.util.Collections.shuffle; import static org.elasticsearch.index.engine.Engine.Operation.Origin.LOCAL_TRANSLOG_RECOVERY; @@ -2025,6 +2024,7 @@ public void testIndexWriterInfoStream() throws IllegalAccessException, IOExcepti } } + @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/32430") public void testSeqNoAndCheckpoints() throws IOException { final int opCount = randomIntBetween(1, 256); long primarySeqNo = SequenceNumbers.NO_OPS_PERFORMED;