Upgrade Avro to 1.8.2

apache · Oct 13, 2021 · 568e318 · 568e318
1 parent 5a66a54
commit 568e318
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/build.xml b/build.xml
@@ -902,6 +902,7 @@
     <!-- Run unit tests                                                     -->
     <!-- ================================================================== -->
     <target name="test-core" depends="setWindowsPath,setLinuxPath,compile-test,pigtest-jar,debugger.check,jackson-pig-3039-test-download" description="Run full set of unit tests">
+        <echo>----------------- test.file: ${test.all.file}</echo>
         <macro-test-runner test.file="${test.all.file}" tests.failed="test-core.failed" />
         <fail if="test-core.failed">Tests failed!</fail>
     </target>

diff --git a/ivy.xml b/ivy.xml
@@ -181,12 +181,12 @@
     <dependency org="org.apache.avro" name="trevni-core" rev="${avro.version}"
       conf="compile->default;checkstyle->master">
       <artifact name="trevni-core" ext="jar" />
-      <artifact name="trevni-core" type="test-jar" ext="jar" m:classifier="tests"/>
+<!--      <artifact name="trevni-core" type="test-jar" ext="jar" m:classifier="tests"/>-->
     </dependency>
     <dependency org="org.apache.avro" name="trevni-avro" rev="${avro.version}"
       conf="compile->default;checkstyle->master">
       <artifact name="trevni-avro" ext="jar" />
-      <artifact name="trevni-avro" type="test-jar" ext="jar" m:classifier="tests"/>
+<!--      <artifact name="trevni-avro" type="test-jar" ext="jar" m:classifier="tests"/>-->
       <exclude org="org.apache.hadoop" module="hadoop-core"/>
     </dependency>
     <dependency org="org.apache.avro" name="avro-tools" rev="${avro.version}"

diff --git a/ivy/libraries.properties b/ivy/libraries.properties
@@ -18,7 +18,7 @@ accumulo15.version=1.5.0
 apacheant.version=1.7.1
 apacherat.version=0.8
 automaton.version=1.11-8
-avro.version=1.7.5
+avro.version=1.8.2
 basjes-httpdlog-pigloader.version=5.0
 commons-beanutils.version=1.7.0
 commons-cli.version=1.2

diff --git a/src/org/apache/pig/impl/util/avro/AvroRecordWriter.java b/src/org/apache/pig/impl/util/avro/AvroRecordWriter.java
@@ -20,7 +20,6 @@
 
 import static org.apache.avro.file.DataFileConstants.DEFAULT_SYNC_INTERVAL;
 import static org.apache.avro.file.DataFileConstants.DEFLATE_CODEC;
-import static org.apache.avro.mapred.AvroOutputFormat.DEFAULT_DEFLATE_LEVEL;
 import static org.apache.avro.mapred.AvroOutputFormat.DEFLATE_LEVEL_KEY;
 import static org.apache.avro.mapred.AvroOutputFormat.SYNC_INTERVAL_KEY;
 
@@ -73,7 +72,7 @@ static void configureDataFileWriter(DataFileWriter<GenericData.Record> writer,
       JobConf job) throws UnsupportedEncodingException {
     if (FileOutputFormat.getCompressOutput(job)) {
       int level = job.getInt(DEFLATE_LEVEL_KEY,
-          DEFAULT_DEFLATE_LEVEL);
+          CodecFactory.DEFAULT_DEFLATE_LEVEL);
       String codecName = job.get(AvroJob.OUTPUT_CODEC, DEFLATE_CODEC);
       CodecFactory factory = codecName.equals(DEFLATE_CODEC)
         ? CodecFactory.deflateCodec(level)