forked from apache/hudi
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[HUDI-7500] fix gaps with deduce schema and null schema (apache#10858)
--------- Co-authored-by: Jonathan Vexler <=>
- Loading branch information
Showing
5 changed files
with
241 additions
and
15 deletions.
There are no files selected for viewing
This file contains 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 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 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 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
192 changes: 192 additions & 0 deletions
192
hudi-utilities/src/test/java/org/apache/hudi/utilities/streamer/TestStreamSyncUnitTests.java
This file contains 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,192 @@ | ||
| /* | ||
| * 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. | ||
| */ | ||
|
|
||
| /* | ||
| * 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.streamer; | ||
|
|
||
| import org.apache.hudi.DataSourceWriteOptions; | ||
| import org.apache.hudi.client.common.HoodieSparkEngineContext; | ||
| import org.apache.hudi.common.config.TypedProperties; | ||
| import org.apache.hudi.common.table.HoodieTableMetaClient; | ||
| import org.apache.hudi.common.util.Option; | ||
| import org.apache.hudi.config.HoodieErrorTableConfig; | ||
| import org.apache.hudi.utilities.schema.SchemaProvider; | ||
| import org.apache.hudi.utilities.sources.InputBatch; | ||
| import org.apache.hudi.utilities.transform.Transformer; | ||
|
|
||
| import org.apache.avro.Schema; | ||
| import org.apache.avro.generic.GenericRecord; | ||
| import org.apache.hadoop.conf.Configuration; | ||
| import org.apache.hadoop.fs.FileSystem; | ||
| import org.apache.spark.api.java.JavaRDD; | ||
| import org.apache.spark.sql.Dataset; | ||
| import org.apache.spark.sql.Row; | ||
| import org.apache.spark.sql.SparkSession; | ||
| 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.apache.hudi.config.HoodieErrorTableConfig.ERROR_ENABLE_VALIDATE_TARGET_SCHEMA; | ||
| import static org.junit.jupiter.api.Assertions.assertEquals; | ||
| import static org.mockito.ArgumentMatchers.any; | ||
| import static org.mockito.ArgumentMatchers.anyLong; | ||
| import static org.mockito.Mockito.doReturn; | ||
| import static org.mockito.Mockito.mock; | ||
| import static org.mockito.Mockito.never; | ||
| import static org.mockito.Mockito.spy; | ||
| import static org.mockito.Mockito.times; | ||
| import static org.mockito.Mockito.verify; | ||
| import static org.mockito.Mockito.when; | ||
|
|
||
| public class TestStreamSyncUnitTests { | ||
|
|
||
| @ParameterizedTest | ||
| @MethodSource("testCasesFetchNextBatchFromSource") | ||
| void testFetchNextBatchFromSource(Boolean useRowWriter, Boolean hasTransformer, Boolean hasSchemaProvider, | ||
| Boolean isNullTargetSchema, Boolean hasErrorTable, Boolean shouldTryWriteToErrorTable) { | ||
| //basic deltastreamer inputs | ||
| HoodieSparkEngineContext hoodieSparkEngineContext = mock(HoodieSparkEngineContext.class); | ||
| FileSystem fs = mock(FileSystem.class); | ||
| SparkSession sparkSession = mock(SparkSession.class); | ||
| Configuration configuration = mock(Configuration.class); | ||
| HoodieStreamer.Config cfg = new HoodieStreamer.Config(); | ||
| cfg.targetTableName = "testTableName"; | ||
| cfg.targetBasePath = "/fake/table/name"; | ||
| cfg.tableType = "MERGE_ON_READ"; | ||
|
|
||
| //Source format adapter | ||
| SourceFormatAdapter sourceFormatAdapter = mock(SourceFormatAdapter.class); | ||
| SchemaProvider inputBatchSchemaProvider = getSchemaProvider("InputBatch", false); | ||
| Option<Dataset<Row>> fakeDataFrame = Option.of(mock(Dataset.class)); | ||
| InputBatch<Dataset<Row>> fakeRowInputBatch = new InputBatch<>(fakeDataFrame, "chkpt", inputBatchSchemaProvider); | ||
| when(sourceFormatAdapter.fetchNewDataInRowFormat(any(), anyLong())).thenReturn(fakeRowInputBatch); | ||
| //batch is empty because we don't want getBatch().map() to do anything because it calls static method we can't mock | ||
| InputBatch<JavaRDD<GenericRecord>> fakeAvroInputBatch = new InputBatch<>(Option.empty(), "chkpt", inputBatchSchemaProvider); | ||
| when(sourceFormatAdapter.fetchNewDataInAvroFormat(any(),anyLong())).thenReturn(fakeAvroInputBatch); | ||
|
|
||
| //transformer | ||
| //return empty because we don't want .map() to do anything because it calls static method we can't mock | ||
| when(sourceFormatAdapter.processErrorEvents(any(), any())).thenReturn(Option.empty()); | ||
| Option<Transformer> transformerOption = Option.empty(); | ||
| if (hasTransformer) { | ||
| transformerOption = Option.of(mock(Transformer.class)); | ||
| } | ||
|
|
||
| //user provided schema provider | ||
| SchemaProvider schemaProvider = null; | ||
| if (hasSchemaProvider) { | ||
| schemaProvider = getSchemaProvider("UserProvided", isNullTargetSchema); | ||
| } | ||
|
|
||
| //error table | ||
| TypedProperties props = new TypedProperties(); | ||
| props.put(DataSourceWriteOptions.RECONCILE_SCHEMA().key(), false); | ||
| Option<BaseErrorTableWriter> errorTableWriterOption = Option.empty(); | ||
| if (hasErrorTable) { | ||
| errorTableWriterOption = Option.of(mock(BaseErrorTableWriter.class)); | ||
| props.put(ERROR_ENABLE_VALIDATE_TARGET_SCHEMA.key(), true); | ||
| } | ||
| TypedProperties propsSpy = spy(props); | ||
|
|
||
|
|
||
| //Actually create the deltastreamer | ||
| StreamSync streamSync = new StreamSync(cfg, sparkSession, propsSpy, hoodieSparkEngineContext, | ||
| fs, configuration, client -> true, schemaProvider, errorTableWriterOption, sourceFormatAdapter, transformerOption, useRowWriter, false); | ||
| StreamSync spy = spy(streamSync); | ||
| SchemaProvider deducedSchemaProvider; | ||
| deducedSchemaProvider = getSchemaProvider("deduced", false); | ||
| doReturn(deducedSchemaProvider).when(spy).getDeducedSchemaProvider(any(), any(), any()); | ||
|
|
||
| //run the method we are unit testing: | ||
| InputBatch batch = spy.fetchNextBatchFromSource(Option.empty(), mock(HoodieTableMetaClient.class)); | ||
|
|
||
| //make sure getDeducedSchemaProvider is always called once | ||
| verify(spy, times(1)).getDeducedSchemaProvider(any(), any(), any()); | ||
|
|
||
| //make sure the deduced schema is actually used | ||
| assertEquals(deducedSchemaProvider.getTargetSchema(), batch.getSchemaProvider().getTargetSchema()); | ||
|
|
||
| //make sure we use error table when we should | ||
| verify(propsSpy, shouldTryWriteToErrorTable ? times(1) : never()) | ||
| .getBoolean(HoodieErrorTableConfig.ERROR_ENABLE_VALIDATE_TARGET_SCHEMA.key(), | ||
| HoodieErrorTableConfig.ERROR_ENABLE_VALIDATE_TARGET_SCHEMA.defaultValue()); | ||
| } | ||
|
|
||
| private SchemaProvider getSchemaProvider(String name, boolean isNullTargetSchema) { | ||
| SchemaProvider schemaProvider = mock(SchemaProvider.class); | ||
| Schema sourceSchema = mock(Schema.class); | ||
| Schema targetSchema = isNullTargetSchema ? InputBatch.NULL_SCHEMA : mock(Schema.class); | ||
| when(schemaProvider.getSourceSchema()).thenReturn(sourceSchema); | ||
| when(schemaProvider.getTargetSchema()).thenReturn(targetSchema); | ||
| when(sourceSchema.toString()).thenReturn(name + "SourceSchema"); | ||
| if (!isNullTargetSchema) { | ||
| when(targetSchema.toString()).thenReturn(name + "TargetSchema"); | ||
| } | ||
| return schemaProvider; | ||
| } | ||
|
|
||
| static Stream<Arguments> testCasesFetchNextBatchFromSource() { | ||
| Stream.Builder<Arguments> b = Stream.builder(); | ||
|
|
||
| //no transformer | ||
| for (Boolean useRowWriter : new Boolean[]{false, true}) { | ||
| for (Boolean hasErrorTable : new Boolean[]{false, true}) { | ||
| boolean errorTableEnabled = hasErrorTable && !useRowWriter; | ||
| b.add(Arguments.of(useRowWriter, false, false, false, | ||
| hasErrorTable, errorTableEnabled)); | ||
| } | ||
| } | ||
|
|
||
| //with transformer | ||
| for (Boolean useRowWriter : new Boolean[]{false, true}) { | ||
| for (Boolean hasSchemaProvider : new Boolean[]{false, true}) { | ||
| for (Boolean isNullTargetSchema : new Boolean[]{false, true}) { | ||
| for (Boolean hasErrorTable : new Boolean[]{false, true}) { | ||
| boolean errorTableEnabled = hasErrorTable && !useRowWriter; | ||
| boolean schemaProviderNullOrMissing = isNullTargetSchema || !hasSchemaProvider; | ||
| boolean shouldTryWriteToErrorTable = errorTableEnabled && !schemaProviderNullOrMissing; | ||
| b.add(Arguments.of(useRowWriter, true, hasSchemaProvider, isNullTargetSchema, | ||
| hasErrorTable, shouldTryWriteToErrorTable)); | ||
| } | ||
| } | ||
| } | ||
| } | ||
| return b.build(); | ||
| } | ||
| } |