Jackie-Jiang commented on code in PR #15591: URL: https://github.com/apache/pinot/pull/15591#discussion_r2069598453
########## pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/BigNumberOfSegmentsIntegrationTest.java: ########## @@ -0,0 +1,266 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.pinot.integration.tests; + +import com.fasterxml.jackson.databind.JsonNode; +import java.io.File; +import java.io.IOException; +import java.time.Duration; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import org.apache.avro.Schema.Field; +import org.apache.avro.Schema.Type; +import org.apache.avro.file.DataFileWriter; +import org.apache.avro.generic.GenericDatumWriter; +import org.apache.avro.generic.IndexedRecord; +import org.apache.commons.io.FileUtils; +import org.apache.pinot.spi.config.table.TableConfig; +import org.apache.pinot.spi.config.table.TableType; +import org.apache.pinot.spi.data.FieldSpec; +import org.apache.pinot.spi.data.Schema; +import org.apache.pinot.spi.utils.TimeUtils; +import org.apache.pinot.spi.utils.builder.TableConfigBuilder; +import org.apache.pinot.util.TestUtils; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; +import org.testng.annotations.AfterClass; +import org.testng.annotations.BeforeClass; +import org.testng.annotations.Test; + +import static org.apache.pinot.integration.tests.ClusterIntegrationTestUtils.getBrokerQueryApiUrl; + + +/** + * Create many small segments with many columns to test metadata overhead. + */ +public class BigNumberOfSegmentsIntegrationTest extends BaseClusterIntegrationTestSet { + + static final int FILES_NO = 1000; + static final int RECORDS_NO = 5; + static final String INT_COL = "i"; + static final String LONG_COL = "j"; + static final String STR_COL_PREFIX = "s"; + static final String FLOAT_COL = "f"; + static final String DOUBLE_COL = "d"; + static final int STR_COL_NUM = 200; + + @BeforeClass + public void setUp() + throws Exception { + System.out.println("Pid is " + ProcessHandle.current().pid()); + TestUtils.ensureDirectoriesExistAndEmpty(_tempDir, _segmentDir, _tarDir); + + startZk(); + startKafka(); + startController(); + startServer(); + startBroker(); + + Schema.SchemaBuilder builder = new Schema.SchemaBuilder() + .setSchemaName(DEFAULT_SCHEMA_NAME) + .addSingleValueDimension(INT_COL, FieldSpec.DataType.INT) + .addSingleValueDimension(LONG_COL, FieldSpec.DataType.LONG) + .addSingleValueDimension(FLOAT_COL, FieldSpec.DataType.FLOAT) + .addSingleValueDimension(DOUBLE_COL, FieldSpec.DataType.DOUBLE) + .addDateTimeField(DEFAULT_TIME_COLUMN_NAME, FieldSpec.DataType.TIMESTAMP, "TIMESTAMP", "1:MILLISECONDS"); + + for (int i = 0; i < STR_COL_NUM; i++) { + builder.addSingleValueDimension(STR_COL_PREFIX + i, FieldSpec.DataType.STRING); + } + + Schema schema = builder.build(); + + List<File> avroFiles = createAvroFiles(_tempDir); + + addSchema(schema); + TableConfig tableConfig = createOfflineTableConfig(schema); + addTableConfig(tableConfig); + + ClusterIntegrationTestUtils.buildSegmentsFromAvro(avroFiles, tableConfig, schema, 0, _segmentDir, _tarDir); + uploadSegments(DEFAULT_TABLE_NAME, _tarDir); + + // Wait for all documents loaded + TestUtils.waitForCondition(() -> getCurrentCountStarResult(DEFAULT_TABLE_NAME) == FILES_NO * RECORDS_NO, 100L, + 600_000, + "Failed to load documents", true, Duration.ofMillis(60_000 / 10)); + + setUseMultiStageQueryEngine(true); + } + + // to slow for CI (1+ minute) + @Test(enabled = false) + public void testCreateManySegments() + throws Exception { + JsonNode node = postV2Query("select sum(i) + sum(j) + sum(d), count(*) from " + DEFAULT_TABLE_NAME); + + assertNoError(node); + } + + protected TableConfig createRealtimeTableConfig(File sampleAvroFile) { + AvroFileSchemaKafkaAvroMessageDecoder._avroFile = sampleAvroFile; + return new TableConfigBuilder(TableType.REALTIME) + .setTableName(getTableName()) + .setTimeColumnName(getTimeColumnName()) + .setInvertedIndexColumns(getInvertedIndexColumns()) + .setRangeIndexColumns(getRangeIndexColumns()) + .setFieldConfigList(getFieldConfigs()) + .setNumReplicas(getNumReplicas()) + .setSegmentVersion(getSegmentVersion()) + .setLoadMode(getLoadMode()) + .setTaskConfig(getTaskConfig()) + .setBrokerTenant(getBrokerTenant()) + .setServerTenant(getServerTenant()) + .setIngestionConfig(getIngestionConfig()) + .setQueryConfig(getQueryConfig()) + .setStreamConfigs(getStreamConfigs()) + .setNullHandlingEnabled(getNullHandlingEnabled()) + .build(); + } + + protected int getRealtimeSegmentFlushSize() { + return RECORDS_NO; + } + + TableConfig createOfflineTableConfig(Schema schema) { + return new TableConfigBuilder(TableType.OFFLINE) + .setTableName(getTableName()) + .setTimeColumnName(DEFAULT_TIME_COLUMN_NAME) + .setNumReplicas(getNumReplicas()) + .setBrokerTenant(getBrokerTenant()) + .setRetentionTimeUnit("DAYS") + .setRetentionTimeValue("1") + .setNoDictionaryColumns(new ArrayList<>(schema.getColumnNames())) + .build(); + } + + @Override + protected @Nullable List<String> getInvertedIndexColumns() { + return Arrays.asList(FLOAT_COL, INT_COL); + } + + @Override + protected @Nullable List<String> getRangeIndexColumns() { + return Arrays.asList(INT_COL); + } + + private JsonNode postV2Query(String query) + throws Exception { + return postQuery(query, getBrokerQueryApiUrl(getBrokerBaseApiUrl(), true), null, + getExtraQueryProperties()); + } + + @AfterClass + public void tearDown() + throws Exception { + dropOfflineTable(DEFAULT_TABLE_NAME); + + stopServer(); + stopBroker(); + stopController(); + stopKafka(); + stopZk(); + + FileUtils.deleteDirectory(_tempDir); + } + + private static List<File> createAvroFiles(File tempDir) + throws IOException { + + // create avro schema + org.apache.avro.Schema avroSchema = org.apache.avro.Schema.createRecord("myRecord", null, null, false); + List<Field> fields = new ArrayList(); + fields.add(new Field(INT_COL, create(Type.INT), null, null)); + fields.add(new Field(LONG_COL, create(Type.LONG), null, null)); + fields.add(new Field(FLOAT_COL, create(Type.FLOAT), null, null)); + fields.add(new Field(DOUBLE_COL, create(Type.DOUBLE), null, null)); + fields.add(new Field(DEFAULT_TIME_COLUMN_NAME, create(Type.LONG), null, null)); + for (int i = 0; i < STR_COL_NUM; i++) { + fields.add(new Field(STR_COL_PREFIX + i, create(Type.STRING), null, null)); + } + + avroSchema.setFields(fields); + + StringBuilder sb = new StringBuilder("str"); + String[] strs = new String[RECORDS_NO]; + for (int i = 0; i < RECORDS_NO; i++) { + sb.setLength(3); + sb.append(i); + strs[i] = sb.toString(); + } + + ReusableRecord record = new ReusableRecord(avroSchema.getFields().size()); + int r = 0; + List<File> files = new ArrayList<>(); + for (int file = 0; file < FILES_NO; file++) { + File avroFile = new File(tempDir, "data_" + file + ".avro"); + try (DataFileWriter<ReusableRecord> fileWriter = new DataFileWriter<>(new GenericDatumWriter<>(avroSchema))) { + fileWriter.create(avroSchema, avroFile); + + for (int docId = 0; docId < RECORDS_NO; docId++) { + record.put(0, file); + record.put(1, docId); + record.put(2, docId); + record.put(3, docId); + record.put(4, TimeUtils.VALID_MIN_TIME_MILLIS + r++ * 3600); + + for (int si = 0; si < STR_COL_NUM; si++) { + record.put(5 + si, strs[docId]); + } + + fileWriter.append(record); + record.clear(); + } + files.add(avroFile); + } + } + return files; + } + + private static org.apache.avro.@NotNull Schema create(Type type) { Review Comment: (minor, convention) We don't usually use `@NotNull` (especially this one from avro library) ########## pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/BigNumberOfSegmentsIntegrationTest.java: ########## @@ -0,0 +1,266 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.pinot.integration.tests; + +import com.fasterxml.jackson.databind.JsonNode; +import java.io.File; +import java.io.IOException; +import java.time.Duration; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import org.apache.avro.Schema.Field; +import org.apache.avro.Schema.Type; +import org.apache.avro.file.DataFileWriter; +import org.apache.avro.generic.GenericDatumWriter; +import org.apache.avro.generic.IndexedRecord; +import org.apache.commons.io.FileUtils; +import org.apache.pinot.spi.config.table.TableConfig; +import org.apache.pinot.spi.config.table.TableType; +import org.apache.pinot.spi.data.FieldSpec; +import org.apache.pinot.spi.data.Schema; +import org.apache.pinot.spi.utils.TimeUtils; +import org.apache.pinot.spi.utils.builder.TableConfigBuilder; +import org.apache.pinot.util.TestUtils; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; +import org.testng.annotations.AfterClass; +import org.testng.annotations.BeforeClass; +import org.testng.annotations.Test; + +import static org.apache.pinot.integration.tests.ClusterIntegrationTestUtils.getBrokerQueryApiUrl; + + +/** + * Create many small segments with many columns to test metadata overhead. + */ +public class BigNumberOfSegmentsIntegrationTest extends BaseClusterIntegrationTestSet { + + static final int FILES_NO = 1000; + static final int RECORDS_NO = 5; + static final String INT_COL = "i"; + static final String LONG_COL = "j"; + static final String STR_COL_PREFIX = "s"; + static final String FLOAT_COL = "f"; + static final String DOUBLE_COL = "d"; + static final int STR_COL_NUM = 200; + + @BeforeClass + public void setUp() + throws Exception { + System.out.println("Pid is " + ProcessHandle.current().pid()); + TestUtils.ensureDirectoriesExistAndEmpty(_tempDir, _segmentDir, _tarDir); + + startZk(); + startKafka(); + startController(); + startServer(); + startBroker(); + + Schema.SchemaBuilder builder = new Schema.SchemaBuilder() + .setSchemaName(DEFAULT_SCHEMA_NAME) + .addSingleValueDimension(INT_COL, FieldSpec.DataType.INT) + .addSingleValueDimension(LONG_COL, FieldSpec.DataType.LONG) + .addSingleValueDimension(FLOAT_COL, FieldSpec.DataType.FLOAT) + .addSingleValueDimension(DOUBLE_COL, FieldSpec.DataType.DOUBLE) + .addDateTimeField(DEFAULT_TIME_COLUMN_NAME, FieldSpec.DataType.TIMESTAMP, "TIMESTAMP", "1:MILLISECONDS"); + + for (int i = 0; i < STR_COL_NUM; i++) { + builder.addSingleValueDimension(STR_COL_PREFIX + i, FieldSpec.DataType.STRING); + } + + Schema schema = builder.build(); + + List<File> avroFiles = createAvroFiles(_tempDir); + + addSchema(schema); + TableConfig tableConfig = createOfflineTableConfig(schema); + addTableConfig(tableConfig); + + ClusterIntegrationTestUtils.buildSegmentsFromAvro(avroFiles, tableConfig, schema, 0, _segmentDir, _tarDir); + uploadSegments(DEFAULT_TABLE_NAME, _tarDir); + + // Wait for all documents loaded + TestUtils.waitForCondition(() -> getCurrentCountStarResult(DEFAULT_TABLE_NAME) == FILES_NO * RECORDS_NO, 100L, + 600_000, + "Failed to load documents", true, Duration.ofMillis(60_000 / 10)); + + setUseMultiStageQueryEngine(true); + } + + // to slow for CI (1+ minute) + @Test(enabled = false) + public void testCreateManySegments() + throws Exception { + JsonNode node = postV2Query("select sum(i) + sum(j) + sum(d), count(*) from " + DEFAULT_TABLE_NAME); + + assertNoError(node); + } + + protected TableConfig createRealtimeTableConfig(File sampleAvroFile) { + AvroFileSchemaKafkaAvroMessageDecoder._avroFile = sampleAvroFile; + return new TableConfigBuilder(TableType.REALTIME) + .setTableName(getTableName()) + .setTimeColumnName(getTimeColumnName()) + .setInvertedIndexColumns(getInvertedIndexColumns()) + .setRangeIndexColumns(getRangeIndexColumns()) + .setFieldConfigList(getFieldConfigs()) + .setNumReplicas(getNumReplicas()) + .setSegmentVersion(getSegmentVersion()) + .setLoadMode(getLoadMode()) + .setTaskConfig(getTaskConfig()) + .setBrokerTenant(getBrokerTenant()) + .setServerTenant(getServerTenant()) + .setIngestionConfig(getIngestionConfig()) + .setQueryConfig(getQueryConfig()) + .setStreamConfigs(getStreamConfigs()) + .setNullHandlingEnabled(getNullHandlingEnabled()) + .build(); + } + + protected int getRealtimeSegmentFlushSize() { + return RECORDS_NO; + } + + TableConfig createOfflineTableConfig(Schema schema) { + return new TableConfigBuilder(TableType.OFFLINE) + .setTableName(getTableName()) + .setTimeColumnName(DEFAULT_TIME_COLUMN_NAME) + .setNumReplicas(getNumReplicas()) + .setBrokerTenant(getBrokerTenant()) + .setRetentionTimeUnit("DAYS") + .setRetentionTimeValue("1") + .setNoDictionaryColumns(new ArrayList<>(schema.getColumnNames())) + .build(); + } + + @Override + protected @Nullable List<String> getInvertedIndexColumns() { Review Comment: (minor, convention) We usually put `@Nullable` on top of `@Override` ########## pinot-segment-local/src/main/java/org/apache/pinot/segment/local/segment/index/column/PhysicalColumnIndexContainer.java: ########## @@ -51,36 +53,115 @@ public PhysicalColumnIndexContainer(SegmentDirectory.Reader segmentReader, Colum fieldIndexConfigs = FieldIndexConfigs.EMPTY; } - _readersByIndex = new HashMap<>(); - for (IndexType<?, ?, ?> indexType : IndexService.getInstance().getAllIndexes()) { - if (segmentReader.hasIndexFor(columnName, indexType)) { - IndexReaderFactory<?> readerProvider = indexType.getReaderFactory(); - try { - IndexReader reader = readerProvider.createIndexReader(segmentReader, fieldIndexConfigs, metadata); - if (reader != null) { - _readersByIndex.put(indexType, reader); + ArrayList<IndexType> indexTypes = new ArrayList(); Review Comment: (minor) ```suggestion ArrayList<IndexType> indexTypes = new ArrayList<>(); ``` ########## pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/BigNumberOfSegmentsIntegrationTest.java: ########## @@ -0,0 +1,266 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.pinot.integration.tests; + +import com.fasterxml.jackson.databind.JsonNode; +import java.io.File; +import java.io.IOException; +import java.time.Duration; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import org.apache.avro.Schema.Field; +import org.apache.avro.Schema.Type; +import org.apache.avro.file.DataFileWriter; +import org.apache.avro.generic.GenericDatumWriter; +import org.apache.avro.generic.IndexedRecord; +import org.apache.commons.io.FileUtils; +import org.apache.pinot.spi.config.table.TableConfig; +import org.apache.pinot.spi.config.table.TableType; +import org.apache.pinot.spi.data.FieldSpec; +import org.apache.pinot.spi.data.Schema; +import org.apache.pinot.spi.utils.TimeUtils; +import org.apache.pinot.spi.utils.builder.TableConfigBuilder; +import org.apache.pinot.util.TestUtils; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; Review Comment: (minor, convention) We usually use `javax.annotation.Nullable` -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org For additional commands, e-mail: commits-h...@pinot.apache.org
