Skip to content

Commit 39e9169

Browse files
committed
Disambiguate FieldConfig test constructors
1 parent 4e7279f commit 39e9169

5 files changed

Lines changed: 21 additions & 15 deletions

File tree

pinot-core/src/test/java/org/apache/pinot/core/data/manager/TableIndexingTest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
import org.apache.pinot.segment.spi.datasource.DataSource;
4848
import org.apache.pinot.segment.spi.index.IndexService;
4949
import org.apache.pinot.segment.spi.index.startree.StarTreeV2;
50+
import org.apache.pinot.spi.config.table.CompressionCodecSpec;
5051
import org.apache.pinot.spi.config.table.FieldConfig;
5152
import org.apache.pinot.spi.config.table.IndexingConfig;
5253
import org.apache.pinot.spi.config.table.MultiColumnTextIndexConfig;
@@ -472,8 +473,8 @@ public void testAddIndex(TestCase testCase) {
472473
throw new IllegalArgumentException("Unexpected index type " + indexType);
473474
}
474475

475-
config =
476-
new FieldConfig(field.getName(), encoding, null, indexTypes, null, tstmpConfig, indexes, properties, null);
476+
config = new FieldConfig(field.getName(), encoding, null, indexTypes, (CompressionCodecSpec) null, tstmpConfig,
477+
indexes, properties, null);
477478

478479
tableConfig.getFieldConfigList().add(config);
479480

pinot-core/src/test/java/org/apache/pinot/core/operator/transform/function/BaseTransformFunctionTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
import org.apache.pinot.segment.spi.IndexSegment;
4949
import org.apache.pinot.segment.spi.creator.SegmentGeneratorConfig;
5050
import org.apache.pinot.segment.spi.datasource.DataSource;
51+
import org.apache.pinot.spi.config.table.CompressionCodecSpec;
5152
import org.apache.pinot.spi.config.table.FieldConfig;
5253
import org.apache.pinot.spi.config.table.TableConfig;
5354
import org.apache.pinot.spi.config.table.TableType;
@@ -340,9 +341,8 @@ protected TableConfig getTableConfig() {
340341
jsonIndexProps.put("disableCrossArrayUnnest", true);
341342
ObjectNode indexNode = JsonNodeFactory.instance.objectNode();
342343
indexNode.put("json", jsonIndexProps);
343-
FieldConfig jsonFieldConfig =
344-
new FieldConfig(JSON_STRING_SV_COLUMN, FieldConfig.EncodingType.DICTIONARY, null, null, null, null, indexNode,
345-
null, null);
344+
FieldConfig jsonFieldConfig = new FieldConfig(JSON_STRING_SV_COLUMN, FieldConfig.EncodingType.DICTIONARY, null,
345+
null, (CompressionCodecSpec) null, null, indexNode, null, null);
346346
fieldConfigList.add(jsonFieldConfig);
347347
TableConfig tableConfig =
348348
new TableConfigBuilder(TableType.OFFLINE).setTableName("test").setTimeColumnName(TIME_COLUMN)

pinot-core/src/test/java/org/apache/pinot/queries/BaseFSTBasedRegexpLikeQueriesTest.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
import org.apache.pinot.segment.spi.ImmutableSegment;
4545
import org.apache.pinot.segment.spi.IndexSegment;
4646
import org.apache.pinot.segment.spi.creator.SegmentGeneratorConfig;
47+
import org.apache.pinot.spi.config.table.CompressionCodecSpec;
4748
import org.apache.pinot.spi.config.table.FieldConfig;
4849
import org.apache.pinot.spi.config.table.FieldConfig.EncodingType;
4950
import org.apache.pinot.spi.config.table.TableConfig;
@@ -91,8 +92,10 @@ private static List<FieldConfig> getFieldConfigs(String indexType) {
9192

9293
// Create FieldConfig with the index configuration
9394
return List.of(
94-
new FieldConfig(DOMAIN_NAMES_COL, EncodingType.DICTIONARY, null, null, null, null, indexes, null, null),
95-
new FieldConfig(URL_COL, EncodingType.DICTIONARY, null, null, null, null, indexes, null, null));
95+
new FieldConfig(DOMAIN_NAMES_COL, EncodingType.DICTIONARY, null, null, (CompressionCodecSpec) null, null,
96+
indexes, null, null),
97+
new FieldConfig(URL_COL, EncodingType.DICTIONARY, null, null, (CompressionCodecSpec) null, null, indexes,
98+
null, null));
9699
} catch (Exception e) {
97100
throw new RuntimeException("Failed to create field configs", e);
98101
}

pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/custom/TextIndicesTest.java

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import org.apache.avro.Schema.Type;
3434
import org.apache.avro.file.DataFileWriter;
3535
import org.apache.avro.generic.GenericData;
36+
import org.apache.pinot.spi.config.table.CompressionCodecSpec;
3637
import org.apache.pinot.spi.config.table.FieldConfig;
3738
import org.apache.pinot.spi.config.table.TableConfig;
3839
import org.apache.pinot.spi.config.table.TableType;
@@ -93,13 +94,12 @@ protected List<FieldConfig> getFieldConfigs() {
9394
}
9495

9596
FieldConfig nullableTextConfig =
96-
new FieldConfig(TEXT_COLUMN_NULL_NAME, FieldConfig.EncodingType.RAW, null, null, null, null, textColumnIndexes,
97-
null,
98-
null);
97+
new FieldConfig(TEXT_COLUMN_NULL_NAME, FieldConfig.EncodingType.RAW, null, null, (CompressionCodecSpec) null,
98+
null, textColumnIndexes, null, null);
9999

100100
FieldConfig textColumnFieldConfig =
101-
new FieldConfig(TEXT_COLUMN_NAME, FieldConfig.EncodingType.RAW, null, null, null, null, textColumnIndexes, null,
102-
null);
101+
new FieldConfig(TEXT_COLUMN_NAME, FieldConfig.EncodingType.RAW, null, null, (CompressionCodecSpec) null, null,
102+
textColumnIndexes, null, null);
103103

104104
ObjectNode textColumnCaseSensitiveIndexes;
105105
try {
@@ -115,7 +115,8 @@ protected List<FieldConfig> getFieldConfigs() {
115115
throw new RuntimeException(e);
116116
}
117117
FieldConfig textColumnCaseSensitiveFieldConfig =
118-
new FieldConfig(TEXT_COLUMN_NAME_CASE_SENSITIVE, FieldConfig.EncodingType.RAW, null, null, null, null,
118+
new FieldConfig(TEXT_COLUMN_NAME_CASE_SENSITIVE, FieldConfig.EncodingType.RAW, null, null,
119+
(CompressionCodecSpec) null, null,
119120
textColumnCaseSensitiveIndexes, null, null);
120121
return Arrays.asList(nullableTextConfig, textColumnFieldConfig, textColumnCaseSensitiveFieldConfig);
121122
}

pinot-segment-local/src/test/java/org/apache/pinot/segment/local/utils/TableConfigUtilsTest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
import org.apache.pinot.segment.spi.index.startree.AggregationFunctionColumnPair;
3636
import org.apache.pinot.spi.config.table.BloomFilterConfig;
3737
import org.apache.pinot.spi.config.table.ColumnPartitionConfig;
38+
import org.apache.pinot.spi.config.table.CompressionCodecSpec;
3839
import org.apache.pinot.spi.config.table.DedupConfig;
3940
import org.apache.pinot.spi.config.table.FieldConfig;
4041
import org.apache.pinot.spi.config.table.FieldConfig.CompressionCodec;
@@ -1486,8 +1487,8 @@ public void testValidateBFOnBoolean() {
14861487
TableConfig tableconfig3 = new TableConfigBuilder(TableType.REALTIME).setTableName(TABLE_NAME).build();
14871488
ObjectNode indexesNode = JsonNodeFactory.instance.objectNode();
14881489
indexesNode.putObject("bloom");
1489-
FieldConfig fieldConfig =
1490-
new FieldConfig("MyCol", FieldConfig.EncodingType.DICTIONARY, null, null, null, null, indexesNode, null, null);
1490+
FieldConfig fieldConfig = new FieldConfig("MyCol", FieldConfig.EncodingType.DICTIONARY, null, null,
1491+
(CompressionCodecSpec) null, null, indexesNode, null, null);
14911492
tableconfig3.setFieldConfigList(Arrays.asList(fieldConfig));
14921493
assertThrows(IllegalStateException.class, () -> TableConfigUtils.validate(tableconfig3, schema));
14931494
}

0 commit comments

Comments
 (0)