Skip to content

Commit 82001bc

Browse files
committed
Fix tests
Signed-off-by: Rishab Nahata <[email protected]>
1 parent a97f1eb commit 82001bc

File tree

3 files changed

+41
-0
lines changed

3 files changed

+41
-0
lines changed

server/src/test/java/org/opensearch/search/aggregations/startree/BoolStarTreeFilterProviderTests.java

+10
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import org.apache.lucene.document.FloatPoint;
1212
import org.apache.lucene.util.BytesRef;
1313
import org.apache.lucene.util.NumericUtils;
14+
import org.opensearch.common.util.FeatureFlags;
1415
import org.opensearch.index.compositeindex.datacube.Metric;
1516
import org.opensearch.index.compositeindex.datacube.MetricStat;
1617
import org.opensearch.index.compositeindex.datacube.OrdinalDimension;
@@ -34,6 +35,7 @@
3435
import org.opensearch.search.startree.filter.StarTreeFilter;
3536
import org.opensearch.search.startree.filter.provider.StarTreeFilterProvider;
3637
import org.opensearch.test.OpenSearchTestCase;
38+
import org.junit.After;
3739
import org.junit.Before;
3840

3941
import java.io.IOException;
@@ -44,13 +46,15 @@
4446
import java.util.Optional;
4547
import java.util.Set;
4648

49+
import static org.opensearch.common.util.FeatureFlags.STAR_TREE_INDEX;
4750
import static org.mockito.Mockito.mock;
4851
import static org.mockito.Mockito.when;
4952

5053
public class BoolStarTreeFilterProviderTests extends OpenSearchTestCase {
5154
private SearchContext searchContext;
5255
private MapperService mapperService;
5356
private CompositeDataCubeFieldType compositeFieldType;
57+
private static FeatureFlags.TestUtils.FlagWriteLock fflock = null;
5458

5559
@Before
5660
public void setup() {
@@ -106,6 +110,12 @@ public void setup() {
106110
)
107111
)
108112
);
113+
fflock = new FeatureFlags.TestUtils.FlagWriteLock(STAR_TREE_INDEX);
114+
}
115+
116+
@After
117+
public void teardown() throws IOException {
118+
fflock.close();
109119
}
110120

111121
public void testSimpleMustWithMultipleDimensions() throws IOException {

server/src/test/java/org/opensearch/search/aggregations/startree/DimensionFilterAndMapperTests.java

+16
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
import org.apache.lucene.index.TermsEnum;
1212
import org.apache.lucene.util.BytesRef;
13+
import org.opensearch.common.util.FeatureFlags;
1314
import org.opensearch.index.compositeindex.datacube.Metric;
1415
import org.opensearch.index.compositeindex.datacube.MetricStat;
1516
import org.opensearch.index.compositeindex.datacube.OrdinalDimension;
@@ -36,17 +37,32 @@
3637
import org.opensearch.search.startree.filter.provider.DimensionFilterMapper;
3738
import org.opensearch.search.startree.filter.provider.StarTreeFilterProvider;
3839
import org.opensearch.test.OpenSearchTestCase;
40+
import org.junit.After;
41+
import org.junit.Before;
3942

4043
import java.io.IOException;
4144
import java.util.Collections;
4245
import java.util.List;
4346
import java.util.Optional;
4447

48+
import static org.opensearch.common.util.FeatureFlags.STAR_TREE_INDEX;
4549
import static org.mockito.Mockito.mock;
4650
import static org.mockito.Mockito.when;
4751

4852
public class DimensionFilterAndMapperTests extends OpenSearchTestCase {
4953

54+
private static FeatureFlags.TestUtils.FlagWriteLock fflock = null;
55+
56+
@Before
57+
public void setup() {
58+
fflock = new FeatureFlags.TestUtils.FlagWriteLock(STAR_TREE_INDEX);
59+
}
60+
61+
@After
62+
public void teardown() throws IOException {
63+
fflock.close();
64+
}
65+
5066
public void testKeywordOrdinalMapping() throws IOException {
5167
DimensionFilterMapper dimensionFilterMapper = DimensionFilterMapper.Factory.fromMappedFieldType(
5268
new KeywordFieldMapper.KeywordFieldType("keyword")

server/src/test/java/org/opensearch/search/aggregations/startree/MetricAggregatorTests.java

+15
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
import org.apache.lucene.tests.index.RandomIndexWriter;
3535
import org.opensearch.common.lucene.Lucene;
3636
import org.opensearch.common.settings.Settings;
37+
import org.opensearch.common.util.FeatureFlags;
3738
import org.opensearch.common.util.MockBigArrays;
3839
import org.opensearch.common.util.MockPageCacheRecycler;
3940
import org.opensearch.core.indices.breaker.CircuitBreakerService;
@@ -74,6 +75,8 @@
7475
import org.opensearch.search.aggregations.metrics.SumAggregationBuilder;
7576
import org.opensearch.search.aggregations.metrics.ValueCountAggregationBuilder;
7677
import org.opensearch.search.aggregations.support.ValuesSourceAggregatorFactory;
78+
import org.junit.After;
79+
import org.junit.Before;
7780

7881
import java.io.IOException;
7982
import java.math.BigInteger;
@@ -90,6 +93,7 @@
9093
import java.util.stream.Collectors;
9194
import java.util.stream.Stream;
9295

96+
import static org.opensearch.common.util.FeatureFlags.STAR_TREE_INDEX;
9397
import static org.opensearch.index.mapper.NumberFieldMapper.NumberType.objectToUnsignedLong;
9498
import static org.opensearch.search.aggregations.AggregationBuilders.avg;
9599
import static org.opensearch.search.aggregations.AggregationBuilders.count;
@@ -104,6 +108,17 @@ public class MetricAggregatorTests extends AggregatorTestCase {
104108
private static final String FIELD_NAME = "field";
105109
private static final NumberFieldMapper.NumberType DEFAULT_FIELD_TYPE = NumberFieldMapper.NumberType.LONG;
106110
private static final MappedFieldType DEFAULT_MAPPED_FIELD = new NumberFieldMapper.NumberFieldType(FIELD_NAME, DEFAULT_FIELD_TYPE);
111+
private static FeatureFlags.TestUtils.FlagWriteLock fflock = null;
112+
113+
@Before
114+
public void setup() {
115+
fflock = new FeatureFlags.TestUtils.FlagWriteLock(STAR_TREE_INDEX);
116+
}
117+
118+
@After
119+
public void teardown() throws IOException {
120+
fflock.close();
121+
}
107122

108123
protected Codec getCodec(
109124
Supplier<Integer> maxLeafDocsSupplier,

0 commit comments

Comments
 (0)