hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cutt...@apache.org
Subject svn commit: r474946 - in /lucene/hadoop/trunk: CHANGES.txt src/java/org/apache/hadoop/record/Utils.java src/test/org/apache/hadoop/record/test/TestRecordIO.java
Date Tue, 14 Nov 2006 20:19:11 GMT
Author: cutting
Date: Tue Nov 14 12:19:10 2006
New Revision: 474946

URL: http://svn.apache.org/viewvc?view=rev&rev=474946
Log:
HADOOP-712.  Fix record io's xml serialization to correctly handle control characters.  Contributed
by Milind.

Modified:
    lucene/hadoop/trunk/CHANGES.txt
    lucene/hadoop/trunk/src/java/org/apache/hadoop/record/Utils.java
    lucene/hadoop/trunk/src/test/org/apache/hadoop/record/test/TestRecordIO.java

Modified: lucene/hadoop/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/CHANGES.txt?view=diff&rev=474946&r1=474945&r2=474946
==============================================================================
--- lucene/hadoop/trunk/CHANGES.txt (original)
+++ lucene/hadoop/trunk/CHANGES.txt Tue Nov 14 12:19:10 2006
@@ -67,6 +67,9 @@
     Each task's log output is now available through the web ui.  (Arun
     C Murthy via cutting)
 
+21. HADOOP-712.  Fix record io's xml serialization to correctly handle
+    control-characters.  (Milind Bhandarkar via cutting)
+
 
 Release 0.8.0 - 2006-11-03
 

Modified: lucene/hadoop/trunk/src/java/org/apache/hadoop/record/Utils.java
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/java/org/apache/hadoop/record/Utils.java?view=diff&rev=474946&r1=474945&r2=474946
==============================================================================
--- lucene/hadoop/trunk/src/java/org/apache/hadoop/record/Utils.java (original)
+++ lucene/hadoop/trunk/src/java/org/apache/hadoop/record/Utils.java Tue Nov 14 12:19:10 2006
@@ -62,7 +62,7 @@
         return true;
     }
     
-    public static final byte[] hexchars = { '0', '1', '2', '3', '4', '5',
+    public static final char[] hexchars = { '0', '1', '2', '3', '4', '5',
                                             '6', '7', '8', '9', 'A', 'B',
                                             'C', 'D', 'E', 'F' };
     /**

Modified: lucene/hadoop/trunk/src/test/org/apache/hadoop/record/test/TestRecordIO.java
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/test/org/apache/hadoop/record/test/TestRecordIO.java?view=diff&rev=474946&r1=474945&r2=474946
==============================================================================
--- lucene/hadoop/trunk/src/test/org/apache/hadoop/record/test/TestRecordIO.java (original)
+++ lucene/hadoop/trunk/src/test/org/apache/hadoop/record/test/TestRecordIO.java Tue Nov 14
12:19:10 2006
@@ -127,12 +127,12 @@
             r1.setDoubleVal(1.5234);
             r1.setIntVal(4567);
             r1.setLongVal(0x5a5a5a5a5a5aL);
-            r1.setStringVal(new Text("random &lt; %text<&more"));
+            r1.setStringVal(new Text("ran\002dom &lt; %text<&more"));
             r1.setBufferVal(new ByteArrayOutputStream(20));
             r1.setVectorVal(new ArrayList());
             r1.setMapVal(new TreeMap());
             RecRecord0 r0 = new RecRecord0();
-            r0.setStringVal(new Text("other %random &amp; >&more text"));
+            r0.setStringVal(new Text("other %rando\007m &amp; >&more text"));
             r1.setRecordVal(r0);
             out.write(r1);
             ostream.close();



Mime
View raw message