From a6503b22169d0f684b2860cf7f497cb906a7ad3f Mon Sep 17 00:00:00 2001 From: panbingkun Date: Wed, 25 Oct 2023 08:43:51 +0900 Subject: [PATCH] [SPARK-45640][SQL][TESTS] Fix flaky ProtobufCatalystDataConversionSuite ### What changes were proposed in this pull request? The pr aims to fix flaky ProtobufCatalystDataConversionSuite. As can be seen from the GA test below https://github.com/panbingkun/spark/actions/runs/6612141762/job/17982780917 image When `data.get(0)` is null, `data.get(0).asInstanceOf[Array[Byte]].isEmpty` will be thrown `java.lang.NullPointerException`. image ### Why are the changes needed? Fix flaky ProtobufCatalystDataConversionSuite. ### Does this PR introduce _any_ user-facing change? No. ### How was this patch tested? Pass GA. Manually test: ``` ./build/sbt "protobuf/testOnly org.apache.spark.sql.protobuf.ProtobufCatalystDataConversionSuite" ``` image ### Was this patch authored or co-authored using generative AI tooling? No. Closes #43493 from panbingkun/SPARK-45640. Authored-by: panbingkun Signed-off-by: Hyukjin Kwon --- .../spark/sql/protobuf/ProtobufCatalystDataConversionSuite.scala | 1 + 1 file changed, 1 insertion(+) diff --git a/connector/protobuf/src/test/scala/org/apache/spark/sql/protobuf/ProtobufCatalystDataConversionSuite.scala b/connector/protobuf/src/test/scala/org/apache/spark/sql/protobuf/ProtobufCatalystDataConversionSuite.scala index 6135cb2d59246..b7f17fece5fa6 100644 --- a/connector/protobuf/src/test/scala/org/apache/spark/sql/protobuf/ProtobufCatalystDataConversionSuite.scala +++ b/connector/protobuf/src/test/scala/org/apache/spark/sql/protobuf/ProtobufCatalystDataConversionSuite.scala @@ -138,6 +138,7 @@ class ProtobufCatalystDataConversionSuite data != null && (data.get(0) == defaultValue || (dt.fields(0).dataType == BinaryType && + data.get(0) != null && data.get(0).asInstanceOf[Array[Byte]].isEmpty))) data = generator().asInstanceOf[Row]