HADOOP-7646. Upgrade to Avro 1.5.3. Contributed by Joep Rottinghuis.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.22@1176688 13f79535-47bb-0310-9956-ffa450edef68

common/CHANGES.txt

@@ -544,6 +544,8 @@ Release 0.22.0 - Unreleased
     HADOOP-7457. Remove out-of-date Chinese language documentation.
     (Jakob Homan via eli)
 
+    HADOOP-7646. Upgrade to Avro 1.5.3. (Joep Rottinghuis via shv)
+
 Release 0.21.1 - Unreleased
 
   IMPROVEMENTS

common/build.xml

@@ -498,7 +498,7 @@
   </target>
 
   <target name="generate-avro-records" depends="init, ivy-retrieve-test">
-    <taskdef name="schema" classname="org.apache.avro.specific.SchemaTask">
+    <taskdef name="schema" classname="org.apache.avro.compiler.specific.SchemaTask">
       <classpath refid="test.classpath"/>
     </taskdef>
     <schema destdir="${test.generated.dir}">
@@ -509,7 +509,7 @@
   </target>
 
   <target name="generate-avro-protocols" depends="init, ivy-retrieve-test">
-    <taskdef name="schema" classname="org.apache.avro.specific.ProtocolTask">
+    <taskdef name="schema" classname="org.apache.avro.compiler.specific.ProtocolTask">
       <classpath refid="test.classpath"/>
     </taskdef>
     <schema destdir="${test.generated.dir}">

common/ivy.xml

@@ -261,10 +261,20 @@
       rev="${slf4j-log4j12.version}"
       conf="common->master">
     </dependency>
-    <dependency org="org.apache.hadoop"
+    <dependency org="org.apache.avro"
       name="avro"
       rev="${avro.version}"
       conf="common->default">
+    </dependency>
+    <dependency org="org.apache.avro"
+      name="avro-compiler"
+      rev="${avro.version}"
+      conf="common->default">
+    </dependency>
+     <dependency org="org.apache.avro"
+      name="avro-ipc"
+      rev="${avro.version}"
+      conf="common->default">
       <exclude module="ant"/>
       <exclude module="jetty"/>
       <exclude module="slf4j-simple"/>

common/ivy/hadoop-common-instrumented-template.xml

@@ -119,9 +119,14 @@
       <version>2.0.8</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
+      <groupId>org.apache.avro</groupId>
       <artifactId>avro</artifactId>
-      <version>1.3.2</version>
+      <version>1.5.3</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.avro</groupId>
+      <artifactId>avro-ipc</artifactId>
+      <version>1.5.3</version>
       <exclusions>
         <exclusion>
           <!-- Don't pull in Avro's (later) version of Jetty.-->

common/ivy/hadoop-common-template.xml

@@ -119,9 +119,14 @@
       <version>2.0.8</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.hadoop</groupId>
+      <groupId>org.apache.avro</groupId>
       <artifactId>avro</artifactId>
-      <version>1.3.2</version>
+      <version>1.5.3</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.avro</groupId>
+      <artifactId>avro-ipc</artifactId>
+      <version>1.5.3</version>
       <exclusions>
         <exclusion>
           <!-- Don't pull in Avro's (later) version of Jetty.-->

common/ivy/libraries.properties

@@ -16,7 +16,7 @@
 #These are the versions of our dependencies (in alphabetical order)
 ant-task.version=2.0.10
 
-avro.version=1.3.2
+avro.version=1.5.3
 
 checkstyle.version=4.2
 
@@ -64,6 +64,8 @@ mina-core.version=2.0.0-M5
 
 oro.version=2.0.8
 
+paranamer.version=2.3
+
 rats-lib.version=0.6
 
 servlet.version=4.0.6

common/src/java/org/apache/hadoop/io/serializer/avro/AvroSerialization.java

@@ -28,6 +28,7 @@ import org.apache.avro.io.BinaryEncoder;
 import org.apache.avro.io.DatumReader;
 import org.apache.avro.io.DatumWriter;
 import org.apache.avro.io.DecoderFactory;
+import org.apache.avro.io.EncoderFactory;
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.classification.InterfaceStability;
 import org.apache.hadoop.conf.Configured;
@@ -93,7 +94,7 @@ public abstract class AvroSerialization<T> extends Configured
     @Override
     public void open(OutputStream out) throws IOException {
       outStream = out;
-      encoder = new BinaryEncoder(out);
+      encoder = EncoderFactory.get().binaryEncoder(out, null);
     }
 
     @Override

common/src/java/org/apache/hadoop/ipc/AvroRpcEngine.java

@@ -34,9 +34,9 @@ import javax.net.SocketFactory;
 
 import org.apache.avro.ipc.Responder;
 import org.apache.avro.ipc.Transceiver;
-import org.apache.avro.reflect.ReflectRequestor;
-import org.apache.avro.reflect.ReflectResponder;
-import org.apache.avro.specific.SpecificRequestor;
+import org.apache.avro.ipc.reflect.ReflectRequestor;
+import org.apache.avro.ipc.reflect.ReflectResponder;
+import org.apache.avro.ipc.specific.SpecificRequestor;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.classification.InterfaceStability;

common/src/java/org/apache/hadoop/ipc/AvroSpecificRpcEngine.java

@@ -22,8 +22,8 @@ import java.io.IOException;
 
 import org.apache.avro.ipc.Responder;
 import org.apache.avro.ipc.Transceiver;
-import org.apache.avro.specific.SpecificRequestor;
-import org.apache.avro.specific.SpecificResponder;
+import org.apache.avro.ipc.specific.SpecificRequestor;
+import org.apache.avro.ipc.specific.SpecificResponder;
 import org.apache.hadoop.classification.InterfaceStability;
 
 /**

common/src/test/core/org/apache/hadoop/io/AvroTestUtil.java

@@ -18,18 +18,19 @@
 
 package org.apache.hadoop.io;
 
-import java.io.IOException;
+import static junit.framework.Assert.assertEquals;
+
 import java.io.ByteArrayOutputStream;
 import java.lang.reflect.Type;
 
 import org.apache.avro.Schema;
-import org.apache.avro.reflect.ReflectData;
-import org.apache.avro.reflect.ReflectDatumWriter;
-import org.apache.avro.reflect.ReflectDatumReader;
+import org.apache.avro.Schema.Parser;
 import org.apache.avro.io.BinaryEncoder;
 import org.apache.avro.io.DecoderFactory;
-
-import static junit.framework.TestCase.assertEquals;
+import org.apache.avro.io.EncoderFactory;
+import org.apache.avro.reflect.ReflectData;
+import org.apache.avro.reflect.ReflectDatumReader;
+import org.apache.avro.reflect.ReflectDatumWriter;
 
 public class AvroTestUtil {
 
@@ -42,15 +43,17 @@ public class AvroTestUtil {
 
     // check that schema matches expected
     Schema s = ReflectData.get().getSchema(type);
-    assertEquals(Schema.parse(schema), s);
+    assertEquals(new Parser().parse(schema), s);
 
     // check that value is serialized correctly
     ReflectDatumWriter<Object> writer = new ReflectDatumWriter<Object>(s);
     ByteArrayOutputStream out = new ByteArrayOutputStream();
-    writer.write(value, new BinaryEncoder(out));
+    BinaryEncoder encoder = EncoderFactory.get().binaryEncoder(out, null);
+    writer.write(value, encoder);
+    encoder.flush();
     ReflectDatumReader<Object> reader = new ReflectDatumReader<Object>(s);
     Object after =
-      reader.read(null, DecoderFactory.defaultFactory().createBinaryDecoder(
+      reader.read(null, DecoderFactory.get().binaryDecoder(
           out.toByteArray(), null));
     assertEquals(value, after);
   }

common/src/test/core/org/apache/hadoop/ipc/AvroTestProtocol.java

@@ -18,7 +18,7 @@
 
 package org.apache.hadoop.ipc;
 
-import org.apache.avro.ipc.AvroRemoteException;
+import org.apache.avro.AvroRemoteException;
 
 @SuppressWarnings("serial")
 public interface AvroTestProtocol {

common/src/test/core/org/apache/hadoop/ipc/TestAvroRpc.java

@@ -22,7 +22,7 @@ import java.net.InetSocketAddress;
 
 import junit.framework.TestCase;
 
-import org.apache.avro.ipc.AvroRemoteException;
+import org.apache.avro.AvroRemoteException;
 import org.apache.avro.util.Utf8;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -109,7 +109,7 @@ public class TestAvroRpc extends TestCase {
         (AvroSpecificTestProtocol)RPC.getProxy(AvroSpecificTestProtocol.class, 
             0, addr, conf);
       
-      Utf8 echo = proxy.echo(new Utf8("hello world"));
+      CharSequence echo = proxy.echo("hello world");
       assertEquals("hello world", echo.toString());
 
       int intResult = proxy.add(1, 2);
@@ -129,7 +129,7 @@ public class TestAvroRpc extends TestCase {
     }
 
     @Override
-    public Utf8 echo(Utf8 msg) throws AvroRemoteException {
+    public CharSequence echo(CharSequence msg) throws AvroRemoteException {
       return msg;
     }