-
Notifications
You must be signed in to change notification settings - Fork 2.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[HUDI-3204] Fixing partition-values being derived from partition-path…
… instead of source columns (#5364) - Scaffolded `Spark24HoodieParquetFileFormat` extending `ParquetFileFormat` and overriding the behavior of adding partition columns to every row - Amended `SparkAdapter`s `createHoodieParquetFileFormat` API to be able to configure whether to append partition values or not - Fallback to append partition values in cases when the source columns are not persisted in data-file - Fixing HoodieBaseRelation incorrectly handling mandatory columns
- Loading branch information
Alexey Kudinkin
authored
Apr 20, 2022
1 parent
408663c
commit f7544e2
Showing
28 changed files
with
1,166 additions
and
696 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
112 changes: 112 additions & 0 deletions
112
hudi-common/src/main/java/org/apache/hudi/avro/AvroSchemaUtils.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,112 @@ | ||
| /* | ||
| * 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.avro; | ||
|
|
||
| import org.apache.avro.AvroRuntimeException; | ||
| import org.apache.avro.Schema; | ||
|
|
||
| import java.util.List; | ||
| import java.util.Objects; | ||
| import java.util.stream.Collectors; | ||
|
|
||
| import static org.apache.hudi.common.util.ValidationUtils.checkState; | ||
|
|
||
| public class AvroSchemaUtils { | ||
|
|
||
| private AvroSchemaUtils() {} | ||
|
|
||
| /** | ||
| * Appends provided new fields at the end of the given schema | ||
| * | ||
| * NOTE: No deduplication is made, this method simply appends fields at the end of the list | ||
| * of the source schema as is | ||
| */ | ||
| public static Schema appendFieldsToSchema(Schema schema, List<Schema.Field> newFields) { | ||
| List<Schema.Field> fields = schema.getFields().stream() | ||
| .map(field -> new Schema.Field(field.name(), field.schema(), field.doc(), field.defaultVal())) | ||
| .collect(Collectors.toList()); | ||
| fields.addAll(newFields); | ||
|
|
||
| Schema newSchema = Schema.createRecord(schema.getName(), schema.getDoc(), schema.getNamespace(), schema.isError()); | ||
| newSchema.setFields(fields); | ||
| return newSchema; | ||
| } | ||
|
|
||
| /** | ||
| * Passed in {@code Union} schema and will try to resolve the field with the {@code fieldSchemaFullName} | ||
| * w/in the union returning its corresponding schema | ||
| * | ||
| * @param schema target schema to be inspected | ||
| * @param fieldSchemaFullName target field-name to be looked up w/in the union | ||
| * @return schema of the field w/in the union identified by the {@code fieldSchemaFullName} | ||
| */ | ||
| public static Schema resolveUnionSchema(Schema schema, String fieldSchemaFullName) { | ||
| if (schema.getType() != Schema.Type.UNION) { | ||
| return schema; | ||
| } | ||
|
|
||
| List<Schema> innerTypes = schema.getTypes(); | ||
| Schema nonNullType = | ||
| innerTypes.stream() | ||
| .filter(it -> it.getType() != Schema.Type.NULL && Objects.equals(it.getFullName(), fieldSchemaFullName)) | ||
| .findFirst() | ||
| .orElse(null); | ||
|
|
||
| if (nonNullType == null) { | ||
| throw new AvroRuntimeException( | ||
| String.format("Unsupported Avro UNION type %s: Only UNION of a null type and a non-null type is supported", schema)); | ||
| } | ||
|
|
||
| return nonNullType; | ||
| } | ||
|
|
||
| /** | ||
| * Resolves typical Avro's nullable schema definition: {@code Union(Schema.Type.NULL, <NonNullType>)}, | ||
| * decomposing union and returning the target non-null type | ||
| */ | ||
| public static Schema resolveNullableSchema(Schema schema) { | ||
| if (schema.getType() != Schema.Type.UNION) { | ||
| return schema; | ||
| } | ||
|
|
||
| List<Schema> innerTypes = schema.getTypes(); | ||
| Schema nonNullType = | ||
| innerTypes.stream() | ||
| .filter(it -> it.getType() != Schema.Type.NULL) | ||
| .findFirst() | ||
| .orElse(null); | ||
|
|
||
| if (innerTypes.size() != 2 || nonNullType == null) { | ||
| throw new AvroRuntimeException( | ||
| String.format("Unsupported Avro UNION type %s: Only UNION of a null type and a non-null type is supported", schema)); | ||
| } | ||
|
|
||
| return nonNullType; | ||
| } | ||
|
|
||
| /** | ||
| * Creates schema following Avro's typical nullable schema definition: {@code Union(Schema.Type.NULL, <NonNullType>)}, | ||
| * wrapping around provided target non-null type | ||
| */ | ||
| public static Schema createNullableSchema(Schema.Type avroType) { | ||
| checkState(avroType != Schema.Type.NULL); | ||
| return Schema.createUnion(Schema.create(Schema.Type.NULL), Schema.create(avroType)); | ||
| } | ||
|
|
||
| } |
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
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
Oops, something went wrong.