-
Notifications
You must be signed in to change notification settings - Fork 2.5k
[HUDI-2418] Support HiveSchemaProvider #3671
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
19 commits
Select commit
Hold shift + click to select a range
be4aeae
[HUDI-2413] fix Sql source's checkpoint
02d8da9
Revert "[HUDI-2413] fix Sql source's checkpoint"
c77bd85
[HUDI-2418] add HiveSchemaProvider
0312ca5
[HUDI-2418] add HiveSchemaProvider
8196d21
[HUDI-2418] add apache license header
c305e93
[HUDI-2418] check style
899581b
[HUDI-2418] use SparkClientFunctionalTestHarness instead of deprecat…
5c7664d
[HUDI-2418] delete test log
35e7f48
[HUDI-2418] change function name
b744966
[HUDI-2418] add dependency for HiveSchema test
2593606
[HUDI-2418] add hive support for TestHiveSchemaProvider
48f2700
[HUDI-2418] add hive support for TestHiveSchemaProvider
c76d2c2
[HUDI-2418] check style
f95bba8
[HUDI-2418] logger change
9625847
[HUDI-2418] code review
f21e9f3
[HUDI-2418] code review
2f7fb95
[HUDI-2418] code review
2ceab64
[HUDI-2418] code review
eafa89d
[HUDI-2418] add license to SparkClientFunctionalTestHarnessWithHiveSu…
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
99 changes: 99 additions & 0 deletions
99
hudi-utilities/src/main/java/org/apache/hudi/utilities/schema/HiveSchemaProvider.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,99 @@ | ||
| /* | ||
| * 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.schema; | ||
|
|
||
| import org.apache.avro.Schema; | ||
| import org.apache.hudi.AvroConversionUtils; | ||
| import org.apache.hudi.DataSourceUtils; | ||
| import org.apache.hudi.common.config.TypedProperties; | ||
| import org.apache.log4j.LogManager; | ||
| import org.apache.log4j.Logger; | ||
| import org.apache.spark.api.java.JavaSparkContext; | ||
| import org.apache.spark.sql.SparkSession; | ||
| import org.apache.spark.sql.catalyst.TableIdentifier; | ||
| import org.apache.spark.sql.catalyst.analysis.NoSuchDatabaseException; | ||
| import org.apache.spark.sql.catalyst.analysis.NoSuchTableException; | ||
| import org.apache.spark.sql.types.StructType; | ||
|
|
||
| import java.util.Collections; | ||
|
|
||
| public class HiveSchemaProvider extends SchemaProvider { | ||
|
|
||
| /** | ||
| * Configs supported. | ||
| */ | ||
| public static class Config { | ||
| private static final String SOURCE_SCHEMA_DATABASE_PROP = "hoodie.deltastreamer.schemaprovider.source.schema.hive.database"; | ||
| private static final String SOURCE_SCHEMA_TABLE_PROP = "hoodie.deltastreamer.schemaprovider.source.schema.hive.table"; | ||
| private static final String TARGET_SCHEMA_DATABASE_PROP = "hoodie.deltastreamer.schemaprovider.target.schema.hive.database"; | ||
| private static final String TARGET_SCHEMA_TABLE_PROP = "hoodie.deltastreamer.schemaprovider.target.schema.hive.table"; | ||
| } | ||
|
|
||
| private static final Logger LOG = LogManager.getLogger(HiveSchemaProvider.class); | ||
|
|
||
| private final Schema sourceSchema; | ||
|
|
||
| private Schema targetSchema; | ||
|
|
||
| public HiveSchemaProvider(TypedProperties props, JavaSparkContext jssc) { | ||
| super(props, jssc); | ||
| DataSourceUtils.checkRequiredProperties(props, Collections.singletonList(Config.SOURCE_SCHEMA_TABLE_PROP)); | ||
| String sourceSchemaDBName = props.getString(Config.SOURCE_SCHEMA_DATABASE_PROP, "default"); | ||
| String sourceSchemaTableName = props.getString(Config.SOURCE_SCHEMA_TABLE_PROP); | ||
| SparkSession spark = SparkSession.builder().config(jssc.getConf()).enableHiveSupport().getOrCreate(); | ||
| try { | ||
| TableIdentifier sourceSchemaTable = new TableIdentifier(sourceSchemaTableName, scala.Option.apply(sourceSchemaDBName)); | ||
| StructType sourceSchema = spark.sessionState().catalog().getTableMetadata(sourceSchemaTable).schema(); | ||
|
|
||
| this.sourceSchema = AvroConversionUtils.convertStructTypeToAvroSchema( | ||
| sourceSchema, | ||
| sourceSchemaTableName, | ||
| "hoodie." + sourceSchemaDBName); | ||
fengjian428 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| if (props.containsKey(Config.TARGET_SCHEMA_TABLE_PROP)) { | ||
| String targetSchemaDBName = props.getString(Config.TARGET_SCHEMA_DATABASE_PROP, "default"); | ||
| String targetSchemaTableName = props.getString(Config.TARGET_SCHEMA_TABLE_PROP); | ||
| TableIdentifier targetSchemaTable = new TableIdentifier(targetSchemaTableName, scala.Option.apply(targetSchemaDBName)); | ||
| StructType targetSchema = spark.sessionState().catalog().getTableMetadata(targetSchemaTable).schema(); | ||
| this.targetSchema = AvroConversionUtils.convertStructTypeToAvroSchema( | ||
| targetSchema, | ||
| targetSchemaTableName, | ||
| "hoodie." + targetSchemaDBName); | ||
| } | ||
| } catch (NoSuchTableException | NoSuchDatabaseException e) { | ||
| String message = String.format("Can't find Hive table(s): %s", sourceSchemaTableName + "," + props.getString(Config.TARGET_SCHEMA_TABLE_PROP)); | ||
| throw new IllegalArgumentException(message, e); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public Schema getSourceSchema() { | ||
| return sourceSchema; | ||
| } | ||
|
|
||
| @Override | ||
| public Schema getTargetSchema() { | ||
| if (targetSchema != null) { | ||
| return targetSchema; | ||
| } else { | ||
| return super.getTargetSchema(); | ||
| } | ||
| } | ||
| } | ||
fengjian428 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
132 changes: 132 additions & 0 deletions
132
...-utilities/src/test/java/org/apache/hudi/utilities/functional/TestHiveSchemaProvider.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,132 @@ | ||
| /* | ||
| * 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.functional; | ||
fengjian428 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| import org.apache.avro.Schema; | ||
| import org.apache.hudi.common.config.TypedProperties; | ||
| import org.apache.hudi.common.util.collection.ImmutablePair; | ||
| import org.apache.hudi.common.util.collection.Pair; | ||
| import org.apache.hudi.exception.HoodieException; | ||
| import org.apache.hudi.utilities.UtilHelpers; | ||
| import org.apache.hudi.utilities.schema.HiveSchemaProvider; | ||
| import org.apache.hudi.utilities.testutils.SparkClientFunctionalTestHarnessWithHiveSupport; | ||
| import org.apache.hudi.utilities.testutils.UtilitiesTestBase; | ||
| import org.apache.log4j.LogManager; | ||
| import org.apache.log4j.Logger; | ||
| import org.apache.spark.sql.SparkSession; | ||
| import org.apache.spark.sql.catalyst.analysis.NoSuchTableException; | ||
| import org.junit.jupiter.api.Assertions; | ||
| import org.junit.jupiter.api.BeforeAll; | ||
| import org.junit.jupiter.api.Tag; | ||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| import java.io.IOException; | ||
|
|
||
| import static org.junit.jupiter.api.Assertions.assertTrue; | ||
|
|
||
| /** | ||
| * Basic tests against {@link HiveSchemaProvider}. | ||
| */ | ||
| @Tag("functional") | ||
| public class TestHiveSchemaProvider extends SparkClientFunctionalTestHarnessWithHiveSupport { | ||
| private static final Logger LOG = LogManager.getLogger(TestHiveSchemaProvider.class); | ||
| private static final TypedProperties PROPS = new TypedProperties(); | ||
| private static final String SOURCE_SCHEMA_TABLE_NAME = "schema_registry.source_schema_tab"; | ||
| private static final String TARGET_SCHEMA_TABLE_NAME = "schema_registry.target_schema_tab"; | ||
|
|
||
| @BeforeAll | ||
| public static void init() { | ||
| Pair<String, String> dbAndTableName = paresDBAndTableName(SOURCE_SCHEMA_TABLE_NAME); | ||
| PROPS.setProperty("hoodie.deltastreamer.schemaprovider.source.schema.hive.database", dbAndTableName.getLeft()); | ||
fengjian428 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| PROPS.setProperty("hoodie.deltastreamer.schemaprovider.source.schema.hive.table", dbAndTableName.getRight()); | ||
| } | ||
|
|
||
| @Test | ||
| public void testSourceSchema() throws Exception { | ||
| try { | ||
| createSchemaTable(SOURCE_SCHEMA_TABLE_NAME); | ||
| Schema sourceSchema = UtilHelpers.createSchemaProvider(HiveSchemaProvider.class.getName(), PROPS, jsc()).getSourceSchema(); | ||
|
|
||
| Schema originalSchema = new Schema.Parser().parse( | ||
| UtilitiesTestBase.Helpers.readFile("delta-streamer-config/hive_schema_provider_source.avsc") | ||
| ); | ||
| for (Schema.Field field : sourceSchema.getFields()) { | ||
| Schema.Field originalField = originalSchema.getField(field.name()); | ||
| assertTrue(originalField != null); | ||
| } | ||
| } catch (HoodieException e) { | ||
| LOG.error("Failed to get source schema. ", e); | ||
fengjian428 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| throw e; | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| public void testTargetSchema() throws Exception { | ||
| try { | ||
| Pair<String, String> dbAndTableName = paresDBAndTableName(TARGET_SCHEMA_TABLE_NAME); | ||
| PROPS.setProperty("hoodie.deltastreamer.schemaprovider.target.schema.hive.database", dbAndTableName.getLeft()); | ||
fengjian428 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| PROPS.setProperty("hoodie.deltastreamer.schemaprovider.target.schema.hive.table", dbAndTableName.getRight()); | ||
fengjian428 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| createSchemaTable(SOURCE_SCHEMA_TABLE_NAME); | ||
| createSchemaTable(TARGET_SCHEMA_TABLE_NAME); | ||
| Schema targetSchema = UtilHelpers.createSchemaProvider(HiveSchemaProvider.class.getName(), PROPS, jsc()).getTargetSchema(); | ||
| Schema originalSchema = new Schema.Parser().parse( | ||
| UtilitiesTestBase.Helpers.readFile("delta-streamer-config/hive_schema_provider_target.avsc")); | ||
| for (Schema.Field field : targetSchema.getFields()) { | ||
| Schema.Field originalField = originalSchema.getField(field.name()); | ||
| assertTrue(originalField != null); | ||
| } | ||
| } catch (HoodieException e) { | ||
| LOG.error("Failed to get source/target schema. ", e); | ||
fengjian428 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| throw e; | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| public void testNotExistTable() { | ||
| String wrongName = "wrong_schema_tab"; | ||
| PROPS.setProperty("hoodie.deltastreamer.schemaprovider.source.schema.hive.table", wrongName); | ||
fengjian428 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| Assertions.assertThrows(NoSuchTableException.class, () -> { | ||
| try { | ||
| UtilHelpers.createSchemaProvider(HiveSchemaProvider.class.getName(), PROPS, jsc()).getSourceSchema(); | ||
| } catch (Throwable exception) { | ||
| while (exception.getCause() != null) { | ||
| exception = exception.getCause(); | ||
| } | ||
| throw exception; | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| private static Pair<String, String> paresDBAndTableName(String fullName) { | ||
| String[] dbAndTableName = fullName.split("\\."); | ||
| if (dbAndTableName.length > 1) { | ||
| return new ImmutablePair<>(dbAndTableName[0], dbAndTableName[1]); | ||
| } else { | ||
| return new ImmutablePair<>("default", dbAndTableName[0]); | ||
| } | ||
| } | ||
|
|
||
| private void createSchemaTable(String fullName) throws IOException { | ||
| SparkSession spark = spark(); | ||
| String createTableSQL = UtilitiesTestBase.Helpers.readFile(String.format("delta-streamer-config/%s.sql", fullName)); | ||
| Pair<String, String> dbAndTableName = paresDBAndTableName(fullName); | ||
| spark.sql(String.format("CREATE DATABASE IF NOT EXISTS %s", dbAndTableName.getLeft())); | ||
| spark.sql(createTableSQL); | ||
| } | ||
| } | ||
32 changes: 32 additions & 0 deletions
32
.../org/apache/hudi/utilities/testutils/SparkClientFunctionalTestHarnessWithHiveSupport.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,32 @@ | ||
| /* | ||
| * 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.testutils; | ||
|
|
||
| import org.apache.hudi.testutils.SparkClientFunctionalTestHarness; | ||
| import org.apache.spark.SparkConf; | ||
|
|
||
| import java.util.Collections; | ||
|
|
||
| public class SparkClientFunctionalTestHarnessWithHiveSupport extends SparkClientFunctionalTestHarness { | ||
|
|
||
| public SparkConf conf() { | ||
| return conf(Collections.singletonMap("spark.sql.catalogImplementation", "hive")); | ||
| } | ||
| } |
103 changes: 103 additions & 0 deletions
103
hudi-utilities/src/test/resources/delta-streamer-config/hive_schema_provider_source.avsc
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,103 @@ | ||
| /* | ||
| * 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. | ||
| */ | ||
|
|
||
| { | ||
fengjian428 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| "type": "record", | ||
| "name": "source_schema_tab", | ||
| "namespace": "hoodie.schema_registry", | ||
| "fields": [ | ||
| { | ||
| "name": "id", | ||
| "type": [ | ||
| "long", | ||
| "null" | ||
| ] | ||
| }, | ||
| { | ||
| "name": "name", | ||
| "type": [ | ||
| "string", | ||
| "null" | ||
| ] | ||
| }, | ||
| { | ||
| "name": "num1", | ||
| "type": [ | ||
| "int", | ||
| "null" | ||
| ] | ||
| }, | ||
| { | ||
| "name": "num2", | ||
| "type": [ | ||
| "long", | ||
| "null" | ||
| ] | ||
| }, | ||
| { | ||
| "name": "num3", | ||
| "type": [ | ||
| { | ||
| "type": "fixed", | ||
| "name": "fixed", | ||
| "namespace": "hoodie.schema_registry.source_schema_tab.num3", | ||
| "size": 9, | ||
| "logicalType": "decimal", | ||
| "precision": 20, | ||
| "scale": 0 | ||
| }, | ||
| "null" | ||
| ] | ||
| }, | ||
| { | ||
| "name": "num4", | ||
| "type": [ | ||
| "int", | ||
| "null" | ||
| ] | ||
| }, | ||
| { | ||
| "name": "num5", | ||
| "type": [ | ||
| "float", | ||
| "null" | ||
| ] | ||
| }, | ||
| { | ||
| "name": "num6", | ||
| "type": [ | ||
| "double", | ||
| "null" | ||
| ] | ||
| }, | ||
| { | ||
| "name": "bool", | ||
| "type": [ | ||
| "boolean", | ||
| "null" | ||
| ] | ||
| }, | ||
| { | ||
| "name": "bin", | ||
| "type": [ | ||
| "bytes", | ||
| "null" | ||
| ] | ||
| } | ||
| ] | ||
| } | ||
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.
Uh oh!
There was an error while loading. Please reload this page.