honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upgrade to Lucene-8.3.0-snapshot-25968e3b75e (#48227)

This commit is contained in:
Ignacio Vera 2019-10-21 08:21:09 +02:00 committed by GitHub
parent 4b3a672a0b
commit b1224fca8c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
55 changed files with 36 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buildSrc/version.properties
View File

@ -1,5 +1,5 @@
elasticsearch = 7.6.0 elasticsearch = 7.6.0
lucene = 8.2.0 lucene = 8.3.0-snapshot-25968e3b75e
bundled_jdk_vendor = adoptopenjdk bundled_jdk_vendor = adoptopenjdk
bundled_jdk = 13+33 bundled_jdk = 13+33

4
docs/Versions.asciidoc
View File

@ -1,8 +1,8 @@
include::{asciidoc-dir}/../../shared/versions/stack/{source_branch}.asciidoc[] include::{asciidoc-dir}/../../shared/versions/stack/{source_branch}.asciidoc[]
:lucene_version: 8.2.0 :lucene_version: 8.3.0
:lucene_version_path: 8_2_0 :lucene_version_path: 8_3_0
:jdk: 1.8.0_131 :jdk: 1.8.0_131
:jdk_major: 8 :jdk_major: 8
:build_flavor: default :build_flavor: default

1
modules/lang-expression/licenses/lucene-expressions-8.2.0.jar.sha1
View File

@ -1 +0,0 @@
afec1e7228eca31b5f469bdcbbc84d04b0748eae

1
modules/lang-expression/licenses/lucene-expressions-8.3.0-snapshot-25968e3b75e.jar.sha1 Normal file
View File

@ -0,0 +1 @@
738a12e76b5c60f2a714fc3e6611c8ae6dc63159

1
plugins/analysis-icu/licenses/lucene-analyzers-icu-8.2.0.jar.sha1
View File

@ -1 +0,0 @@
246a593068e012d0deac604cde68734b3e843aa3

1
plugins/analysis-icu/licenses/lucene-analyzers-icu-8.3.0-snapshot-25968e3b75e.jar.sha1 Normal file
View File

@ -0,0 +1 @@
6313d19a4f40d54ad12e20a66666049f88bac0ff

1
plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.2.0.jar.sha1
View File

@ -1 +0,0 @@
169e079501f3e0b143c4ea3c953a3cc9aff8758a

1
plugins/analysis-kuromoji/licenses/lucene-analyzers-kuromoji-8.3.0-snapshot-25968e3b75e.jar.sha1 Normal file
View File

@ -0,0 +1 @@
a28b8590a4f9ae219241a34382a39fe2f205f2e2

1
plugins/analysis-nori/licenses/lucene-analyzers-nori-8.2.0.jar.sha1
View File

@ -1 +0,0 @@
4f0feca14e6ac73b708a9ccd437478260a46bead

1
plugins/analysis-nori/licenses/lucene-analyzers-nori-8.3.0-snapshot-25968e3b75e.jar.sha1 Normal file
View File

@ -0,0 +1 @@
c088334a34e477b122d8fa8623fb3b8f6a0a46e4

1
plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.2.0.jar.sha1
View File

@ -1 +0,0 @@
a87df79bb727bbe355dbcf367e4489fc1010343f

1
plugins/analysis-phonetic/licenses/lucene-analyzers-phonetic-8.3.0-snapshot-25968e3b75e.jar.sha1 Normal file
View File

@ -0,0 +1 @@
c36d794f4f1758e6e7fab457c3a6d41b45690484

1
plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.2.0.jar.sha1
View File

@ -1 +0,0 @@
cb93b65fb1ddd218142ebc50857c56a61b3b578b

1
plugins/analysis-smartcn/licenses/lucene-analyzers-smartcn-8.3.0-snapshot-25968e3b75e.jar.sha1 Normal file
View File

@ -0,0 +1 @@
8707a4fae440930f198a05083435466b605aa42f

1
plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.2.0.jar.sha1
View File

@ -1 +0,0 @@
6db9b08863134ef1c080f30376693a55de3a372b

1
plugins/analysis-stempel/licenses/lucene-analyzers-stempel-8.3.0-snapshot-25968e3b75e.jar.sha1 Normal file
View File

@ -0,0 +1 @@
49f9c34735dfc9bfc182ca56a7271350d1944040

1
plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.2.0.jar.sha1
View File

@ -1 +0,0 @@
b89c9f985cdcf3f563d6e66057b2fd6e22e75f77

1
plugins/analysis-ukrainian/licenses/lucene-analyzers-morfologik-8.3.0-snapshot-25968e3b75e.jar.sha1 Normal file
View File

@ -0,0 +1 @@
f1e4bb9faba619705f0b5753db65ce51f2156712

1
server/licenses/lucene-analyzers-common-8.2.0.jar.sha1
View File

@ -1 +0,0 @@
8e8abc90572ed74b110c75b546c675153aecc570

1
server/licenses/lucene-analyzers-common-8.3.0-snapshot-25968e3b75e.jar.sha1 Normal file
View File

@ -0,0 +1 @@
9ceeaa74e15fd21435331bd5be3176f61972cdc2

1
server/licenses/lucene-backward-codecs-8.2.0.jar.sha1
View File

@ -1 +0,0 @@
91397b1e0dab4a66e9e58a82ab1690f0383aaced

1
server/licenses/lucene-backward-codecs-8.3.0-snapshot-25968e3b75e.jar.sha1 Normal file
View File

@ -0,0 +1 @@
43eaefd258e3cc9b1261679f18421d264d8f40a1

1
server/licenses/lucene-core-8.2.0.jar.sha1
View File

@ -1 +0,0 @@
f6da40436d3633de272810fae1e339c237adfcf6

1
server/licenses/lucene-core-8.3.0-snapshot-25968e3b75e.jar.sha1 Normal file
View File

@ -0,0 +1 @@
d84d93bf46fb105864fa5d54c08fd63ca2650d56

1
server/licenses/lucene-grouping-8.2.0.jar.sha1
View File

@ -1 +0,0 @@
a457b6ae0b02a02c9fc7061a19289601554c320a

1
server/licenses/lucene-grouping-8.3.0-snapshot-25968e3b75e.jar.sha1 Normal file
View File

@ -0,0 +1 @@
aa4a4b7b27591003e290a2eb02b61cfc52147b4c

1
server/licenses/lucene-highlighter-8.2.0.jar.sha1
View File

@ -1 +0,0 @@
21bdc9d7e134c9e8bb2bab7a5c32f5ff08b345ec

1
server/licenses/lucene-highlighter-8.3.0-snapshot-25968e3b75e.jar.sha1 Normal file
View File

@ -0,0 +1 @@
7a4f796d2f8617d805f9f84623e7497085dda0d4

1
server/licenses/lucene-join-8.2.0.jar.sha1
View File

@ -1 +0,0 @@
6e1f359cb49868ec2482cb1af7f32b19ac70fcf3

1
server/licenses/lucene-join-8.3.0-snapshot-25968e3b75e.jar.sha1 Normal file
View File

@ -0,0 +1 @@
ffd05f24dd7749b08809dfc2ad3a93c0845c5f84

1
server/licenses/lucene-memory-8.2.0.jar.sha1
View File

@ -1 +0,0 @@
719c1c86f525d58a717eb6338552cd3aaa19d56c

1
server/licenses/lucene-memory-8.3.0-snapshot-25968e3b75e.jar.sha1 Normal file
View File

@ -0,0 +1 @@
fb576d36ebf966c48fb58765c6bd7b6e5320cbd6

1
server/licenses/lucene-misc-8.2.0.jar.sha1
View File

@ -1 +0,0 @@
539c353c1861df0ace480978429f48a4bccd29c4

1
server/licenses/lucene-misc-8.3.0-snapshot-25968e3b75e.jar.sha1 Normal file
View File

@ -0,0 +1 @@
b052ad9ac2ad9d81d1b80e48ec47985644d36f3f

1
server/licenses/lucene-queries-8.2.0.jar.sha1
View File

@ -1 +0,0 @@
5da383678cb0a35a07ccb03487ba00cf184d1d71

1
server/licenses/lucene-queries-8.3.0-snapshot-25968e3b75e.jar.sha1 Normal file
View File

@ -0,0 +1 @@
8edf59c2cd920a1cd926573620b8b0f82fe03f2a

1
server/licenses/lucene-queryparser-8.2.0.jar.sha1
View File

@ -1 +0,0 @@
8925df7b104e78e308e236ff0740a064dd93cadd

1
server/licenses/lucene-queryparser-8.3.0-snapshot-25968e3b75e.jar.sha1 Normal file
View File

@ -0,0 +1 @@
d070d33ddf37bf45a0656dec980a69ac930c8218

1
server/licenses/lucene-sandbox-8.2.0.jar.sha1
View File

@ -1 +0,0 @@
f50931f1db40cdcc31e5044439d4e5522a23f6c1

1
server/licenses/lucene-sandbox-8.3.0-snapshot-25968e3b75e.jar.sha1 Normal file
View File

@ -0,0 +1 @@
5ea387ae19df210c5b6e75eb38bf589dc39e54f4

1
server/licenses/lucene-spatial-8.2.0.jar.sha1
View File

@ -1 +0,0 @@
8a9edbc075ae5fd6ee2265f0bb6d5847e78c8a96

1
server/licenses/lucene-spatial-8.3.0-snapshot-25968e3b75e.jar.sha1 Normal file
View File

@ -0,0 +1 @@
395ddd7e7774ad9027269222d746d30651ab8cf3

1
server/licenses/lucene-spatial-extras-8.2.0.jar.sha1
View File

@ -1 +0,0 @@
1335a4a876a82dbbb79df8172133df66de06689f

1
server/licenses/lucene-spatial-extras-8.3.0-snapshot-25968e3b75e.jar.sha1 Normal file
View File

@ -0,0 +1 @@
85da517bdc0b200b040c0293eea0ff6f36082e31

1
server/licenses/lucene-spatial3d-8.2.0.jar.sha1
View File

@ -1 +0,0 @@
0bc0ee3f2d70cf66dc79a781b9edd6311f1f6a49

1
server/licenses/lucene-spatial3d-8.3.0-snapshot-25968e3b75e.jar.sha1 Normal file
View File

@ -0,0 +1 @@
ccf4b384c0051d9bd1df73a0a5f62c7064039db6

1
server/licenses/lucene-suggest-8.2.0.jar.sha1
View File

@ -1 +0,0 @@
334d627bda935dfb34e8e1c78d8f5a28b4be325a

1
server/licenses/lucene-suggest-8.3.0-snapshot-25968e3b75e.jar.sha1 Normal file
View File

@ -0,0 +1 @@
9bf83a2a79cf6c392961c06b3afaa3d3871274da

2
server/src/main/java/org/elasticsearch/Version.java
View File

@ -121,7 +121,7 @@ public class Version implements Comparable<Version>, ToXContentFragment {
public static final Version V_7_4_0 = new Version(7040099, org.apache.lucene.util.Version.LUCENE_8_2_0); public static final Version V_7_4_0 = new Version(7040099, org.apache.lucene.util.Version.LUCENE_8_2_0);
public static final Version V_7_4_1 = new Version(7040199, org.apache.lucene.util.Version.LUCENE_8_2_0); public static final Version V_7_4_1 = new Version(7040199, org.apache.lucene.util.Version.LUCENE_8_2_0);
public static final Version V_7_5_0 = new Version(7050099, org.apache.lucene.util.Version.LUCENE_8_2_0); public static final Version V_7_5_0 = new Version(7050099, org.apache.lucene.util.Version.LUCENE_8_2_0);
public static final Version V_7_6_0 = new Version(7060099, org.apache.lucene.util.Version.LUCENE_8_2_0); public static final Version V_7_6_0 = new Version(7060099, org.apache.lucene.util.Version.LUCENE_8_3_0);
public static final Version CURRENT = V_7_6_0; public static final Version CURRENT = V_7_6_0;
private static final ImmutableOpenIntMap<Version> idToVersion; private static final ImmutableOpenIntMap<Version> idToVersion;

5
server/src/main/java/org/elasticsearch/search/dfs/DfsPhase.java
View File

@ -21,7 +21,6 @@ package org.elasticsearch.search.dfs;
import com.carrotsearch.hppc.ObjectObjectHashMap; import com.carrotsearch.hppc.ObjectObjectHashMap;
import org.apache.lucene.index.Term; import org.apache.lucene.index.Term;
import org.apache.lucene.index.TermStates;
import org.apache.lucene.search.CollectionStatistics; import org.apache.lucene.search.CollectionStatistics;
import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.Query; import org.apache.lucene.search.Query;
@ -54,11 +53,11 @@ public class DfsPhase implements SearchPhase {
Map<Term, TermStatistics> stats = new HashMap<>(); Map<Term, TermStatistics> stats = new HashMap<>();
IndexSearcher searcher = new IndexSearcher(context.searcher().getIndexReader()) { IndexSearcher searcher = new IndexSearcher(context.searcher().getIndexReader()) {
@Override @Override
public TermStatistics termStatistics(Term term, TermStates states) throws IOException { public TermStatistics termStatistics(Term term, int docFreq, long totalTermFreq) throws IOException {
if (context.isCancelled()) { if (context.isCancelled()) {
throw new TaskCancelledException("cancelled"); throw new TaskCancelledException("cancelled");
} }
TermStatistics ts = super.termStatistics(term, states); TermStatistics ts = super.termStatistics(term, docFreq, totalTermFreq);
if (ts != null) { if (ts != null) {
stats.put(term, ts); stats.put(term, ts);
} }

7
server/src/main/java/org/elasticsearch/search/internal/ContextIndexSearcher.java
View File

@ -23,7 +23,6 @@ import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.LeafReaderContext; import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.Term; import org.apache.lucene.index.Term;
import org.apache.lucene.index.TermStates;
import org.apache.lucene.search.BulkScorer; import org.apache.lucene.search.BulkScorer;
import org.apache.lucene.search.CollectionStatistics; import org.apache.lucene.search.CollectionStatistics;
import org.apache.lucene.search.CollectionTerminatedException; import org.apache.lucene.search.CollectionTerminatedException;
@ -244,15 +243,15 @@ public class ContextIndexSearcher extends IndexSearcher {
} }
@Override @Override
public TermStatistics termStatistics(Term term, TermStates context) throws IOException { public TermStatistics termStatistics(Term term, int docFreq, long totalTermFreq) throws IOException {
if (aggregatedDfs == null) { if (aggregatedDfs == null) {
// we are either executing the dfs phase or the search_type doesn't include the dfs phase. // we are either executing the dfs phase or the search_type doesn't include the dfs phase.
return super.termStatistics(term, context); return super.termStatistics(term, docFreq, totalTermFreq);
} }
TermStatistics termStatistics = aggregatedDfs.termStatistics().get(term); TermStatistics termStatistics = aggregatedDfs.termStatistics().get(term);
if (termStatistics == null) { if (termStatistics == null) {
// we don't have stats for this - this might be a must_not clauses etc. that doesn't allow extract terms on the query // we don't have stats for this - this might be a must_not clauses etc. that doesn't allow extract terms on the query
return super.termStatistics(term, context); return super.termStatistics(term, docFreq, totalTermFreq);
} }
return termStatistics; return termStatistics;
} }

1
server/src/test/java/org/elasticsearch/index/mapper/TextFieldMapperTests.java
View File

@ -784,6 +784,7 @@ public class TextFieldMapperTests extends ESSingleNodeTestCase {
} }
} }
@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/47777")
public void testFastPhraseMapping() throws IOException { public void testFastPhraseMapping() throws IOException {
QueryShardContext queryShardContext = indexService.newQueryShardContext( QueryShardContext queryShardContext = indexService.newQueryShardContext(

2
test/framework/src/main/java/org/elasticsearch/indices/analysis/AnalysisFactoryTestCase.java
View File

@ -192,6 +192,8 @@ public abstract class AnalysisFactoryTestCase extends ESTestCase {
.put("protectedterm", Void.class) .put("protectedterm", Void.class)
// LUCENE-8332 // LUCENE-8332
.put("concatenategraph", Void.class) .put("concatenategraph", Void.class)
// LUCENE-8936
.put("spanishminimalstem", Void.class)
.immutableMap(); .immutableMap();

1
x-pack/plugin/sql/sql-action/licenses/lucene-core-8.2.0.jar.sha1
View File

@ -1 +0,0 @@
f6da40436d3633de272810fae1e339c237adfcf6

1
x-pack/plugin/sql/sql-action/licenses/lucene-core-8.3.0-snapshot-25968e3b75e.jar.sha1 Normal file
View File

@ -0,0 +1 @@
d84d93bf46fb105864fa5d54c08fd63ca2650d56