This is an automated email from the ASF dual-hosted git repository.
fokko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/parquet-mr.git
The following commit(s) were added to refs/heads/master by this push:
new 4bf67a4 PARQUET-1890: Upgrade to Apache Avro 1.10.0 (#806)
4bf67a4 is described below
commit 4bf67a4ee7199a317a36b3ad1207408c5f8a12f4
Author: Gabor Szadovszky <[email protected]>
AuthorDate: Thu Jul 30 09:06:18 2020 +0200
PARQUET-1890: Upgrade to Apache Avro 1.10.0 (#806)
---
.../org/apache/parquet/avro/TestReadWrite.java | 6 +++--
.../apache/parquet/avro/TestStringBehavior.java | 26 +++++++++++-----------
pom.xml | 2 +-
3 files changed, 18 insertions(+), 16 deletions(-)
diff --git
a/parquet-avro/src/test/java/org/apache/parquet/avro/TestReadWrite.java
b/parquet-avro/src/test/java/org/apache/parquet/avro/TestReadWrite.java
index d4048ff..66f166c 100644
--- a/parquet-avro/src/test/java/org/apache/parquet/avro/TestReadWrite.java
+++ b/parquet-avro/src/test/java/org/apache/parquet/avro/TestReadWrite.java
@@ -255,7 +255,8 @@ public class TestReadWrite {
Random random = new Random(34L);
GenericRecordBuilder builder = new GenericRecordBuilder(decimalSchema);
for (int i = 0; i < 1000; i += 1) {
- BigDecimal dec = new BigDecimal(new BigInteger(31, random), 2);
+ // Generating Integers between -(2^29) and (2^29 - 1) to ensure the
number of digits <= 9
+ BigDecimal dec = new BigDecimal(new BigInteger(30,
random).subtract(BigInteger.valueOf(1L << 28)), 2);
builder.set("dec", dec);
GenericRecord rec = builder.build();
@@ -307,7 +308,8 @@ public class TestReadWrite {
Random random = new Random(34L);
GenericRecordBuilder builder = new GenericRecordBuilder(decimalSchema);
for (int i = 0; i < 1000; i += 1) {
- BigDecimal dec = new BigDecimal(new BigInteger(31, random), 2);
+ // Generating Integers between -(2^29) and (2^29 - 1) to ensure the
number of digits <= 9
+ BigDecimal dec = new BigDecimal(new BigInteger(30,
random).subtract(BigInteger.valueOf(1L << 28)), 2);
builder.set("dec", dec);
GenericRecord rec = builder.build();
diff --git
a/parquet-avro/src/test/java/org/apache/parquet/avro/TestStringBehavior.java
b/parquet-avro/src/test/java/org/apache/parquet/avro/TestStringBehavior.java
index 16c465f..4727335 100644
--- a/parquet-avro/src/test/java/org/apache/parquet/avro/TestStringBehavior.java
+++ b/parquet-avro/src/test/java/org/apache/parquet/avro/TestStringBehavior.java
@@ -176,36 +176,36 @@ public class TestStringBehavior {
}
Assert.assertEquals("Avro default string class should be String",
- Utf8.class, avroRecord.default_class.getClass());
+ Utf8.class, avroRecord.getDefaultClass().getClass());
Assert.assertEquals("Parquet default string class should be String",
- Utf8.class, parquetRecord.default_class.getClass());
+ Utf8.class, parquetRecord.getDefaultClass().getClass());
Assert.assertEquals("Avro avro.java.string=String class should be String",
- String.class, avroRecord.string_class.getClass());
+ String.class, avroRecord.getStringClass().getClass());
Assert.assertEquals("Parquet avro.java.string=String class should be
String",
- String.class, parquetRecord.string_class.getClass());
+ String.class, parquetRecord.getStringClass().getClass());
Assert.assertEquals("Avro stringable class should be BigDecimal",
- BigDecimal.class, avroRecord.stringable_class.getClass());
+ BigDecimal.class, avroRecord.getStringableClass().getClass());
Assert.assertEquals("Parquet stringable class should be BigDecimal",
- BigDecimal.class, parquetRecord.stringable_class.getClass());
+ BigDecimal.class, parquetRecord.getStringableClass().getClass());
Assert.assertEquals("Should have the correct BigDecimal value",
- BIG_DECIMAL, parquetRecord.stringable_class);
+ BIG_DECIMAL, parquetRecord.getStringableClass());
Assert.assertEquals("Avro map default string class should be String",
- Utf8.class, keyClass(avroRecord.default_map));
+ Utf8.class, keyClass(avroRecord.getDefaultMap()));
Assert.assertEquals("Parquet map default string class should be String",
- Utf8.class, keyClass(parquetRecord.default_map));
+ Utf8.class, keyClass(parquetRecord.getDefaultMap()));
Assert.assertEquals("Avro map avro.java.string=String class should be
String",
- String.class, keyClass(avroRecord.string_map));
+ String.class, keyClass(avroRecord.getStringMap()));
Assert.assertEquals("Parquet map avro.java.string=String class should be
String",
- String.class, keyClass(parquetRecord.string_map));
+ String.class, keyClass(parquetRecord.getStringMap()));
Assert.assertEquals("Avro map stringable class should be BigDecimal",
- BigDecimal.class, keyClass(avroRecord.stringable_map));
+ BigDecimal.class, keyClass(avroRecord.getStringableMap()));
Assert.assertEquals("Parquet map stringable class should be BigDecimal",
- BigDecimal.class, keyClass(parquetRecord.stringable_map));
+ BigDecimal.class, keyClass(parquetRecord.getStringableMap()));
}
@Test
diff --git a/pom.xml b/pom.xml
index 500ce75..52e1fdb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -99,7 +99,7 @@
<fastutil.version>8.2.3</fastutil.version>
<semver.api.version>0.9.33</semver.api.version>
<slf4j.version>1.7.22</slf4j.version>
- <avro.version>1.9.2</avro.version>
+ <avro.version>1.10.0</avro.version>
<guava.version>27.0.1-jre</guava.version>
<brotli-codec.version>0.1.1</brotli-codec.version>
<mockito.version>1.10.19</mockito.version>
