-
Notifications
You must be signed in to change notification settings - Fork 2.5k
[HUDI-8126] Use union to parallelize data and error table writes #12813
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
cf313c0
Use union to parallelize data and error table writes
vinishjail97 f586076
Handle table version upgrade use-case in writeToSinkAndDoMetaSync
vinishjail97 462b5e9
Reload metaclient if timelineLayout version changes
vinishjail97 7eda562
Address comments
vinishjail97 2a312c2
Call getLatestCommittedInstant behind errorTableWriter
vinishjail97 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
48 changes: 48 additions & 0 deletions
48
...t/hudi-client-common/src/test/java/org/apache/hudi/config/TestHoodieErrorTableConfig.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| /* | ||
| * 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.config; | ||
|
|
||
| import org.apache.hudi.common.config.TypedProperties; | ||
|
|
||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| import static org.apache.hudi.config.HoodieErrorTableConfig.ENABLE_ERROR_TABLE_WRITE_UNIFICATION; | ||
| import static org.junit.jupiter.api.Assertions.assertFalse; | ||
| import static org.junit.jupiter.api.Assertions.assertNotEquals; | ||
| import static org.junit.jupiter.api.Assertions.assertNotNull; | ||
| import static org.junit.jupiter.api.Assertions.assertTrue; | ||
|
|
||
| class TestHoodieErrorTableConfig { | ||
|
|
||
| @Test | ||
| void testErrorAndBaseTableUnionConfig() { | ||
| // documentation is not null | ||
| assertNotNull(ENABLE_ERROR_TABLE_WRITE_UNIFICATION.doc()); | ||
| assertNotEquals("", ENABLE_ERROR_TABLE_WRITE_UNIFICATION.doc()); | ||
|
|
||
| // disabled by default | ||
| assertFalse(ENABLE_ERROR_TABLE_WRITE_UNIFICATION.defaultValue()); | ||
|
|
||
| // enabled when set to true | ||
| TypedProperties props = new TypedProperties(); | ||
| props.setProperty("hoodie.errortable.write.union.enable", "true"); | ||
| assertTrue(props.getBoolean(ENABLE_ERROR_TABLE_WRITE_UNIFICATION.key(), ENABLE_ERROR_TABLE_WRITE_UNIFICATION.defaultValue())); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
133 changes: 133 additions & 0 deletions
133
...a/org/apache/hudi/utilities/deltastreamer/TestHoodieDeltaStreamerErrorTableWriteFlow.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,133 @@ | ||
| /* | ||
| * 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.utilities.deltastreamer; | ||
|
|
||
| import org.apache.hudi.common.model.WriteOperationType; | ||
| import org.apache.hudi.common.table.HoodieTableMetaClient; | ||
| import org.apache.hudi.common.util.collection.Tuple3; | ||
| import org.apache.hudi.hadoop.fs.HadoopFSUtils; | ||
|
|
||
| import org.apache.hadoop.fs.Path; | ||
| import org.apache.spark.sql.Dataset; | ||
| import org.apache.spark.sql.Row; | ||
| import org.apache.spark.sql.functions; | ||
| import org.junit.jupiter.params.ParameterizedTest; | ||
| import org.junit.jupiter.params.provider.Arguments; | ||
| import org.junit.jupiter.params.provider.MethodSource; | ||
|
|
||
| import java.util.stream.Stream; | ||
|
|
||
| import static org.junit.jupiter.api.Assertions.assertEquals; | ||
|
|
||
| class TestHoodieDeltaStreamerErrorTableWriteFlow extends TestHoodieDeltaStreamerSchemaEvolutionBase { | ||
| protected void testBase(Tuple3<Integer, Integer, Integer> sourceGenInfo) throws Exception { | ||
| int totalRecords = sourceGenInfo.f0; | ||
| int errorRecords = sourceGenInfo.f1; | ||
| int numFiles = sourceGenInfo.f2; | ||
| boolean shouldCreateMultipleSourceFiles = numFiles > 1; | ||
|
|
||
| PARQUET_SOURCE_ROOT = basePath + "parquetFilesDfs" + testNum++; | ||
|
|
||
| if (totalRecords > 0) { | ||
| if (shouldCreateMultipleSourceFiles) { | ||
| prepareParquetDFSMultiFiles(totalRecords - errorRecords, PARQUET_SOURCE_ROOT, numFiles); | ||
| } else { | ||
| prepareParquetDFSFiles(totalRecords - errorRecords, PARQUET_SOURCE_ROOT); | ||
| } | ||
|
|
||
| // Add error data to the source | ||
| if (errorRecords > 0) { | ||
| String errorDataSourceRoot = basePath + "parquetErrorFilesDfs" + testNum++; | ||
| prepareParquetDFSFiles(errorRecords, errorDataSourceRoot); | ||
| Dataset<Row> df = sparkSession.read().parquet(errorDataSourceRoot); | ||
| df = df.withColumn("_row_key", functions.lit("")); | ||
| // add error records to PARQUET_SOURCE_ROOT | ||
| addParquetData(df, false); | ||
| } | ||
| } else { | ||
| fs.mkdirs(new Path(PARQUET_SOURCE_ROOT)); | ||
| } | ||
|
|
||
| tableName = "test_parquet_table" + testNum; | ||
| tableBasePath = basePath + tableName; | ||
| this.deltaStreamer = new HoodieDeltaStreamer(getDeltaStreamerConfig(), jsc); | ||
| this.deltaStreamer.sync(); | ||
|
|
||
| // base table validation | ||
| Dataset<Row> baseDf = sparkSession.read().format("hudi").load(tableBasePath); | ||
| assertEquals(totalRecords - errorRecords, baseDf.count()); | ||
|
|
||
| HoodieTableMetaClient metaClient = HoodieTableMetaClient.builder() | ||
| .setConf(HadoopFSUtils.getStorageConfWithCopy(jsc.hadoopConfiguration())) | ||
| .setBasePath(tableBasePath).build(); | ||
| assertEquals(1, metaClient.getActiveTimeline().getInstants().size()); | ||
|
|
||
| // error table validation | ||
| if (withErrorTable) { | ||
| TestHoodieDeltaStreamerSchemaEvolutionExtensive.validateErrorTable(errorRecords, this.writeErrorTableInParallelWithBaseTable); | ||
| } | ||
| } | ||
|
|
||
| protected static Stream<Arguments> testErrorTableWriteFlowArgs() { | ||
| Stream.Builder<Arguments> b = Stream.builder(); | ||
| // totalRecords, numErrorRecords, numSourceFiles, WriteOperationType, shouldWriteErrorTableInUnionWithBaseTable | ||
|
|
||
| // empty source, error table union enabled, INSERT | ||
| b.add(Arguments.of(0, 0, 0, WriteOperationType.INSERT, true)); | ||
| // empty source, error table union disabled, INSERT | ||
| b.add(Arguments.of(0, 0, 0, WriteOperationType.INSERT, false)); | ||
| // non-empty source, error table union enabled, INSERT | ||
| b.add(Arguments.of(100, 5, 1, WriteOperationType.INSERT, true)); | ||
| // non-empty source, error table union disabled, INSERT | ||
| b.add(Arguments.of(100, 5, 1, WriteOperationType.INSERT, false)); | ||
| // non-empty source, error table union enabled, UPSERT | ||
| b.add(Arguments.of(100, 5, 1, WriteOperationType.UPSERT, true)); | ||
| // non-empty source, error table union disabled, UPSERT | ||
| b.add(Arguments.of(100, 5, 1, WriteOperationType.UPSERT, false)); | ||
| // non-empty source, error table union enabled, BULK_INSERT | ||
| b.add(Arguments.of(100, 5, 1, WriteOperationType.BULK_INSERT, true)); | ||
| // non-empty source, error table union disabled, BULK_INSERT | ||
| b.add(Arguments.of(100, 5, 1, WriteOperationType.BULK_INSERT, false)); | ||
| return b.build(); | ||
| } | ||
|
|
||
| @ParameterizedTest | ||
| @MethodSource("testErrorTableWriteFlowArgs") | ||
| void testErrorTableWriteFlow( | ||
| int totalRecords, | ||
| int numErrorRecords, | ||
| int numSourceFiles, | ||
| WriteOperationType wopType, | ||
| boolean writeErrorTableInParallel) throws Exception { | ||
| this.withErrorTable = true; | ||
| this.writeErrorTableInParallelWithBaseTable = writeErrorTableInParallel; | ||
| this.writeOperationType = wopType; | ||
| this.useSchemaProvider = false; | ||
| this.useTransformer = false; | ||
| this.tableType = "COPY_ON_WRITE"; | ||
| this.shouldCluster = false; | ||
| this.shouldCompact = false; | ||
| this.rowWriterEnable = false; | ||
| this.addFilegroups = false; | ||
| this.multiLogFiles = false; | ||
| this.dfsSourceLimitBytes = 100000000; // set source limit to 100mb | ||
| testBase(Tuple3.of(totalRecords, numErrorRecords, numSourceFiles)); | ||
| } | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I am wondering if we really need a flag for this. This seems like it will be more performant for users with the error table writer enabled
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The error table write implementation can't do a union if they implement the
upsertAndCommitmethod so still need to support it behind a feature flag to avoid breaking things for existing users.