Merge branch 'main' into replace-master-internal

Signed-off-by: Tianli Feng <ftianli@amazon.com>
opensearch-project · Mar 17, 2022 · 36a5bbe · 36a5bbe
2 parents 717bc11 + 3675400
commit 36a5bbe
Show file tree

Hide file tree

Showing 398 changed files with 980 additions and 1,452 deletions.
diff --git a/buildSrc/src/main/groovy/org/opensearch/gradle/plugin/PluginBuildPlugin.groovy b/buildSrc/src/main/groovy/org/opensearch/gradle/plugin/PluginBuildPlugin.groovy
@@ -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'

diff --git a/...dSrc/src/main/java/org/opensearch/gradle/precommit/TestingConventionsPrecommitPlugin.java b/...dSrc/src/main/java/org/opensearch/gradle/precommit/TestingConventionsPrecommitPlugin.java
@@ -43,7 +43,7 @@ public TaskProvider<? extends Task> createTask(Project project) {
             .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");

diff --git a/buildSrc/src/main/resources/forbidden/opensearch-test-signatures.txt b/buildSrc/src/main/resources/forbidden/opensearch-test-signatures.txt
@@ -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

diff --git a/buildSrc/version.properties b/buildSrc/version.properties
@@ -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

diff --git a/...nt/rest-high-level/src/test/java/org/opensearch/client/IndicesRequestConvertersTests.java b/...nt/rest-high-level/src/test/java/org/opensearch/client/IndicesRequestConvertersTests.java
@@ -37,7 +37,7 @@
 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;

diff --git a/...ls/keystore-cli/src/test/java/org/opensearch/common/settings/KeyStoreCommandTestCase.java b/...ls/keystore-cli/src/test/java/org/opensearch/common/settings/KeyStoreCommandTestCase.java
@@ -43,7 +43,7 @@
 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;

diff --git a/...tion/tools/plugin-cli/src/test/java/org/opensearch/plugins/InstallPluginCommandTests.java b/...tion/tools/plugin-cli/src/test/java/org/opensearch/plugins/InstallPluginCommandTests.java
@@ -35,7 +35,7 @@
 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;

diff --git a/...bution/tools/plugin-cli/src/test/java/org/opensearch/plugins/ListPluginsCommandTests.java b/...bution/tools/plugin-cli/src/test/java/org/opensearch/plugins/ListPluginsCommandTests.java
@@ -40,7 +40,7 @@
 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;

diff --git a/...ution/tools/plugin-cli/src/test/java/org/opensearch/plugins/RemovePluginCommandTests.java b/...ution/tools/plugin-cli/src/test/java/org/opensearch/plugins/RemovePluginCommandTests.java
@@ -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;

diff --git a/libs/core/src/test/java/org/opensearch/core/internal/io/IOUtilsTests.java b/libs/core/src/test/java/org/opensearch/core/internal/io/IOUtilsTests.java
@@ -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;

diff --git a/...test/java/org/opensearch/search/aggregations/matrix/stats/MatrixStatsAggregatorTests.java b/...test/java/org/opensearch/search/aggregations/matrix/stats/MatrixStatsAggregatorTests.java
@@ -36,7 +36,7 @@
 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;

diff --git a/...src/test/java/org/opensearch/analysis/common/ConcatenateGraphTokenFilterFactoryTests.java b/...src/test/java/org/opensearch/analysis/common/ConcatenateGraphTokenFilterFactoryTests.java
@@ -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;

diff --git a/...mon/src/test/java/org/opensearch/analysis/common/FlattenGraphTokenFilterFactoryTests.java b/...mon/src/test/java/org/opensearch/analysis/common/FlattenGraphTokenFilterFactoryTests.java
@@ -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;

diff --git a/...is-common/src/test/java/org/opensearch/analysis/common/HighlighterWithAnalyzersTests.java b/...is-common/src/test/java/org/opensearch/analysis/common/HighlighterWithAnalyzersTests.java
@@ -70,10 +70,8 @@ protected Collection<Class<? extends Plugin>> nodePlugins() {
 
     public void testNgramHighlightingWithBrokenPositions() throws IOException {
         assertAcked(
-            prepareCreate("test").addMapping(
-                "test",
+            prepareCreate("test").setMapping(
                 jsonBuilder().startObject()
-                    .startObject("test")
                     .startObject("properties")
                     .startObject("name")
                     .field("type", "text")
@@ -88,7 +86,6 @@ public void testNgramHighlightingWithBrokenPositions() throws IOException {
                     .endObject()
                     .endObject()
                     .endObject()
-                    .endObject()
             )
                 .setSettings(
                     Settings.builder()
@@ -260,7 +257,7 @@ public void testPhrasePrefix() throws IOException {
             .put("index.analysis.filter.synonym.type", "synonym")
             .putList("index.analysis.filter.synonym.synonyms", "quick => fast");
 
-        assertAcked(prepareCreate("first_test_index").setSettings(builder.build()).addMapping("type1", type1TermVectorMapping()));
+        assertAcked(prepareCreate("first_test_index").setSettings(builder.build()).setMapping(type1TermVectorMapping()));
 
         ensureGreen();
 
@@ -421,7 +418,6 @@ public void testPhrasePrefix() throws IOException {
     public static XContentBuilder type1TermVectorMapping() throws IOException {
         return XContentFactory.jsonBuilder()
             .startObject()
-            .startObject("type1")
             .startObject("properties")
             .startObject("field1")
             .field("type", "text")
@@ -432,7 +428,6 @@ public static XContentBuilder type1TermVectorMapping() throws IOException {
             .field("term_vector", "with_positions_offsets")
             .endObject()
             .endObject()
-            .endObject()
             .endObject();
     }
 }
diff --git a/...lysis-common/src/test/java/org/opensearch/analysis/common/NGramTokenizerFactoryTests.java b/...lysis-common/src/test/java/org/opensearch/analysis/common/NGramTokenizerFactoryTests.java
@@ -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;

diff --git a/...mmon/src/test/java/org/opensearch/analysis/common/RemoveDuplicatesFilterFactoryTests.java b/...mmon/src/test/java/org/opensearch/analysis/common/RemoveDuplicatesFilterFactoryTests.java
@@ -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;

diff --git a/...s/analysis-common/src/test/java/org/opensearch/analysis/common/SynonymsAnalysisTests.java b/...s/analysis-common/src/test/java/org/opensearch/analysis/common/SynonymsAnalysisTests.java
@@ -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;

diff --git a/.../analysis-common/src/test/java/org/opensearch/analysis/common/UniqueTokenFilterTests.java b/.../analysis-common/src/test/java/org/opensearch/analysis/common/UniqueTokenFilterTests.java
@@ -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;

diff --git a/...-common/src/test/java/org/opensearch/analysis/common/WhitespaceTokenizerFactoryTests.java b/...-common/src/test/java/org/opensearch/analysis/common/WhitespaceTokenizerFactoryTests.java
@@ -47,7 +47,7 @@
 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 {
 

diff --git a/modules/lang-expression/licenses/lucene-expressions-9.0.0.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-9.0.0.jar.sha1
diff --git a/modules/lang-expression/licenses/lucene-expressions-9.1.0-snapshot-ea989fe8f30.jar.sha1 b/modules/lang-expression/licenses/lucene-expressions-9.1.0-snapshot-ea989fe8f30.jar.sha1
@@ -0,0 +1 @@
+c7317bb4e72b820a516e0c8a90beac5acc82c2e2
diff --git a/...ssion/src/internalClusterTest/java/org/opensearch/script/expression/MoreExpressionIT.java b/...ssion/src/internalClusterTest/java/org/opensearch/script/expression/MoreExpressionIT.java
@@ -641,12 +641,11 @@ public void testPipelineAggregationScript() throws Exception {
     public void testGeo() throws Exception {
         XContentBuilder xContentBuilder = XContentFactory.jsonBuilder()
             .startObject()
-            .startObject("type1")
             .startObject("properties")
             .startObject("location")
             .field("type", "geo_point");
-        xContentBuilder.endObject().endObject().endObject().endObject();
-        assertAcked(prepareCreate("test").addMapping("type1", xContentBuilder));
+        xContentBuilder.endObject().endObject().endObject();
+        assertAcked(prepareCreate("test").setMapping(xContentBuilder));
         ensureGreen();
         client().prepareIndex("test")
             .setId("1")
@@ -687,12 +686,11 @@ public void testGeo() throws Exception {
     public void testBoolean() throws Exception {
         XContentBuilder xContentBuilder = XContentFactory.jsonBuilder()
             .startObject()
-            .startObject("doc")
             .startObject("properties")
             .startObject("vip")
             .field("type", "boolean");
-        xContentBuilder.endObject().endObject().endObject().endObject();
-        assertAcked(prepareCreate("test").addMapping("doc", xContentBuilder));
+        xContentBuilder.endObject().endObject().endObject();
+        assertAcked(prepareCreate("test").setMapping(xContentBuilder));
         ensureGreen();
         indexRandom(
             true,

diff --git a/...src/javaRestTest/java/org/opensearch/index/mapper/TokenCountFieldMapperIntegrationIT.java b/...src/javaRestTest/java/org/opensearch/index/mapper/TokenCountFieldMapperIntegrationIT.java
@@ -128,10 +128,8 @@ private void init() throws IOException {
         settings.put("index.analysis.analyzer.mock_english.tokenizer", "standard");
         settings.put("index.analysis.analyzer.mock_english.filter", "stop");
         prepareCreate("test").setSettings(settings)
-            .addMapping(
-                "test",
+            .setMapping(
                 jsonBuilder().startObject()
-                    .startObject("test")
                     .startObject("properties")
                     .startObject("foo")
                     .field("type", "text")
@@ -162,7 +160,6 @@ private void init() throws IOException {
                     .endObject()
                     .endObject()
                     .endObject()
-                    .endObject()
             )
             .get();
         ensureGreen();

diff --git a/...s/mapper-extras/src/test/java/org/opensearch/index/mapper/TokenCountFieldMapperTests.java b/...s/mapper-extras/src/test/java/org/opensearch/index/mapper/TokenCountFieldMapperTests.java
@@ -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;

diff --git a/...nternalClusterTest/java/org/opensearch/join/aggregations/AbstractParentChildTestCase.java b/...nternalClusterTest/java/org/opensearch/join/aggregations/AbstractParentChildTestCase.java
@@ -55,8 +55,7 @@ public abstract class AbstractParentChildTestCase extends ParentChildTestCase {
     @Before
     public void setupCluster() throws Exception {
         assertAcked(
-            prepareCreate("test").addMapping(
-                "doc",
+            prepareCreate("test").setMapping(
                 addFieldMappings(
                     buildParentJoinFieldMappingFromSimplifiedDef("join_field", true, "article", "comment"),
                     "commenter",

diff --git a/...parent-join/src/internalClusterTest/java/org/opensearch/join/aggregations/ChildrenIT.java b/...parent-join/src/internalClusterTest/java/org/opensearch/join/aggregations/ChildrenIT.java
@@ -174,8 +174,7 @@ public void testParentWithMultipleBuckets() throws Exception {
     public void testWithDeletes() throws Exception {
         String indexName = "xyz";
         assertAcked(
-            prepareCreate(indexName).addMapping(
-                "doc",
+            prepareCreate(indexName).setMapping(
                 addFieldMappings(buildParentJoinFieldMappingFromSimplifiedDef("join_field", true, "parent", "child"), "name", "keyword")
             )
         );
@@ -234,8 +233,7 @@ public void testPostCollection() throws Exception {
             prepareCreate(indexName).setSettings(
                 Settings.builder().put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1).put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0)
             )
-                .addMapping(
-                    "doc",
+                .setMapping(
                     addFieldMappings(
                         buildParentJoinFieldMappingFromSimplifiedDef("join_field", true, masterType, childType),
                         "brand",
@@ -309,8 +307,7 @@ public void testHierarchicalChildrenAggs() {
         String parentType = "country";
         String childType = "city";
         assertAcked(
-            prepareCreate(indexName).addMapping(
-                "doc",
+            prepareCreate(indexName).setMapping(
                 addFieldMappings(
                     buildParentJoinFieldMappingFromSimplifiedDef("join_field", true, grandParentType, parentType, parentType, childType),
                     "name",
@@ -352,8 +349,7 @@ public void testPostCollectAllLeafReaders() throws Exception {
         // Before we only evaluated segments that yielded matches in 'towns' and 'parent_names' aggs, which caused
         // us to miss to evaluate child docs in segments we didn't have parent matches for.
         assertAcked(
-            prepareCreate("index").addMapping(
-                "doc",
+            prepareCreate("index").setMapping(
                 addFieldMappings(
                     buildParentJoinFieldMappingFromSimplifiedDef("join_field", true, "parentType", "childType"),
                     "name",