Author: cutting
Date: Mon Sep 24 21:12:40 2012
New Revision: 1389592
URL: http://svn.apache.org/viewvc?rev=1389592&view=rev
Log:
AVRO-1169. Java: Reduce memory footprint of resolver. Contributed by Hernan
Otero.
Modified:
avro/trunk/CHANGES.txt
avro/trunk/lang/java/avro/src/main/java/org/apache/avro/io/parsing/ResolvingGrammarGenerator.java
Modified: avro/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/avro/trunk/CHANGES.txt?rev=1389592&r1=1389591&r2=1389592&view=diff
==============================================================================
--- avro/trunk/CHANGES.txt (original)
+++ avro/trunk/CHANGES.txt Mon Sep 24 21:12:40 2012
@@ -6,6 +6,9 @@ Trunk (not yet released)
IMPROVEMENTS
+ AVRO-1169. Java: Reduce memory footprint of resolver.
+ (Hernan Otero via cutting)
+
BUG FIXES
Avro 1.7.2 (20 October 2012)
Modified:
avro/trunk/lang/java/avro/src/main/java/org/apache/avro/io/parsing/ResolvingGrammarGenerator.java
URL:
http://svn.apache.org/viewvc/avro/trunk/lang/java/avro/src/main/java/org/apache/avro/io/parsing/ResolvingGrammarGenerator.java?rev=1389592&r1=1389591&r2=1389592&view=diff
==============================================================================
---
avro/trunk/lang/java/avro/src/main/java/org/apache/avro/io/parsing/ResolvingGrammarGenerator.java
(original)
+++
avro/trunk/lang/java/avro/src/main/java/org/apache/avro/io/parsing/ResolvingGrammarGenerator.java
Mon Sep 24 21:12:40 2012
@@ -172,8 +172,8 @@ public class ResolvingGrammarGenerator e
throw new RuntimeException("Unexpected schema type: " + readerType);
}
}
- return Symbol.error("Found " + writer.toString(true)
- + ", expecting " + reader.toString(true));
+ return Symbol.error("Found " + writer.getFullName()
+ + ", expecting " + reader.getFullName());
}
private Symbol resolveUnion(Schema writer, Schema reader,
@@ -222,8 +222,8 @@ public class ResolvingGrammarGenerator e
String fname = rf.name();
if (writer.getField(fname) == null) {
if (rf.defaultValue() == null) {
- result = Symbol.error("Found " + writer.toString(true)
- + ", expecting " + reader.toString(true));
+ result = Symbol.error("Found " + writer.getFullName()
+ + ", expecting " + reader.getFullName());
seen.put(wsc, result);
return result;
} else {
