hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tomwh...@apache.org
Subject svn commit: r958144 - in /hadoop/common/branches/branch-0.21: CHANGES.txt ivy/libraries.properties src/test/core/org/apache/hadoop/ipc/AvroTestProtocol.java src/test/core/org/apache/hadoop/ipc/TestAvroRpc.java
Date Fri, 25 Jun 2010 22:39:18 GMT
Author: tomwhite
Date: Fri Jun 25 22:39:18 2010
New Revision: 958144

URL: http://svn.apache.org/viewvc?rev=958144&view=rev
Log:
HADOOP-6782.  TestAvroRpc fails with avro-1.3.1 and avro-1.3.2.  Contributed by Doug Cutting.

Modified:
    hadoop/common/branches/branch-0.21/CHANGES.txt
    hadoop/common/branches/branch-0.21/ivy/libraries.properties
    hadoop/common/branches/branch-0.21/src/test/core/org/apache/hadoop/ipc/AvroTestProtocol.java
    hadoop/common/branches/branch-0.21/src/test/core/org/apache/hadoop/ipc/TestAvroRpc.java

Modified: hadoop/common/branches/branch-0.21/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.21/CHANGES.txt?rev=958144&r1=958143&r2=958144&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.21/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.21/CHANGES.txt Fri Jun 25 22:39:18 2010
@@ -1563,6 +1563,9 @@ Release 0.21.0 - Unreleased
     HADOOP-6826.  Revert FileSystem create method that takes CreateFlags.
     (tomwhite)
 
+    HADOOP-6782.  TestAvroRpc fails with avro-1.3.1 and avro-1.3.2.
+    (Doug Cutting via tomwhite)
+
 Release 0.20.3 - Unreleased
 
   NEW FEATURES

Modified: hadoop/common/branches/branch-0.21/ivy/libraries.properties
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.21/ivy/libraries.properties?rev=958144&r1=958143&r2=958144&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.21/ivy/libraries.properties (original)
+++ hadoop/common/branches/branch-0.21/ivy/libraries.properties Fri Jun 25 22:39:18 2010
@@ -17,7 +17,7 @@
 apacheant.version=1.7.1
 ant-task.version=2.0.10
 
-avro.version=1.3.0
+avro.version=1.3.2
 
 checkstyle.version=4.2
 

Modified: hadoop/common/branches/branch-0.21/src/test/core/org/apache/hadoop/ipc/AvroTestProtocol.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.21/src/test/core/org/apache/hadoop/ipc/AvroTestProtocol.java?rev=958144&r1=958143&r2=958144&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.21/src/test/core/org/apache/hadoop/ipc/AvroTestProtocol.java
(original)
+++ hadoop/common/branches/branch-0.21/src/test/core/org/apache/hadoop/ipc/AvroTestProtocol.java
Fri Jun 25 22:39:18 2010
@@ -19,7 +19,6 @@
 package org.apache.hadoop.ipc;
 
 import org.apache.avro.ipc.AvroRemoteException;
-import org.apache.avro.util.Utf8;
 
 @SuppressWarnings("serial")
 public interface AvroTestProtocol {
@@ -27,7 +26,7 @@ public interface AvroTestProtocol {
     public Problem() {}
   }
   void ping();
-  Utf8 echo(Utf8 value);
+  String echo(String value);
   int add(int v1, int v2);
   int error() throws Problem;
 }

Modified: hadoop/common/branches/branch-0.21/src/test/core/org/apache/hadoop/ipc/TestAvroRpc.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.21/src/test/core/org/apache/hadoop/ipc/TestAvroRpc.java?rev=958144&r1=958143&r2=958144&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.21/src/test/core/org/apache/hadoop/ipc/TestAvroRpc.java
(original)
+++ hadoop/common/branches/branch-0.21/src/test/core/org/apache/hadoop/ipc/TestAvroRpc.java
Fri Jun 25 22:39:18 2010
@@ -30,7 +30,6 @@ import org.apache.hadoop.conf.Configurat
 import org.apache.hadoop.net.NetUtils;
 
 import org.apache.avro.ipc.AvroRemoteException;
-import org.apache.avro.util.Utf8;
 
 /** Unit tests for AvroRpc. */
 public class TestAvroRpc extends TestCase {
@@ -50,7 +49,7 @@ public class TestAvroRpc extends TestCas
 
     public void ping() {}
     
-    public Utf8 echo(Utf8 value) { return value; }
+    public String echo(String value) { return value; }
 
     public int add(int v1, int v2) { return v1 + v2; }
 
@@ -74,8 +73,8 @@ public class TestAvroRpc extends TestCas
       
       proxy.ping();
 
-      Utf8 utf8Result = proxy.echo(new Utf8("hello world"));
-      assertEquals(new Utf8("hello world"), utf8Result);
+      String echo = proxy.echo("hello world");
+      assertEquals("hello world", echo);
 
       int intResult = proxy.add(1, 2);
       assertEquals(3, intResult);



Mime
View raw message