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-1716]: Resolving default values for schema from dataframe (apac…
…he#2765) - Adding default values and setting null as first entry in UNION data types in avro schema. Co-authored-by: Aditya Tiwari <[email protected]>
- Loading branch information
1 parent
dab5114
commit ec2334c
Showing
9 changed files
with
405 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
40 changes: 40 additions & 0 deletions
40
hudi-spark-datasource/hudi-spark/src/test/resources/exampleEvolvedSchema.txt
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,40 @@ | ||
| /* | ||
| * 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. | ||
| */ | ||
| { | ||
| "namespace": "example.schema", | ||
| "type": "record", | ||
| "name": "trip", | ||
| "fields": [ | ||
| { | ||
| "name": "_row_key", | ||
| "type": "string" | ||
| }, | ||
| { | ||
| "name": "partition", | ||
| "type": "string" | ||
| }, | ||
| { | ||
| "name": "ts", | ||
| "type": ["long", "null"] | ||
| }, | ||
| { | ||
| "name": "new_field", | ||
| "type": ["string","null"] | ||
| } | ||
| ] | ||
| } |
164 changes: 164 additions & 0 deletions
164
...-spark-datasource/hudi-spark/src/test/scala/org/apache/hudi/TestAvroConversionUtils.scala
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,164 @@ | ||
| /* | ||
| * 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 | ||
|
|
||
| import org.apache.avro.Schema | ||
| import org.apache.spark.sql.types.{DataTypes, StructType, StringType, ArrayType} | ||
| import org.scalatest.{FunSuite, Matchers} | ||
|
|
||
| class TestAvroConversionUtils extends FunSuite with Matchers { | ||
|
|
||
|
|
||
| test("test convertStructTypeToAvroSchema") { | ||
| val mapType = DataTypes.createMapType(StringType, new StructType().add("mapKey", "string", false).add("mapVal", "integer", true)) | ||
| val arrayType = ArrayType(new StructType().add("arrayKey", "string", false).add("arrayVal", "integer", true)) | ||
| val innerStruct = new StructType().add("innerKey","string",false).add("value", "long", true) | ||
|
|
||
| val struct = new StructType().add("key", "string", false).add("version", "string", true) | ||
| .add("data1",innerStruct,false).add("data2",innerStruct,true) | ||
| .add("nullableMap", mapType, true).add("map",mapType,false) | ||
| .add("nullableArray", arrayType, true).add("array",arrayType,false) | ||
|
|
||
| val avroSchema = AvroConversionUtils.convertStructTypeToAvroSchema(struct, "SchemaName", "SchemaNS") | ||
|
|
||
| val expectedSchemaStr = s""" | ||
| { | ||
| "type" : "record", | ||
| "name" : "SchemaName", | ||
| "namespace" : "SchemaNS", | ||
| "fields" : [ { | ||
| "name" : "key", | ||
| "type" : "string" | ||
| }, { | ||
| "name" : "version", | ||
| "type" : [ "null", "string" ], | ||
| "default" : null | ||
| }, { | ||
| "name" : "data1", | ||
| "type" : { | ||
| "type" : "record", | ||
| "name" : "data1", | ||
| "namespace" : "SchemaNS.SchemaName", | ||
| "fields" : [ { | ||
| "name" : "innerKey", | ||
| "type" : "string" | ||
| }, { | ||
| "name" : "value", | ||
| "type" : [ "null", "long" ], | ||
| "default" : null | ||
| } ] | ||
| } | ||
| }, { | ||
| "name" : "data2", | ||
| "type" : [ "null", { | ||
| "type" : "record", | ||
| "name" : "data2", | ||
| "namespace" : "SchemaNS.SchemaName", | ||
| "fields" : [ { | ||
| "name" : "innerKey", | ||
| "type" : "string" | ||
| }, { | ||
| "name" : "value", | ||
| "type" : [ "null", "long" ], | ||
| "default" : null | ||
| } ] | ||
| } ], | ||
| "default" : null | ||
| }, { | ||
| "name" : "nullableMap", | ||
| "type" : [ "null", { | ||
| "type" : "map", | ||
| "values" : [ { | ||
| "type" : "record", | ||
| "name" : "nullableMap", | ||
| "namespace" : "SchemaNS.SchemaName", | ||
| "fields" : [ { | ||
| "name" : "mapKey", | ||
| "type" : "string" | ||
| }, { | ||
| "name" : "mapVal", | ||
| "type" : [ "null", "int" ], | ||
| "default" : null | ||
| } ] | ||
| }, "null" ] | ||
| } ], | ||
| "default" : null | ||
| }, { | ||
| "name" : "map", | ||
| "type" : { | ||
| "type" : "map", | ||
| "values" : [ { | ||
| "type" : "record", | ||
| "name" : "map", | ||
| "namespace" : "SchemaNS.SchemaName", | ||
| "fields" : [ { | ||
| "name" : "mapKey", | ||
| "type" : "string" | ||
| }, { | ||
| "name" : "mapVal", | ||
| "type" : [ "null", "int" ], | ||
| "default" : null | ||
| } ] | ||
| }, "null" ] | ||
| } | ||
| }, { | ||
| "name" : "nullableArray", | ||
| "type" : [ "null", { | ||
| "type" : "array", | ||
| "items" : [ { | ||
| "type" : "record", | ||
| "name" : "nullableArray", | ||
| "namespace" : "SchemaNS.SchemaName", | ||
| "fields" : [ { | ||
| "name" : "arrayKey", | ||
| "type" : "string" | ||
| }, { | ||
| "name" : "arrayVal", | ||
| "type" : [ "null", "int" ], | ||
| "default" : null | ||
| } ] | ||
| }, "null" ] | ||
| } ], | ||
| "default" : null | ||
| }, { | ||
| "name" : "array", | ||
| "type" : { | ||
| "type" : "array", | ||
| "items" : [ { | ||
| "type" : "record", | ||
| "name" : "array", | ||
| "namespace" : "SchemaNS.SchemaName", | ||
| "fields" : [ { | ||
| "name" : "arrayKey", | ||
| "type" : "string" | ||
| }, { | ||
| "name" : "arrayVal", | ||
| "type" : [ "null", "int" ], | ||
| "default" : null | ||
| } ] | ||
| }, "null" ] | ||
| } | ||
| } ] | ||
| } | ||
| """ | ||
| val expectedAvroSchema = new Schema.Parser().parse(expectedSchemaStr) | ||
|
|
||
| assert(avroSchema.equals(expectedAvroSchema)) | ||
| } | ||
| } |
Oops, something went wrong.