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

[Upgrade] Lucene 9.1.0-snapshot-ea989fe8f30 (#2487) 

* [Upgrade] Lucene 9.1.0-snapshot-ea989fe8f30

Upgrades from Lucene 9.0.0 to 9.1.0-snapshot-ea989fe8f30 in preparation for
9.1.0 GA.

Signed-off-by: Nicholas Walter Knize <nknize@apache.org>

* Add spanishplural token filter

Signed-off-by: Nicholas Walter Knize <nknize@apache.org>

* fix KNOWN_TOKENIZERS

Signed-off-by: Nicholas Walter Knize <nknize@apache.org>
This commit is contained in:
Nick Knize 2022-03-16 14:47:25 -05:00 committed by GitHub
parent bd21043d65
commit 05a5819243
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
320 changed files with 555 additions and 417 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buildSrc/src/main/groovy/org/opensearch/gradle/plugin/PluginBuildPlugin.groovy
View File

@ -123,7 +123,7 @@ class PluginBuildPlugin implements Plugin<Project> {
naming.clear()
naming {
Tests {
baseClass 'org.apache.lucene.util.LuceneTestCase'
baseClass 'org.apache.lucene.tests.util.LuceneTestCase'
}
IT {
baseClass 'org.opensearch.test.OpenSearchIntegTestCase'

2
buildSrc/src/main/java/org/opensearch/gradle/precommit/TestingConventionsPrecommitPlugin.java
View File

@ -43,7 +43,7 @@ public class TestingConventionsPrecommitPlugin extends PrecommitPlugin {
.register("testingConventions", TestingConventionsTasks.class);
testingConventions.configure(t -> {
TestingConventionRule testsRule = t.getNaming().maybeCreate("Tests");
testsRule.baseClass("org.apache.lucene.util.LuceneTestCase");
testsRule.baseClass("org.apache.lucene.tests.util.LuceneTestCase");
TestingConventionRule itRule = t.getNaming().maybeCreate("IT");
itRule.baseClass("org.opensearch.test.OpenSearchIntegTestCase");
itRule.baseClass("org.opensearch.test.rest.OpenSearchRestTestCase");

4
buildSrc/src/main/resources/forbidden/opensearch-test-signatures.txt
View File

@ -19,9 +19,9 @@ com.carrotsearch.randomizedtesting.annotations.Seed @ Don't commit hardcoded see
com.carrotsearch.randomizedtesting.annotations.Repeat @ Don't commit hardcoded repeats
org.apache.lucene.codecs.Codec#setDefault(org.apache.lucene.codecs.Codec) @ Use the SuppressCodecs("*") annotation instead
org.apache.lucene.util.LuceneTestCase$Slow @ Don't write slow tests
org.apache.lucene.tests.util.LuceneTestCase$Slow @ Don't write slow tests
org.junit.Ignore @ Use AwaitsFix instead
org.apache.lucene.util.LuceneTestCase$Nightly @ We don't run nightly tests at this point!
org.apache.lucene.tests.util.LuceneTestCase$Nightly @ We don't run nightly tests at this point!
com.carrotsearch.randomizedtesting.annotations.Nightly @ We don't run nightly tests at this point!
org.junit.Test @defaultMessage Just name your test method testFooBar

2
buildSrc/version.properties
View File

@ -1,5 +1,5 @@
opensearch = 2.0.0
lucene = 9.0.0
lucene = 9.1.0-snapshot-ea989fe8f30
bundled_jdk_vendor = adoptium
bundled_jdk = 17.0.2+8

2
client/rest-high-level/src/test/java/org/opensearch/client/IndicesRequestConvertersTests.java
View File

@ -37,7 +37,7 @@ import org.apache.http.client.methods.HttpGet;
import org.apache.http.client.methods.HttpHead;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.client.methods.HttpPut;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.tests.util.LuceneTestCase;
import org.opensearch.action.ActionRequestValidationException;
import org.opensearch.action.admin.indices.alias.Alias;
import org.opensearch.action.admin.indices.alias.IndicesAliasesRequest;

2
distribution/tools/keystore-cli/src/test/java/org/opensearch/common/settings/KeyStoreCommandTestCase.java
View File

@ -43,7 +43,7 @@ import java.util.List;
import com.google.common.jimfs.Configuration;
import com.google.common.jimfs.Jimfs;
import org.opensearch.core.internal.io.IOUtils;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.tests.util.LuceneTestCase;
import org.opensearch.cli.CommandTestCase;
import org.opensearch.common.io.PathUtilsForTesting;
import org.opensearch.env.Environment;

2
distribution/tools/plugin-cli/src/test/java/org/opensearch/plugins/InstallPluginCommandTests.java
View File

@ -35,7 +35,7 @@ package org.opensearch.plugins;
import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
import com.google.common.jimfs.Configuration;
import com.google.common.jimfs.Jimfs;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.tests.util.LuceneTestCase;
import org.bouncycastle.bcpg.ArmoredOutputStream;
import org.bouncycastle.bcpg.BCPGOutputStream;
import org.bouncycastle.bcpg.HashAlgorithmTags;

2
distribution/tools/plugin-cli/src/test/java/org/opensearch/plugins/ListPluginsCommandTests.java
View File

@ -40,7 +40,7 @@ import java.util.Arrays;
import java.util.Map;
import java.util.stream.Collectors;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.tests.util.LuceneTestCase;
import org.opensearch.LegacyESVersion;
import org.opensearch.Version;
import org.opensearch.cli.ExitCodes;

2
distribution/tools/plugin-cli/src/test/java/org/opensearch/plugins/RemovePluginCommandTests.java
View File

@ -32,7 +32,7 @@
package org.opensearch.plugins;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.tests.util.LuceneTestCase;
import org.opensearch.Version;
import org.opensearch.cli.ExitCodes;
import org.opensearch.cli.MockTerminal;

4
libs/core/src/test/java/org/opensearch/core/internal/io/IOUtilsTests.java
View File

@ -30,8 +30,8 @@
package org.opensearch.core.internal.io;
import org.apache.lucene.mockfile.FilterFileSystemProvider;
import org.apache.lucene.mockfile.FilterPath;
import org.apache.lucene.tests.mockfile.FilterFileSystemProvider;
import org.apache.lucene.tests.mockfile.FilterPath;
import org.apache.lucene.util.Constants;
import org.opensearch.common.CheckedConsumer;
import org.opensearch.common.io.PathUtils;

2
modules/aggs-matrix-stats/src/test/java/org/opensearch/search/aggregations/matrix/stats/MatrixStatsAggregatorTests.java
View File

@ -36,7 +36,7 @@ import org.apache.lucene.document.Field;
import org.apache.lucene.document.SortedNumericDocValuesField;
import org.apache.lucene.document.StringField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.tests.index.RandomIndexWriter;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.MatchAllDocsQuery;
import org.apache.lucene.store.Directory;

4
modules/analysis-common/src/test/java/org/opensearch/analysis/common/ConcatenateGraphTokenFilterFactoryTests.java
View File

@ -8,8 +8,8 @@
package org.opensearch.analysis.common;
import org.apache.lucene.analysis.CannedTokenStream;
import org.apache.lucene.analysis.Token;
import org.apache.lucene.tests.analysis.CannedTokenStream;
import org.apache.lucene.tests.analysis.Token;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.Tokenizer;
import org.apache.lucene.analysis.core.WhitespaceTokenizer;

4
modules/analysis-common/src/test/java/org/opensearch/analysis/common/FlattenGraphTokenFilterFactoryTests.java
View File

@ -32,8 +32,8 @@
package org.opensearch.analysis.common;
import org.apache.lucene.analysis.CannedTokenStream;
import org.apache.lucene.analysis.Token;
import org.apache.lucene.tests.analysis.CannedTokenStream;
import org.apache.lucene.tests.analysis.Token;
import org.apache.lucene.analysis.TokenStream;
import org.opensearch.common.settings.Settings;
import org.opensearch.index.Index;

2
modules/analysis-common/src/test/java/org/opensearch/analysis/common/NGramTokenizerFactoryTests.java
View File

@ -32,7 +32,7 @@
package org.opensearch.analysis.common;
import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.tests.analysis.MockTokenizer;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.Tokenizer;
import org.apache.lucene.analysis.ngram.EdgeNGramTokenFilter;

4
modules/analysis-common/src/test/java/org/opensearch/analysis/common/RemoveDuplicatesFilterFactoryTests.java
View File

@ -32,8 +32,8 @@
package org.opensearch.analysis.common;
import org.apache.lucene.analysis.CannedTokenStream;
import org.apache.lucene.analysis.Token;
import org.apache.lucene.tests.analysis.CannedTokenStream;
import org.apache.lucene.tests.analysis.Token;
import org.opensearch.common.settings.Settings;
import org.opensearch.env.Environment;
import org.opensearch.index.analysis.AnalysisTestsHelper;

2
modules/analysis-common/src/test/java/org/opensearch/analysis/common/SynonymsAnalysisTests.java
View File

@ -33,7 +33,7 @@
package org.opensearch.analysis.common;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.BaseTokenStreamTestCase;
import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.core.KeywordTokenizer;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;

2
modules/analysis-common/src/test/java/org/opensearch/analysis/common/UniqueTokenFilterTests.java
View File

@ -33,7 +33,7 @@
package org.opensearch.analysis.common;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.tests.analysis.MockTokenizer;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.Tokenizer;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;

2
modules/analysis-common/src/test/java/org/opensearch/analysis/common/WhitespaceTokenizerFactoryTests.java
View File

@ -47,7 +47,7 @@ import java.io.IOException;
import java.io.Reader;
import java.io.StringReader;
import static org.apache.lucene.analysis.BaseTokenStreamTestCase.assertTokenStreamContents;
import static org.apache.lucene.tests.analysis.BaseTokenStreamTestCase.assertTokenStreamContents;
public class WhitespaceTokenizerFactoryTests extends OpenSearchTestCase {

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

@ -1 +0,0 @@
0a3d818d6f6fb113831ed34553b24763fbda1e84

1
modules/lang-expression/licenses/lucene-expressions-9.1.0-snapshot-ea989fe8f30.jar.sha1 Normal file
View File

@ -0,0 +1 @@
c7317bb4e72b820a516e0c8a90beac5acc82c2e2

6
modules/mapper-extras/src/test/java/org/opensearch/index/mapper/TokenCountFieldMapperTests.java
View File

@ -33,9 +33,9 @@
package org.opensearch.index.mapper;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.CannedTokenStream;
import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.analysis.Token;
import org.apache.lucene.tests.analysis.CannedTokenStream;
import org.apache.lucene.tests.analysis.MockTokenizer;
import org.apache.lucene.tests.analysis.Token;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.core.KeywordAnalyzer;
import org.apache.lucene.analysis.standard.StandardAnalyzer;

2
modules/parent-join/src/main/java/org/opensearch/join/query/HasChildQueryBuilder.java
View File

@ -443,7 +443,7 @@ public class HasChildQueryBuilder extends AbstractQueryBuilder<HasChildQueryBuil
// blow up since for this query to work we have to have a DirectoryReader otherwise
// we can't load global ordinals - for this to work we simply check if the reader has no leaves
// and rewrite to match nothing
return new MatchNoDocsQuery();
return Queries.newMatchNoDocsQueryWithoutRewrite("unable to load global ordinals with an empty directory reader");
}
throw new IllegalStateException(
"can't load global ordinals for reader of type: " + reader.getClass() + " must be a DirectoryReader"

2
modules/parent-join/src/test/java/org/opensearch/join/aggregations/ChildrenToParentAggregatorTests.java
View File

@ -38,7 +38,7 @@ import org.apache.lucene.document.SortedNumericDocValuesField;
import org.apache.lucene.document.StringField;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.tests.index.RandomIndexWriter;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.MatchAllDocsQuery;
import org.apache.lucene.search.Query;

2
modules/parent-join/src/test/java/org/opensearch/join/aggregations/ParentToChildrenAggregatorTests.java
View File

@ -39,7 +39,7 @@ import org.apache.lucene.document.SortedSetDocValuesField;
import org.apache.lucene.document.StringField;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.tests.index.RandomIndexWriter;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.MatchAllDocsQuery;
import org.apache.lucene.search.Query;

2
modules/percolator/src/test/java/org/opensearch/percolator/PercolatorMatchedSlotSubFetchPhaseTests.java
View File

@ -36,7 +36,7 @@ import org.apache.lucene.document.Document;
import org.apache.lucene.document.NumericDocValuesField;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.tests.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
import org.apache.lucene.index.memory.MemoryIndex;
import org.apache.lucene.search.MatchAllDocsQuery;

2
modules/reindex/src/test/java/org/opensearch/index/reindex/AsyncBulkByScrollActionTests.java
View File

@ -121,7 +121,7 @@ import static java.util.Collections.newSetFromMap;
import static java.util.Collections.singleton;
import static java.util.Collections.singletonList;
import static java.util.Collections.synchronizedSet;
import static org.apache.lucene.util.TestUtil.randomSimpleString;
import static org.apache.lucene.tests.util.TestUtil.randomSimpleString;
import static org.opensearch.action.bulk.BackoffPolicy.constantBackoff;
import static org.opensearch.common.unit.TimeValue.timeValueMillis;
import static org.opensearch.common.unit.TimeValue.timeValueSeconds;

2
modules/reindex/src/test/java/org/opensearch/index/reindex/ClientScrollableHitSourceTests.java
View File

@ -69,7 +69,7 @@ import java.util.function.Function;
import java.util.stream.IntStream;
import static java.util.Collections.emptyMap;
import static org.apache.lucene.util.TestUtil.randomSimpleString;
import static org.apache.lucene.tests.util.TestUtil.randomSimpleString;
import static org.opensearch.common.unit.TimeValue.timeValueSeconds;
import static org.hamcrest.Matchers.instanceOf;

2
modules/reindex/src/test/java/org/opensearch/index/reindex/RoundTripTests.java
View File

@ -50,7 +50,7 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import static org.apache.lucene.util.TestUtil.randomSimpleString;
import static org.apache.lucene.tests.util.TestUtil.randomSimpleString;
import static org.opensearch.common.unit.TimeValue.parseTimeValue;
/**

2
modules/reindex/src/test/java/org/opensearch/index/reindex/UpdateByQueryWhileModifyingTests.java
View File

@ -40,7 +40,7 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;
import static org.apache.lucene.util.TestUtil.randomSimpleString;
import static org.apache.lucene.tests.util.TestUtil.randomSimpleString;
import static org.opensearch.action.support.WriteRequest.RefreshPolicy.IMMEDIATE;
import static org.hamcrest.Matchers.either;
import static org.hamcrest.Matchers.equalTo;

2
modules/transport-netty4/src/yamlRestTest/java/org/opensearch/http/netty4/Netty4ClientYamlTestSuiteIT.java
View File

@ -36,7 +36,7 @@ import com.carrotsearch.randomizedtesting.annotations.Name;
import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
import com.carrotsearch.randomizedtesting.annotations.TimeoutSuite;
import org.apache.lucene.util.TimeUnits;
import org.apache.lucene.tests.util.TimeUnits;
import org.opensearch.test.rest.yaml.ClientYamlTestCandidate;
import org.opensearch.test.rest.yaml.OpenSearchClientYamlSuiteTestCase;
import org.junit.BeforeClass;

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

@ -1 +0,0 @@
a23a2c1c9baad61b6fb5380f072e41534c275875

1
plugins/analysis-icu/licenses/lucene-analysis-icu-9.1.0-snapshot-ea989fe8f30.jar.sha1 Normal file
View File

@ -0,0 +1 @@
77930f802430648980eded22ca6ed47fedaeaba4

2
plugins/analysis-icu/src/test/java/org/opensearch/index/analysis/IcuAnalyzerTests.java
View File

@ -33,7 +33,7 @@
package org.opensearch.index.analysis;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.BaseTokenStreamTestCase;
import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase;
import org.opensearch.Version;
import org.opensearch.cluster.metadata.IndexMetadata;
import org.opensearch.common.settings.Settings;

2
plugins/analysis-icu/src/test/java/org/opensearch/index/analysis/IcuTokenizerFactoryTests.java
View File

@ -48,7 +48,7 @@ import java.io.StringReader;
import java.nio.file.Files;
import java.nio.file.Path;
import static org.apache.lucene.analysis.BaseTokenStreamTestCase.assertTokenStreamContents;
import static org.apache.lucene.tests.analysis.BaseTokenStreamTestCase.assertTokenStreamContents;
public class IcuTokenizerFactoryTests extends OpenSearchTestCase {

4
plugins/analysis-icu/src/test/java/org/opensearch/index/analysis/IndexableBinaryStringToolsTests.java
View File

@ -35,8 +35,8 @@ import com.carrotsearch.randomizedtesting.annotations.ThreadLeakScope;
import com.carrotsearch.randomizedtesting.annotations.ThreadLeakScope.Scope;
import com.carrotsearch.randomizedtesting.annotations.TimeoutSuite;
import org.apache.lucene.util.ArrayUtil;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.TimeUnits;
import org.apache.lucene.tests.util.LuceneTestCase;
import org.apache.lucene.tests.util.TimeUnits;
import org.opensearch.test.junit.listeners.ReproduceInfoPrinter;
import org.junit.BeforeClass;

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

@ -1 +0,0 @@
55f00abe01e51181d687c6bbceca8544f319b97d

1
plugins/analysis-kuromoji/licenses/lucene-analysis-kuromoji-9.1.0-snapshot-ea989fe8f30.jar.sha1 Normal file
View File

@ -0,0 +1 @@
c66f568fa9138c6ab6f3abf1efbfab3c7b5991d4

2
plugins/analysis-kuromoji/src/test/java/org/opensearch/index/analysis/KuromojiAnalysisTests.java
View File

@ -53,7 +53,7 @@ import java.io.StringReader;
import java.nio.file.Files;
import java.nio.file.Path;
import static org.apache.lucene.analysis.BaseTokenStreamTestCase.assertTokenStreamContents;
import static org.apache.lucene.tests.analysis.BaseTokenStreamTestCase.assertTokenStreamContents;
import static org.hamcrest.CoreMatchers.containsString;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.greaterThan;

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

@ -1 +0,0 @@
c5258e674ad9c189338b026710869c2955d8e11d

1
plugins/analysis-nori/licenses/lucene-analysis-nori-9.1.0-snapshot-ea989fe8f30.jar.sha1 Normal file
View File

@ -0,0 +1 @@
e8c47600ea859b999a5f5647341b0350b03dafcd

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

@ -1 +0,0 @@
437960fac10a9f8327fbd87be4e408eb140988b3

1
plugins/analysis-phonetic/licenses/lucene-analysis-phonetic-9.1.0-snapshot-ea989fe8f30.jar.sha1 Normal file
View File

@ -0,0 +1 @@
6f0f5c71052beee26e4ce99e1147ce406234f417

2
plugins/analysis-phonetic/src/test/java/org/opensearch/index/analysis/SimplePhoneticAnalysisTests.java
View File

@ -32,7 +32,7 @@
package org.opensearch.index.analysis;
import org.apache.lucene.analysis.BaseTokenStreamTestCase;
import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase;
import org.apache.lucene.analysis.Tokenizer;
import org.apache.lucene.analysis.core.WhitespaceTokenizer;
import org.apache.lucene.analysis.phonetic.DaitchMokotoffSoundexFilter;

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

@ -1 +0,0 @@
fe96c0b4609be5f7450773c2d7f099c51f4b1f7a

1
plugins/analysis-smartcn/licenses/lucene-analysis-smartcn-9.1.0-snapshot-ea989fe8f30.jar.sha1 Normal file
View File

@ -0,0 +1 @@
32aad8b8491df3c9862e7fe75e98bccdb6a25bda

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

@ -1 +0,0 @@
b92e86dd451d225e68ee4abac5b00bf883b6ea00

1
plugins/analysis-stempel/licenses/lucene-analysis-stempel-9.1.0-snapshot-ea989fe8f30.jar.sha1 Normal file
View File

@ -0,0 +1 @@
ef546cfaaf727d93c4e86ddc7f77b525af135623

4
plugins/analysis-stempel/src/test/java/org/opensearch/index/analysis/AnalysisPolishFactoryTests.java
View File

@ -33,8 +33,8 @@
package org.opensearch.index.analysis;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.BaseTokenStreamTestCase;
import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase;
import org.apache.lucene.tests.analysis.MockTokenizer;
import org.apache.lucene.analysis.Tokenizer;
import org.opensearch.Version;
import org.opensearch.cluster.metadata.IndexMetadata;

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

@ -1 +0,0 @@
048fddf601c6de7dd296f6da3f394544618f7cea

1
plugins/analysis-ukrainian/licenses/lucene-analysis-morfologik-9.1.0-snapshot-ea989fe8f30.jar.sha1 Normal file
View File

@ -0,0 +1 @@
21c3511469f67019804e41a8d83ffc5c36de6479

2
plugins/analysis-ukrainian/src/main/java/org/opensearch/index/analysis/UkrainianAnalyzerProvider.java
View File

@ -45,7 +45,7 @@ public class UkrainianAnalyzerProvider extends AbstractIndexAnalyzerProvider<Ukr
public UkrainianAnalyzerProvider(IndexSettings indexSettings, Environment env, String name, Settings settings) {
super(indexSettings, name, settings);
analyzer = new UkrainianMorfologikAnalyzer(
Analysis.parseStopWords(env, settings, UkrainianMorfologikAnalyzer.getDefaultStopSet()),
Analysis.parseStopWords(env, settings, UkrainianMorfologikAnalyzer.getDefaultStopwords()),
Analysis.parseStemExclusion(settings, CharArraySet.EMPTY_SET)
);
}

4
plugins/ingest-attachment/src/test/java/org/opensearch/ingest/attachment/TikaDocTests.java
View File

@ -32,8 +32,8 @@
package org.opensearch.ingest.attachment;
import org.apache.lucene.util.LuceneTestCase.SuppressFileSystems;
import org.apache.lucene.util.TestUtil;
import org.apache.lucene.tests.util.LuceneTestCase.SuppressFileSystems;
import org.apache.lucene.tests.util.TestUtil;
import org.apache.tika.metadata.Metadata;
import org.opensearch.common.io.PathUtils;
import org.opensearch.test.OpenSearchTestCase;

2
plugins/mapper-annotated-text/src/test/java/org/opensearch/search/fetch/subphase/highlight/AnnotatedTextHighlighterTests.java
View File

@ -41,7 +41,7 @@ import org.apache.lucene.document.TextField;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexOptions;
import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.tests.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.MatchAllDocsQuery;

2
plugins/repository-hdfs/src/test/java/org/opensearch/repositories/hdfs/TestingFs.java
View File

@ -37,7 +37,7 @@ import org.apache.hadoop.fs.DelegateToFileSystem;
import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.RawLocalFileSystem;
import org.apache.hadoop.fs.permission.FsPermission;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.tests.util.LuceneTestCase;
import java.io.FileNotFoundException;
import java.io.IOException;

2
qa/evil-tests/src/test/java/org/opensearch/cli/EvilEnvironmentAwareCommandTests.java
View File

@ -33,7 +33,7 @@
package org.opensearch.cli;
import joptsimple.OptionSet;
import org.apache.lucene.util.TestRuleRestoreSystemProperties;
import org.apache.lucene.tests.util.TestRuleRestoreSystemProperties;
import org.opensearch.common.SuppressForbidden;
import org.opensearch.env.Environment;
import org.opensearch.test.OpenSearchTestCase;

2
qa/evil-tests/src/test/java/org/opensearch/common/settings/EvilKeyStoreWrapperTests.java
View File

@ -33,7 +33,7 @@
package org.opensearch.common.settings;
import org.apache.lucene.util.Constants;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.tests.util.LuceneTestCase;
import org.opensearch.cli.ExitCodes;
import org.opensearch.cli.UserException;
import org.opensearch.test.OpenSearchTestCase;

3
qa/mixed-cluster/src/test/java/org/opensearch/backwards/MixedClusterClientYamlTestSuiteIT.java
View File

@ -34,7 +34,7 @@ package org.opensearch.backwards;
import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
import com.carrotsearch.randomizedtesting.annotations.TimeoutSuite;
import org.apache.lucene.util.TimeUnits;
import org.apache.lucene.tests.util.TimeUnits;
import org.opensearch.test.rest.yaml.ClientYamlTestCandidate;
import org.opensearch.test.rest.yaml.OpenSearchClientYamlSuiteTestCase;
@ -55,4 +55,3 @@ public class MixedClusterClientYamlTestSuiteIT extends OpenSearchClientYamlSuite
return false;
}
}

2
qa/multi-cluster-search/src/test/java/org/opensearch/search/CCSDuelIT.java
View File

@ -35,7 +35,7 @@ package org.opensearch.search;
import com.carrotsearch.randomizedtesting.RandomizedContext;
import com.carrotsearch.randomizedtesting.annotations.TimeoutSuite;
import org.apache.lucene.search.join.ScoreMode;
import org.apache.lucene.util.TimeUnits;
import org.apache.lucene.tests.util.TimeUnits;
import org.opensearch.action.ActionListener;
import org.opensearch.action.LatchedActionListener;
import org.opensearch.action.admin.indices.refresh.RefreshRequest;

2
qa/multi-cluster-search/src/test/java/org/opensearch/search/MultiClusterSearchYamlTestSuiteIT.java
View File

@ -35,7 +35,7 @@ package org.opensearch.search;
import com.carrotsearch.randomizedtesting.annotations.Name;
import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
import com.carrotsearch.randomizedtesting.annotations.TimeoutSuite;
import org.apache.lucene.util.TimeUnits;
import org.apache.lucene.tests.util.TimeUnits;
import org.opensearch.test.rest.yaml.ClientYamlTestCandidate;
import org.opensearch.test.rest.yaml.OpenSearchClientYamlSuiteTestCase;

2
qa/no-bootstrap-tests/src/test/java/org/opensearch/bootstrap/SpawnerNoBootstrapTests.java
View File

@ -33,7 +33,7 @@
package org.opensearch.bootstrap;
import org.apache.lucene.util.Constants;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.tests.util.LuceneTestCase;
import org.opensearch.Version;
import org.opensearch.common.settings.Settings;
import org.opensearch.env.Environment;

2
qa/rolling-upgrade/src/test/java/org/opensearch/upgrades/UpgradeClusterClientYamlTestSuiteIT.java
View File

@ -34,7 +34,7 @@ package org.opensearch.upgrades;
import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
import com.carrotsearch.randomizedtesting.annotations.TimeoutSuite;
import org.apache.lucene.util.TimeUnits;
import org.apache.lucene.tests.util.TimeUnits;
import org.opensearch.common.settings.Settings;
import org.opensearch.test.rest.OpenSearchRestTestCase;
import org.opensearch.test.rest.yaml.ClientYamlTestCandidate;

3
qa/smoke-test-multinode/src/test/java/org/opensearch/smoketest/SmokeTestMultiNodeClientYamlTestSuiteIT.java
View File

@ -36,7 +36,7 @@ import com.carrotsearch.randomizedtesting.annotations.Name;
import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
import com.carrotsearch.randomizedtesting.annotations.TimeoutSuite;
import org.apache.lucene.util.TimeUnits;
import org.apache.lucene.tests.util.TimeUnits;
import org.opensearch.test.rest.yaml.ClientYamlTestCandidate;
import org.opensearch.test.rest.yaml.OpenSearchClientYamlSuiteTestCase;
@ -52,4 +52,3 @@ public class SmokeTestMultiNodeClientYamlTestSuiteIT extends OpenSearchClientYam
return OpenSearchClientYamlSuiteTestCase.createParameters();
}
}

2
qa/wildfly/build.gradle
View File

@ -102,7 +102,7 @@ testingConventions {
// We only have one "special" integration test here to connect to wildfly
naming {
IT {
baseClass 'org.apache.lucene.util.LuceneTestCase'
baseClass 'org.apache.lucene.tests.util.LuceneTestCase'
}
}
}

4
qa/wildfly/src/test/java/org/opensearch/wildfly/WildflyIT.java
View File

@ -42,8 +42,8 @@ import org.apache.http.impl.client.HttpClientBuilder;
import org.apache.http.util.EntityUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.TestRuleLimitSysouts;
import org.apache.lucene.tests.util.LuceneTestCase;
import org.apache.lucene.tests.util.TestRuleLimitSysouts;
import org.opensearch.cluster.ClusterModule;
import org.opensearch.common.xcontent.DeprecationHandler;
import org.opensearch.common.xcontent.NamedXContentRegistry;

2
rest-api-spec/src/yamlRestTest/java/org/opensearch/test/rest/ClientYamlTestSuiteIT.java
View File

@ -35,7 +35,7 @@ package org.opensearch.test.rest;
import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
import com.carrotsearch.randomizedtesting.annotations.TimeoutSuite;
import org.apache.lucene.util.TimeUnits;
import org.apache.lucene.tests.util.TimeUnits;
import org.opensearch.test.rest.yaml.ClientYamlTestCandidate;
import org.opensearch.test.rest.yaml.OpenSearchClientYamlSuiteTestCase;

2
server/build.gradle
View File

@ -182,7 +182,7 @@ tasks.named("testingConventions").configure {
naming.clear()
naming {
Tests {
baseClass "org.apache.lucene.util.LuceneTestCase"
baseClass "org.apache.lucene.tests.util.LuceneTestCase"
}
IT {
baseClass "org.opensearch.test.OpenSearchIntegTestCase"

1
server/licenses/lucene-analysis-common-9.0.0.jar.sha1
View File

@ -1 +0,0 @@
f78890829c3d6f15de48fdbc2c77ef4c0e3f005c

1
server/licenses/lucene-analysis-common-9.1.0-snapshot-ea989fe8f30.jar.sha1 Normal file
View File

@ -0,0 +1 @@
bafd720282a371efe7b0e7238f9dee7e2ad3a586

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

@ -1 +0,0 @@
9fb48d0244799e18299449ee62459caab0728490

1
server/licenses/lucene-backward-codecs-9.1.0-snapshot-ea989fe8f30.jar.sha1 Normal file
View File

@ -0,0 +1 @@
597fe288a252a14c0876451c97afee2b4529f85a

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

@ -1 +0,0 @@
be679fd274f264e4e8b02bc032d2788cd4076ab4

1
server/licenses/lucene-core-9.1.0-snapshot-ea989fe8f30.jar.sha1 Normal file
View File

@ -0,0 +1 @@
80cd2fff33ced89924771c7079d42bf82f1266f6

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

@ -1 +0,0 @@
27ebe235d427b4e392fabab9b6bfa09524ca7f8b

1
server/licenses/lucene-grouping-9.1.0-snapshot-ea989fe8f30.jar.sha1 Normal file
View File

@ -0,0 +1 @@
7059f47668a2942c60ad03b1d58eca8dcb010e4e

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

@ -1 +0,0 @@
a3cb395c2e8c672e6eec951b2b02371a4a883f73

1
server/licenses/lucene-highlighter-9.1.0-snapshot-ea989fe8f30.jar.sha1 Normal file
View File

@ -0,0 +1 @@
3c841ca23eb08a939fa49ba4af249c3b6d849c42

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

@ -1 +0,0 @@
94a855b5d09a6601289aeaeba0f11d5539552590

1
server/licenses/lucene-join-9.1.0-snapshot-ea989fe8f30.jar.sha1 Normal file
View File

@ -0,0 +1 @@
4984e041ae68f5939c01e41b2c9648ae2c021340

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

@ -1 +0,0 @@
2371c95031422bc1f501d43ffcc7311baed4b35b

1
server/licenses/lucene-memory-9.1.0-snapshot-ea989fe8f30.jar.sha1 Normal file
View File

@ -0,0 +1 @@
fead9467ce65469579168eb0f47e014fdb3c63d9

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

@ -1 +0,0 @@
25c6170f4fa2f707908dfb92fbafc76727f901e0

1
server/licenses/lucene-misc-9.1.0-snapshot-ea989fe8f30.jar.sha1 Normal file
View File

@ -0,0 +1 @@
d98ab1966b8ca53b70fe071281bcea27d602ec30

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

@ -1 +0,0 @@
87b4c7833d30895baf7091f9cb0db878e970b604

1
server/licenses/lucene-queries-9.1.0-snapshot-ea989fe8f30.jar.sha1 Normal file
View File

@ -0,0 +1 @@
895e27127ae55031e35e152da8be941bd55f7f6a

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

@ -1 +0,0 @@
bf13395ad2033bca3182fcbc83204e8ae1951945

1
server/licenses/lucene-queryparser-9.1.0-snapshot-ea989fe8f30.jar.sha1 Normal file
View File

@ -0,0 +1 @@
1433392237ea01ef35f4e2ffc52f496b0669624c

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

@ -1 +0,0 @@
3c153a1dc1da3f98083cc932c9476df4b77b0ca5

1
server/licenses/lucene-sandbox-9.1.0-snapshot-ea989fe8f30.jar.sha1 Normal file
View File

@ -0,0 +1 @@
b0688963ca8288f5a3e47ca6e4b38bc2fde780e7

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

@ -1 +0,0 @@
91535ef6512c45c7e2b113b04cab7738ee774893

1
server/licenses/lucene-spatial-extras-9.1.0-snapshot-ea989fe8f30.jar.sha1 Normal file
View File

@ -0,0 +1 @@
206e8918a726710c8a6fb927e59adf26c6ad5bed

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

@ -1 +0,0 @@
6b4ee47f218ed3d123c1b07671677a2e4f3c133b

1
server/licenses/lucene-spatial3d-9.1.0-snapshot-ea989fe8f30.jar.sha1 Normal file
View File

@ -0,0 +1 @@
3d1e26c37b45bdf2ef598d16468220ab33983a8f

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

@ -1 +0,0 @@
a7d0e7279737114c039f5214082da948732096a6

1
server/licenses/lucene-suggest-9.1.0-snapshot-ea989fe8f30.jar.sha1 Normal file
View File

@ -0,0 +1 @@
69ab05339614766c732fef7c037cc5b676bd40dc

4
server/src/internalClusterTest/java/org/opensearch/bwcompat/RecoveryWithUnsupportedIndicesIT.java
View File

@ -39,8 +39,8 @@ import java.nio.file.Path;
import java.util.ArrayList;
import java.util.List;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.TestUtil;
import org.apache.lucene.tests.util.LuceneTestCase;
import org.apache.lucene.tests.util.TestUtil;
import org.opensearch.ExceptionsHelper;
import org.opensearch.common.settings.Settings;
import org.opensearch.env.Environment;

2
server/src/internalClusterTest/java/org/opensearch/cluster/allocation/ClusterRerouteIT.java
View File

@ -35,7 +35,7 @@ package org.opensearch.cluster.allocation;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.tests.util.LuceneTestCase;
import org.opensearch.action.admin.cluster.health.ClusterHealthResponse;
import org.opensearch.action.admin.cluster.reroute.ClusterRerouteResponse;
import org.opensearch.action.admin.cluster.reroute.TransportClusterRerouteAction;

6
server/src/internalClusterTest/java/org/opensearch/cluster/routing/allocation/decider/DiskThresholdDeciderIT.java
View File

@ -32,9 +32,9 @@
package org.opensearch.cluster.routing.allocation.decider;
import org.apache.lucene.mockfile.FilterFileStore;
import org.apache.lucene.mockfile.FilterFileSystemProvider;
import org.apache.lucene.mockfile.FilterPath;
import org.apache.lucene.tests.mockfile.FilterFileStore;
import org.apache.lucene.tests.mockfile.FilterFileSystemProvider;
import org.apache.lucene.tests.mockfile.FilterPath;
import org.apache.lucene.util.Constants;
import org.opensearch.action.admin.cluster.snapshots.create.CreateSnapshotResponse;

2
server/src/internalClusterTest/java/org/opensearch/discovery/DiskDisruptionIT.java
View File

@ -32,7 +32,7 @@
package org.opensearch.discovery;
import com.carrotsearch.randomizedtesting.RandomizedTest;
import org.apache.lucene.mockfile.FilterFileSystemProvider;
import org.apache.lucene.tests.mockfile.FilterFileSystemProvider;
import org.opensearch.action.admin.indices.stats.ShardStats;
import org.opensearch.cluster.metadata.IndexMetadata;
import org.opensearch.common.io.PathUtils;

6
server/src/internalClusterTest/java/org/opensearch/index/engine/MaxDocsLimitIT.java
View File

@ -32,8 +32,6 @@
package org.opensearch.index.engine;
import org.apache.lucene.index.IndexWriterMaxDocsChanger;
import org.opensearch.action.index.IndexResponse;
import org.opensearch.action.search.SearchResponse;
import org.opensearch.cluster.metadata.IndexMetadata;
@ -94,12 +92,12 @@ public class MaxDocsLimitIT extends OpenSearchIntegTestCase {
@Before
public void setMaxDocs() {
maxDocs.set(randomIntBetween(10, 100)); // Do not set this too low as we can fail to write the cluster state
IndexWriterMaxDocsChanger.setMaxDocs(maxDocs.get());
setIndexWriterMaxDocs(maxDocs.get());
}
@After
public void restoreMaxDocs() {
IndexWriterMaxDocsChanger.restoreMaxDocs();
restoreIndexWriterMaxDocs();
}
public void testMaxDocsLimit() throws Exception {

2
server/src/internalClusterTest/java/org/opensearch/indices/stats/IndexStatsIT.java
View File

@ -32,7 +32,7 @@
package org.opensearch.indices.stats;
import org.apache.lucene.util.LuceneTestCase.SuppressCodecs;
import org.apache.lucene.tests.util.LuceneTestCase.SuppressCodecs;
import org.opensearch.action.DocWriteResponse;
import org.opensearch.action.admin.cluster.node.stats.NodesStatsResponse;
import org.opensearch.action.admin.indices.create.CreateIndexRequest;

Some files were not shown because too many files have changed in this diff Show More