Skip to content

Commit 4706fc1

Browse files
author
Harish Bhakuni
committed
Address PR Changes
Signed-off-by: Harish Bhakuni <hbhakuni@amazon.com>
1 parent 9ad4250 commit 4706fc1

4 files changed

Lines changed: 7 additions & 94 deletions

File tree

‎server/src/internalClusterTest/java/org/opensearch/cluster/settings/ClusterSettingsIT.java‎

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@
3232

3333
package org.opensearch.cluster.settings;
3434

35-
import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
36-
3735
import org.apache.logging.log4j.Level;
3836
import org.apache.logging.log4j.LogManager;
3937
import org.opensearch.action.admin.cluster.settings.ClusterUpdateSettingsRequestBuilder;
@@ -45,43 +43,23 @@
4543
import org.opensearch.common.settings.Settings;
4644
import org.opensearch.common.settings.SettingsException;
4745
import org.opensearch.common.unit.TimeValue;
48-
import org.opensearch.common.util.FeatureFlags;
4946
import org.opensearch.core.common.unit.ByteSizeUnit;
5047
import org.opensearch.indices.recovery.RecoverySettings;
51-
import org.opensearch.test.ParameterizedOpenSearchIntegTestCase;
48+
import org.opensearch.test.OpenSearchIntegTestCase;
5249
import org.junit.After;
5350

5451
import java.util.Arrays;
55-
import java.util.Collection;
5652

5753
import static org.opensearch.cluster.routing.allocation.DiskThresholdSettings.CLUSTER_ROUTING_ALLOCATION_REROUTE_INTERVAL_SETTING;
5854
import static org.opensearch.cluster.routing.allocation.decider.ThrottlingAllocationDecider.CLUSTER_ROUTING_ALLOCATION_NODE_INITIAL_PRIMARIES_RECOVERIES_SETTING;
59-
import static org.opensearch.search.SearchService.CLUSTER_CONCURRENT_SEGMENT_SEARCH_SETTING;
6055
import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertAcked;
6156
import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertBlocked;
6257
import static org.hamcrest.Matchers.containsString;
6358
import static org.hamcrest.Matchers.equalTo;
6459
import static org.hamcrest.Matchers.notNullValue;
6560
import static org.hamcrest.Matchers.nullValue;
6661

67-
public class ClusterSettingsIT extends ParameterizedOpenSearchIntegTestCase {
68-
69-
public ClusterSettingsIT(Settings settings) {
70-
super(settings);
71-
}
72-
73-
@ParametersFactory
74-
public static Collection<Object[]> parameters() {
75-
return Arrays.asList(
76-
new Object[] { Settings.builder().put(CLUSTER_CONCURRENT_SEGMENT_SEARCH_SETTING.getKey(), false).build() },
77-
new Object[] { Settings.builder().put(CLUSTER_CONCURRENT_SEGMENT_SEARCH_SETTING.getKey(), true).build() }
78-
);
79-
}
80-
81-
@Override
82-
protected Settings featureFlagSettings() {
83-
return Settings.builder().put(super.featureFlagSettings()).put(FeatureFlags.CONCURRENT_SEGMENT_SEARCH, "true").build();
84-
}
62+
public class ClusterSettingsIT extends OpenSearchIntegTestCase {
8563

8664
@After
8765
public void cleanup() throws Exception {

‎server/src/internalClusterTest/java/org/opensearch/script/StoredScriptsIT.java‎

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -31,41 +31,21 @@
3131

3232
package org.opensearch.script;
3333

34-
import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
35-
3634
import org.opensearch.common.settings.Settings;
37-
import org.opensearch.common.util.FeatureFlags;
3835
import org.opensearch.core.common.bytes.BytesArray;
3936
import org.opensearch.core.xcontent.MediaTypeRegistry;
4037
import org.opensearch.plugins.Plugin;
41-
import org.opensearch.test.ParameterizedOpenSearchIntegTestCase;
38+
import org.opensearch.test.OpenSearchIntegTestCase;
4239

4340
import java.util.Arrays;
4441
import java.util.Collection;
4542
import java.util.Collections;
4643
import java.util.Map;
4744
import java.util.function.Function;
4845

49-
import static org.opensearch.search.SearchService.CLUSTER_CONCURRENT_SEGMENT_SEARCH_SETTING;
5046
import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertAcked;
5147

52-
public class StoredScriptsIT extends ParameterizedOpenSearchIntegTestCase {
53-
public StoredScriptsIT(Settings settings) {
54-
super(settings);
55-
}
56-
57-
@ParametersFactory
58-
public static Collection<Object[]> parameters() {
59-
return Arrays.asList(
60-
new Object[] { Settings.builder().put(CLUSTER_CONCURRENT_SEGMENT_SEARCH_SETTING.getKey(), false).build() },
61-
new Object[] { Settings.builder().put(CLUSTER_CONCURRENT_SEGMENT_SEARCH_SETTING.getKey(), true).build() }
62-
);
63-
}
64-
65-
@Override
66-
protected Settings featureFlagSettings() {
67-
return Settings.builder().put(super.featureFlagSettings()).put(FeatureFlags.CONCURRENT_SEGMENT_SEARCH, "true").build();
68-
}
48+
public class StoredScriptsIT extends OpenSearchIntegTestCase {
6949

7050
private static final int SCRIPT_MAX_SIZE_IN_BYTES = 64;
7151
private static final String LANG = MockScriptEngine.NAME;

‎server/src/internalClusterTest/java/org/opensearch/search/sort/FieldSortIT.java‎

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@
3232

3333
package org.opensearch.search.sort;
3434

35-
import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
36-
3735
import org.apache.lucene.tests.util.TestUtil;
3836
import org.apache.lucene.util.BytesRef;
3937
import org.apache.lucene.util.UnicodeUtil;
@@ -47,7 +45,6 @@
4745
import org.opensearch.cluster.metadata.IndexMetadata;
4846
import org.opensearch.common.Numbers;
4947
import org.opensearch.common.settings.Settings;
50-
import org.opensearch.common.util.FeatureFlags;
5148
import org.opensearch.common.xcontent.XContentFactory;
5249
import org.opensearch.core.rest.RestStatus;
5350
import org.opensearch.core.xcontent.MediaTypeRegistry;
@@ -63,7 +60,7 @@
6360
import org.opensearch.search.SearchHit;
6461
import org.opensearch.search.SearchHits;
6562
import org.opensearch.test.InternalSettingsPlugin;
66-
import org.opensearch.test.ParameterizedOpenSearchIntegTestCase;
63+
import org.opensearch.test.OpenSearchIntegTestCase;
6764
import org.hamcrest.Matchers;
6865

6966
import java.io.IOException;
@@ -89,7 +86,6 @@
8986
import static org.opensearch.index.query.QueryBuilders.matchAllQuery;
9087
import static org.opensearch.index.query.functionscore.ScoreFunctionBuilders.fieldValueFactorFunction;
9188
import static org.opensearch.script.MockScriptPlugin.NAME;
92-
import static org.opensearch.search.SearchService.CLUSTER_CONCURRENT_SEGMENT_SEARCH_SETTING;
9389
import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertAcked;
9490
import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertFirstHit;
9591
import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertHitCount;
@@ -109,24 +105,7 @@
109105
import static org.hamcrest.Matchers.nullValue;
110106
import static org.hamcrest.Matchers.oneOf;
111107

112-
public class FieldSortIT extends ParameterizedOpenSearchIntegTestCase {
113-
public FieldSortIT(Settings settings) {
114-
super(settings);
115-
}
116-
117-
@ParametersFactory
118-
public static Collection<Object[]> parameters() {
119-
return Arrays.asList(
120-
new Object[] { Settings.builder().put(CLUSTER_CONCURRENT_SEGMENT_SEARCH_SETTING.getKey(), false).build() },
121-
new Object[] { Settings.builder().put(CLUSTER_CONCURRENT_SEGMENT_SEARCH_SETTING.getKey(), true).build() }
122-
);
123-
}
124-
125-
@Override
126-
protected Settings featureFlagSettings() {
127-
return Settings.builder().put(super.featureFlagSettings()).put(FeatureFlags.CONCURRENT_SEGMENT_SEARCH, "true").build();
128-
}
129-
108+
public class FieldSortIT extends OpenSearchIntegTestCase {
130109
public static class CustomScriptPlugin extends MockScriptPlugin {
131110
@Override
132111
protected Map<String, Function<Map<String, Object>, Object>> pluginScripts() {

‎server/src/internalClusterTest/java/org/opensearch/threadpool/SimpleThreadPoolIT.java‎

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -32,50 +32,26 @@
3232

3333
package org.opensearch.threadpool;
3434

35-
import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
36-
3735
import org.opensearch.action.index.IndexRequestBuilder;
3836
import org.opensearch.common.settings.Settings;
39-
import org.opensearch.common.util.FeatureFlags;
4037
import org.opensearch.index.query.QueryBuilders;
4138
import org.opensearch.test.OpenSearchIntegTestCase;
4239
import org.opensearch.test.OpenSearchIntegTestCase.ClusterScope;
4340
import org.opensearch.test.OpenSearchIntegTestCase.Scope;
44-
import org.opensearch.test.ParameterizedOpenSearchIntegTestCase;
4541
import org.opensearch.test.hamcrest.RegexMatcher;
4642

4743
import java.lang.management.ManagementFactory;
4844
import java.lang.management.ThreadInfo;
4945
import java.lang.management.ThreadMXBean;
50-
import java.util.Arrays;
51-
import java.util.Collection;
5246
import java.util.HashSet;
5347
import java.util.Set;
5448
import java.util.regex.Pattern;
5549

5650
import static org.opensearch.common.xcontent.XContentFactory.jsonBuilder;
57-
import static org.opensearch.search.SearchService.CLUSTER_CONCURRENT_SEGMENT_SEARCH_SETTING;
5851
import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertNoFailures;
5952

6053
@ClusterScope(scope = Scope.TEST, numDataNodes = 0, numClientNodes = 0)
61-
public class SimpleThreadPoolIT extends ParameterizedOpenSearchIntegTestCase {
62-
public SimpleThreadPoolIT(Settings settings) {
63-
super(settings);
64-
}
65-
66-
@ParametersFactory
67-
public static Collection<Object[]> parameters() {
68-
return Arrays.asList(
69-
new Object[] { Settings.builder().put(CLUSTER_CONCURRENT_SEGMENT_SEARCH_SETTING.getKey(), false).build() },
70-
new Object[] { Settings.builder().put(CLUSTER_CONCURRENT_SEGMENT_SEARCH_SETTING.getKey(), true).build() }
71-
);
72-
}
73-
74-
@Override
75-
protected Settings featureFlagSettings() {
76-
return Settings.builder().put(super.featureFlagSettings()).put(FeatureFlags.CONCURRENT_SEGMENT_SEARCH, "true").build();
77-
}
78-
54+
public class SimpleThreadPoolIT extends OpenSearchIntegTestCase {
7955
@Override
8056
protected Settings nodeSettings(int nodeOrdinal) {
8157
return Settings.builder().build();

0 commit comments

Comments
 (0)