lanyuanxiaoyao/hudi
1
0
Fork 0
Code Activity

[HUDI-3464] Fix wrong exception thrown from HiveSchemaProvider (#4865)

Browse Source
This commit is contained in:
wangxianghu
2022-02-22 10:20:20 +04:00
committed by GitHub
parent 14dbbdf4c7
commit 4d1f74ebea
2 changed files with 59 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
hudi-utilities/src/main/java/org/apache/hudi/utilities/exception/HoodieSchemaProviderException.java Normal file
View File

@@ -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.exception;
import org.apache.hudi.exception.HoodieException;
public class HoodieSchemaProviderException extends HoodieException {
public HoodieSchemaProviderException(String msg, Throwable e) {
super(msg, e);
}
public HoodieSchemaProviderException(String msg) {
super(msg);
}
}

49
hudi-utilities/src/main/java/org/apache/hudi/utilities/schema/HiveSchemaProvider.java
View File

@@ -19,12 +19,12 @@
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.hudi.utilities.exception.HoodieSchemaProviderException;
import org.apache.avro.Schema;
import org.apache.spark.api.java.JavaSparkContext;
import org.apache.spark.sql.SparkSession;
import org.apache.spark.sql.catalyst.TableIdentifier;
@@ -34,6 +34,9 @@ import org.apache.spark.sql.types.StructType;
import java.util.Collections;
/**
* A schema provider to get data schema through user specified hive table.
*/
public class HiveSchemaProvider extends SchemaProvider {
/**
@@ -46,40 +49,42 @@ public class HiveSchemaProvider extends SchemaProvider {
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 sourceSchemaDatabaseName = 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();
// source schema
try {
TableIdentifier sourceSchemaTable = new TableIdentifier(sourceSchemaTableName, scala.Option.apply(sourceSchemaDBName));
TableIdentifier sourceSchemaTable = new TableIdentifier(sourceSchemaTableName, scala.Option.apply(sourceSchemaDatabaseName));
StructType sourceSchema = spark.sessionState().catalog().getTableMetadata(sourceSchemaTable).schema();
this.sourceSchema = AvroConversionUtils.convertStructTypeToAvroSchema(
sourceSchema,
sourceSchemaTableName,
"hoodie." + sourceSchemaDBName);
sourceSchema,
sourceSchemaTableName,
"hoodie." + sourceSchemaDatabaseName);
} catch (NoSuchTableException | NoSuchDatabaseException e) {
throw new HoodieSchemaProviderException(String.format("Can't find Hive table: %s.%s", sourceSchemaDatabaseName, sourceSchemaTableName), e);
}
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));
// target schema
if (props.containsKey(Config.TARGET_SCHEMA_TABLE_PROP)) {
String targetSchemaDatabaseName = props.getString(Config.TARGET_SCHEMA_DATABASE_PROP, "default");
String targetSchemaTableName = props.getString(Config.TARGET_SCHEMA_TABLE_PROP);
try {
TableIdentifier targetSchemaTable = new TableIdentifier(targetSchemaTableName, scala.Option.apply(targetSchemaDatabaseName));
StructType targetSchema = spark.sessionState().catalog().getTableMetadata(targetSchemaTable).schema();
this.targetSchema = AvroConversionUtils.convertStructTypeToAvroSchema(
targetSchema,
targetSchemaTableName,
"hoodie." + targetSchemaDBName);
targetSchema,
targetSchemaTableName,
"hoodie." + targetSchemaDatabaseName);
} catch (NoSuchDatabaseException | NoSuchTableException e) {
throw new HoodieSchemaProviderException(String.format("Can't find Hive table: %s.%s", targetSchemaDatabaseName, targetSchemaTableName), e);
}
} 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);
}
}