cshuo commented on code in PR #18372: URL: https://github.com/apache/hudi/pull/18372#discussion_r3541874645
########## hudi-client/hudi-client-common/src/main/java/org/apache/hudi/metadata/index/model/IndexPartitionAndRecords.java: ########## @@ -0,0 +1,38 @@ +/* + * 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.hudi.metadata.index.model; + +import org.apache.hudi.common.data.HoodieData; +import org.apache.hudi.common.model.HoodieRecord; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.experimental.Accessors; + +@AllArgsConstructor +@Getter +@Accessors(fluent = true) +public class IndexPartitionAndRecords { + private final String indexPartitionName; Review Comment: Fixed. ########## hudi-client/hudi-client-common/src/test/java/org/apache/hudi/metadata/index/record/TestPartitionedRecordIndexer.java: ########## @@ -0,0 +1,240 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. + */ + +package org.apache.hudi.metadata.index.record; + +import org.apache.hudi.avro.model.HoodieCleanMetadata; +import org.apache.hudi.common.config.HoodieMetadataConfig; +import org.apache.hudi.common.data.HoodieData; +import org.apache.hudi.common.engine.HoodieEngineContext; +import org.apache.hudi.common.engine.HoodieLocalEngineContext; +import org.apache.hudi.common.model.FileSlice; +import org.apache.hudi.common.model.HoodieCommitMetadata; +import org.apache.hudi.common.model.HoodieFileFormat; +import org.apache.hudi.common.model.HoodieRecordGlobalLocation; +import org.apache.hudi.common.model.HoodieRecord; +import org.apache.hudi.common.model.HoodieWriteStat; +import org.apache.hudi.common.table.HoodieTableConfig; +import org.apache.hudi.common.table.HoodieTableMetaClient; +import org.apache.hudi.common.table.view.HoodieTableFileSystemView; +import org.apache.hudi.common.util.Option; +import org.apache.hudi.config.HoodieWriteConfig; +import org.apache.hudi.metadata.HoodieBackedTableMetadata; +import org.apache.hudi.metadata.HoodieMetadataPayload; +import org.apache.hudi.metadata.HoodieTableMetadataUtil; +import org.apache.hudi.metadata.MetadataPartitionType; +import org.apache.hudi.metadata.BaseFileRecordParsingUtils; +import org.apache.hudi.metadata.index.model.DataPartitionAndRecords; +import org.apache.hudi.metadata.index.model.IndexPartitionAndRecords; +import org.apache.hudi.metadata.index.model.IndexPartitionInitialization; +import org.apache.hudi.metadata.model.FileSliceAndPartition; +import org.apache.hudi.storage.StoragePath; +import org.apache.hudi.util.Lazy; + +import org.junit.jupiter.api.Test; +import org.mockito.MockedStatic; + +import java.io.IOException; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.Map; + +import static org.apache.hudi.common.testutils.HoodieTestUtils.getDefaultStorageConf; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.mockStatic; +import static org.mockito.Mockito.when; + +class TestPartitionedRecordIndexer { + + @SuppressWarnings("unchecked") + @Test + void testInitializeWithRealEngineContextAndIndexDataContent() throws IOException { + HoodieEngineContext engineContext = new HoodieLocalEngineContext(getDefaultStorageConf()); + HoodieWriteConfig writeConfig = mock(HoodieWriteConfig.class); + HoodieMetadataConfig metadataConfig = mock(HoodieMetadataConfig.class); + HoodieTableMetaClient dataMetaClient = mock(HoodieTableMetaClient.class); + HoodieTableConfig tableConfig = mock(HoodieTableConfig.class); + + when(writeConfig.getMetadataConfig()).thenReturn(metadataConfig); + when(metadataConfig.getRecordIndexMaxParallelism()).thenReturn(8); + when(dataMetaClient.getTableConfig()).thenReturn(tableConfig); + + HoodieData<HoodieRecord> p1Data = (HoodieData<HoodieRecord>) (HoodieData<?>) engineContext.parallelize( + Collections.singletonList(HoodieMetadataPayload.createPartitionFilesRecord("p1_data", + Collections.singletonMap("f1.parquet", 1L), Collections.emptyList())), + 1); + HoodieData<HoodieRecord> p2Data = (HoodieData<HoodieRecord>) (HoodieData<?>) engineContext.parallelize( + Collections.singletonList(HoodieMetadataPayload.createPartitionFilesRecord("p2_data", + Collections.singletonMap("f2.parquet", 2L), Collections.emptyList())), + 1); + + DataPartitionAndRecords p1Init = new DataPartitionAndRecords(1, Option.of("p1"), p1Data); + DataPartitionAndRecords p2Init = new DataPartitionAndRecords(2, Option.of("p2"), p2Data); + + FileSliceAndPartition fs1 = FileSliceAndPartition.of("p1", new FileSlice("p1", "001", "f1")); + FileSliceAndPartition fs2 = FileSliceAndPartition.of("p2", new FileSlice("p2", "001", "f2")); + List<FileSliceAndPartition> input = Arrays.asList(fs1, fs2); + + ExposedPartitionedRecordIndexer indexer = new ExposedPartitionedRecordIndexer(engineContext, writeConfig, dataMetaClient, p1Init, p2Init); + + try (MockedStatic<HoodieTableMetadataUtil> mockedUtil = mockStatic(HoodieTableMetadataUtil.class)) { + List<IndexPartitionInitialization> initializationList = indexer.buildInitialization("001", "002", Map.of(), Lazy.lazily(() -> input)); + + mockedUtil.verify(() -> HoodieTableMetadataUtil.createRecordIndexDefinition(any(), any())); + assertEquals(1, initializationList.size()); + assertEquals(2, initializationList.get(0).dataPartitionAndRecords().size()); + assertEquals(2, indexer.initializePartitionCalls); + } + } + + @SuppressWarnings("unchecked") + @Test + void testBuildUpdateWithEmptyCommitMetadataProducesEmptyRecords() { + HoodieEngineContext engineContext = new HoodieLocalEngineContext(getDefaultStorageConf()); + HoodieWriteConfig writeConfig = mock(HoodieWriteConfig.class); + HoodieMetadataConfig metadataConfig = mock(HoodieMetadataConfig.class); + HoodieTableMetaClient dataMetaClient = mock(HoodieTableMetaClient.class); + HoodieTableConfig tableConfig = mock(HoodieTableConfig.class); + + when(writeConfig.getMetadataConfig()).thenReturn(metadataConfig); + when(metadataConfig.getRecordIndexMaxParallelism()).thenReturn(8); + when(dataMetaClient.getTableConfig()).thenReturn(tableConfig); + + HoodieData<HoodieRecord> empty = (HoodieData<HoodieRecord>) (HoodieData<?>) engineContext.emptyHoodieData(); + ExposedPartitionedRecordIndexer indexer = new ExposedPartitionedRecordIndexer( + engineContext, writeConfig, dataMetaClient, + new DataPartitionAndRecords(1, Option.of("p1"), empty), + new DataPartitionAndRecords(1, Option.of("p2"), empty)); + + List<IndexPartitionAndRecords> result = indexer.buildUpdate( + "018", + mock(HoodieBackedTableMetadata.class), + Lazy.lazily(() -> mock(HoodieTableFileSystemView.class)), + new HoodieCommitMetadata()); + + assertEquals(1, result.size()); + assertEquals(MetadataPartitionType.RECORD_INDEX.getPartitionPath(), result.get(0).indexPartitionName()); + assertEquals(0, result.get(0).indexRecords().collectAsList().size()); + } + + @Test + @SuppressWarnings("unchecked") + void testBuildUpdateWithNonEmptyCommitMetadataProducesPartitionEntry() { + HoodieEngineContext engineContext = new HoodieLocalEngineContext(getDefaultStorageConf()); + HoodieWriteConfig writeConfig = mock(HoodieWriteConfig.class); + HoodieMetadataConfig metadataConfig = mock(HoodieMetadataConfig.class); + HoodieTableMetaClient dataMetaClient = mock(HoodieTableMetaClient.class); + HoodieTableConfig tableConfig = mock(HoodieTableConfig.class); + + when(writeConfig.getMetadataConfig()).thenReturn(metadataConfig); + when(metadataConfig.getRecordIndexMaxParallelism()).thenReturn(8); + when(metadataConfig.isRecordLevelIndexEnabled()).thenReturn(true); + when(dataMetaClient.getTableConfig()).thenReturn(tableConfig); + when(tableConfig.getBaseFileFormat()).thenReturn(HoodieFileFormat.PARQUET); + when(dataMetaClient.getBasePath()).thenReturn(new StoragePath("/tmp/hudi-partitioned-record-index-test")); + when(dataMetaClient.getStorageConf()).thenReturn((org.apache.hudi.storage.StorageConfiguration) getDefaultStorageConf()); + + HoodieData<HoodieRecord> empty = (HoodieData<HoodieRecord>) (HoodieData<?>) engineContext.emptyHoodieData(); + ExposedPartitionedRecordIndexer indexer = new ExposedPartitionedRecordIndexer( + engineContext, writeConfig, dataMetaClient, + new DataPartitionAndRecords(1, Option.of("p1"), empty), + new DataPartitionAndRecords(1, Option.of("p2"), empty)); + + HoodieCommitMetadata commitMetadata = new HoodieCommitMetadata(); + HoodieWriteStat writeStat = new HoodieWriteStat(); + writeStat.setPartitionPath("p1"); + writeStat.setPath("p1/f1.parquet"); + writeStat.setFileId("11111111-1111-1111-1111-111111111111"); + writeStat.setNumInserts(1); + writeStat.setTotalWriteBytes(128L); + commitMetadata.addWriteStat("p1", writeStat); + + List<HoodieRecord> indexRecords; + HoodieMetadataPayload payload; + try (MockedStatic<BaseFileRecordParsingUtils> mockedBaseFileParsingUtils = + mockStatic(BaseFileRecordParsingUtils.class); + MockedStatic<HoodieTableMetadataUtil> mockedMetadataUtil = + mockStatic(HoodieTableMetadataUtil.class)) { + mockedMetadataUtil.when(() -> HoodieTableMetadataUtil.tryResolveSchemaForTable(any())) + .thenReturn(Option.empty()); + mockedMetadataUtil.when(() -> HoodieTableMetadataUtil.reduceByKeys(any(), anyInt(), anyBoolean())) + .thenAnswer(invocation -> invocation.getArgument(0)); + mockedBaseFileParsingUtils.when(() -> BaseFileRecordParsingUtils + .generateRLIMetadataHoodieRecordsForBaseFile(any(), any(), any(), any(), any(), anyBoolean())) + .thenReturn(Collections.singletonList( + HoodieMetadataPayload.createRecordIndexUpdate( + "rk1", "p1", "11111111-1111-1111-1111-111111111111", "20240101010101", 0)).iterator()); + + List<IndexPartitionAndRecords> result = indexer.buildUpdate( + "20240101010101", + mock(HoodieBackedTableMetadata.class), + Lazy.lazily(() -> mock(HoodieTableFileSystemView.class)), + commitMetadata); + + assertEquals(1, result.size()); + assertEquals(MetadataPartitionType.RECORD_INDEX.getPartitionPath(), result.get(0).indexPartitionName()); + indexRecords = result.get(0).indexRecords().collectAsList(); + assertEquals(1, indexRecords.size()); + payload = (HoodieMetadataPayload) indexRecords.get(0).getData(); + assertEquals("p1", payload.getDataPartition()); + + mockedBaseFileParsingUtils.verify(() -> BaseFileRecordParsingUtils + .generateRLIMetadataHoodieRecordsForBaseFile(any(), any(), anyInt(), any(), any(), eq(true))); + mockedMetadataUtil.verify(() -> HoodieTableMetadataUtil + .reduceByKeys(any(), anyInt(), eq(true))); + } + + HoodieRecordGlobalLocation location = payload.getRecordGlobalLocation(); + assertEquals("p1", location.getPartitionPath()); + assertEquals("11111111-1111-1111-1111-111111111111", location.getFileId()); + } + + @SuppressWarnings("unchecked") + @Test + void testBuildCleanReturnsEmptyList() { + HoodieEngineContext engineContext = new HoodieLocalEngineContext(getDefaultStorageConf()); + HoodieWriteConfig writeConfig = mock(HoodieWriteConfig.class); + HoodieTableMetaClient dataMetaClient = mock(HoodieTableMetaClient.class); + HoodieData<HoodieRecord> empty = (HoodieData<HoodieRecord>) (HoodieData<?>) engineContext.emptyHoodieData(); + ExposedPartitionedRecordIndexer indexer = new ExposedPartitionedRecordIndexer( + engineContext, writeConfig, dataMetaClient, + new DataPartitionAndRecords(1, Option.of("p1"), empty), + new DataPartitionAndRecords(1, Option.of("p2"), empty)); + Review Comment: Fixed. ########## hudi-client/hudi-client-common/src/main/java/org/apache/hudi/metadata/index/UnsupportedEngineIndexerSupport.java: ########## @@ -0,0 +1,82 @@ +/* + * 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.hudi.metadata.index; + +import org.apache.hudi.common.data.HoodieData; +import org.apache.hudi.common.engine.EngineType; +import org.apache.hudi.common.model.HoodieCommitMetadata; +import org.apache.hudi.common.model.HoodieIndexDefinition; +import org.apache.hudi.common.model.HoodieRecord; +import org.apache.hudi.common.schema.HoodieSchema; +import org.apache.hudi.common.table.HoodieTableMetaClient; +import org.apache.hudi.common.table.HoodieTableVersion; +import org.apache.hudi.exception.HoodieNotSupportedException; +import org.apache.hudi.metadata.HoodieTableMetadata; +import org.apache.hudi.metadata.model.FileInfoAndPartition; +import org.apache.hudi.storage.StorageConfiguration; + +import java.util.List; + +/** + * Fallback {@link ExpressionIndexRecordGenerator} that throws a not-supported exception + * when expression index bootstrap is requested for unsupported engines. + */ +public class UnsupportedExpressionIndexRecordGenerator implements ExpressionIndexRecordGenerator { + + private final EngineType engineType; + + public UnsupportedExpressionIndexRecordGenerator(EngineType engineType) { + this.engineType = engineType; + } + + @Override + public EngineType getEngineType() { + return engineType; + } + + @Override + public HoodieData<HoodieRecord> buildInitialization( + List<FileInfoAndPartition> filesToIndex, + HoodieIndexDefinition indexDefinition, + HoodieTableMetaClient metaClient, + int parallelism, + HoodieSchema tableSchema, + HoodieSchema readerSchema, + StorageConfiguration<?> storageConf, + String instantTime) { + if (metaClient.getTableConfig().getTableVersion().lesserThan(HoodieTableVersion.EIGHT)) { Review Comment: Fixed. -- 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: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
