Skip to content

[HUDI-4885] Adding org.apache.avro to hudi-hive-sync bundle #6729

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xushiyan merged 3 commits into from
Sep 29, 2022
Merged

[HUDI-4885] Adding org.apache.avro to hudi-hive-sync bundle #6729

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ebd75f5
Adding org.apache.avro to hudi-hive-sync bundle
nsivabalan Sep 20, 2022
f7a2168
fixing avro version for spark3.3
nsivabalan Sep 28, 2022
95d5bc1
fixing test assertion for spark3.3
nsivabalan Sep 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion hudi-spark-datasource/hudi-spark/src/test/scala/org/apache/hudi/TestHoodieSparkUtils.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,11 @@ class TestHoodieSparkUtils {
fail("createRdd should fail, because records don't have a column which is not nullable in the passed in schema")
} catch {
case e: Exception =>
assertTrue(e.getMessage.contains("null of string in field new_nested_col of test_namespace.test_struct_name.nullableInnerStruct of union"))
if (HoodieSparkUtils.gteqSpark3_3) {
assertTrue(e.getMessage.contains("null value for (non-nullable) string at test_struct_name.nullableInnerStruct[nullableInnerStruct].new_nested_col"))
} else {
assertTrue(e.getMessage.contains("null of string in field new_nested_col of test_namespace.test_struct_name.nullableInnerStruct of union"))
}
}
spark.stop()
}
Expand Down
9 changes: 9 additions & 0 deletions packaging/hudi-hive-sync-bundle/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@
<include>org.apache.hudi:hudi-hive-sync</include>

<include>com.beust:jcommander</include>
<include>org.apache.avro:avro</include>
<include>org.apache.hbase:hbase-common</include>
<include>org.apache.hbase:hbase-client</include>
<include>org.apache.hbase:hbase-hadoop-compat</include>
Expand Down Expand Up @@ -256,5 +257,13 @@
<scope>compile</scope>
</dependency>

<!-- Avro -->
<dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
<version>${avro.version}</version>
<scope>compile</scope>
</dependency>

</dependencies>
</project>
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2015,7 +2015,7 @@
<scalatest.version>${scalatest.spark3.version}</scalatest.version>
<kafka.version>${kafka.spark3.version}</kafka.version>
<parquet.version>1.12.2</parquet.version>
<avro.version>1.11.0</avro.version>
<avro.version>1.11.1</avro.version>
<orc.version>1.7.4</orc.version>
<antlr.version>4.8</antlr.version>
<fasterxml.spark3.version>2.13.3</fasterxml.spark3.version>
Expand Down Expand Up @@ -2124,7 +2124,7 @@
<scalatest.version>${scalatest.spark3.version}</scalatest.version>
<kafka.version>${kafka.spark3.version}</kafka.version>
<parquet.version>1.12.2</parquet.version>
<avro.version>1.11.0</avro.version>
<avro.version>1.11.1</avro.version>
<orc.version>1.7.4</orc.version>
<antlr.version>4.8</antlr.version>
<fasterxml.spark3.version>2.13.3</fasterxml.spark3.version>
Expand Down