-
Notifications
You must be signed in to change notification settings - Fork 74
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1 from willianmrs/feat/adding-permissive-error-ha…
…ndler feat adding PermissiveRecordExceltionHandler to return a null row if …
- Loading branch information
Showing
6 changed files
with
170 additions
and
12 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
32 changes: 32 additions & 0 deletions
32
src/main/scala/za/co/absa/abris/avro/errors/PermissiveRecordExceptionHandler.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,32 @@ | ||
| /* | ||
| * Copyright 2022 ABSA Group Limited | ||
| * | ||
| * Licensed 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 za.co.absa.abris.avro.errors | ||
|
|
||
| import org.apache.avro.Schema | ||
| import org.apache.avro.generic.{GenericData, GenericRecord} | ||
| import org.apache.avro.specific.SpecificRecordBase | ||
| import org.apache.spark.internal.Logging | ||
| import org.apache.spark.sql.avro.AbrisAvroDeserializer | ||
|
|
||
| class PermissiveRecordExceptionHandler() extends DeserializationExceptionHandler with Logging { | ||
|
|
||
| def handle(exception: Throwable, deserializer: AbrisAvroDeserializer, readerSchema: Schema): Any = { | ||
| logWarning("Malformed record detected. Replacing with full null row.", exception) | ||
| val record = new GenericData.Record(readerSchema) | ||
| deserializer.deserialize(record) | ||
| } | ||
| } |
64 changes: 64 additions & 0 deletions
64
src/test/scala/za/co/absa/abris/avro/errors/PermissiveRecordExceptionHandlerSpec.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,64 @@ | ||
| /* | ||
| * Copyright 2018 ABSA Group Limited | ||
| * | ||
| * Licensed 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 za.co.absa.abris.avro.errors | ||
|
|
||
| import org.apache.spark.sql.SparkSession | ||
| import org.apache.spark.sql.avro.{AbrisAvroDeserializer, SchemaConverters} | ||
| import org.apache.spark.sql.catalyst.expressions.SpecificInternalRow | ||
| import org.apache.spark.sql.types.{DataType, StructType} | ||
| import org.scalatest.flatspec.AnyFlatSpec | ||
| import za.co.absa.abris.avro.parsing.utils.AvroSchemaUtils | ||
| import za.co.absa.abris.examples.data.generation.TestSchemas | ||
|
|
||
| class PermissiveRecordExceptionHandlerSpec extends AnyFlatSpec { | ||
|
|
||
| private val spark = SparkSession | ||
| .builder() | ||
| .appName("unitTest") | ||
| .master("local[1]") | ||
| .config("spark.driver.bindAddress", "localhost") | ||
| .config("spark.ui.enabled", "false") | ||
| .getOrCreate() | ||
|
|
||
| it should "receive empty dataframe row back" in { | ||
|
|
||
| val expectedNestedFieldSchema = new StructType() | ||
| .add("int", "int") | ||
| .add("long", "long") | ||
| val expectedNestedStructSchema = new StructType() | ||
| .add("name", "string") | ||
| .add("nested", expectedNestedFieldSchema) | ||
|
|
||
| val expectedNestedFieldInternalRow = new SpecificInternalRow(expectedNestedFieldSchema) | ||
| expectedNestedFieldInternalRow.setNullAt(0) | ||
| expectedNestedFieldInternalRow.setNullAt(1) | ||
|
|
||
| val expectedNestedStructInternalRow = new SpecificInternalRow(expectedNestedStructSchema) | ||
| expectedNestedStructInternalRow.setNullAt(0) | ||
| expectedNestedStructInternalRow.setNullAt(1) | ||
|
|
||
| //actual | ||
| val deserializationExceptionHandler = new PermissiveRecordExceptionHandler() | ||
| val schema = AvroSchemaUtils.parse(TestSchemas.NATIVE_SIMPLE_OUTER_SCHEMA) | ||
| val dataType: DataType = SchemaConverters.toSqlType(schema).dataType | ||
|
|
||
| val actualResult = deserializationExceptionHandler | ||
| .handle(new Exception, new AbrisAvroDeserializer(schema, dataType), schema) | ||
|
|
||
| assert(actualResult == expectedNestedStructInternalRow) | ||
| } | ||
| } |