You are viewing a plain text version of this content. The canonical link for it is here.
Posted to mapreduce-commits@hadoop.apache.org by to...@apache.org on 2010/03/11 23:38:21 UTC
svn commit: r922047 - in /hadoop/mapreduce/trunk: ./ .eclipse.templates/
ivy/ src/java/org/apache/hadoop/mapreduce/jobhistory/
Author: tomwhite
Date: Thu Mar 11 22:38:21 2010
New Revision: 922047
URL: http://svn.apache.org/viewvc?rev=922047&view=rev
Log:
MAPREDUCE-1556. upgrade to Avro 1.3.0. Contributed by cutting.
Modified:
hadoop/mapreduce/trunk/.eclipse.templates/.classpath
hadoop/mapreduce/trunk/CHANGES.txt
hadoop/mapreduce/trunk/ivy/hadoop-mapred-template.xml
hadoop/mapreduce/trunk/ivy/ivysettings.xml
hadoop/mapreduce/trunk/ivy/libraries.properties
hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapreduce/jobhistory/EventReader.java
hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapreduce/jobhistory/EventWriter.java
Modified: hadoop/mapreduce/trunk/.eclipse.templates/.classpath
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/.eclipse.templates/.classpath?rev=922047&r1=922046&r2=922047&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/.eclipse.templates/.classpath (original)
+++ hadoop/mapreduce/trunk/.eclipse.templates/.classpath Thu Mar 11 22:38:21 2010
@@ -30,7 +30,7 @@
<classpathentry kind="lib" path="build/ivy/lib/Hadoop/common/hadoop-core-test-0.22.0-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="build/ivy/lib/Hadoop/common/hadoop-hdfs-0.22.0-SNAPSHOT.jar"/>
<classpathentry kind="lib" path="build/ivy/lib/Hadoop/test/hadoop-hdfs-test-0.22.0-SNAPSHOT.jar"/>
- <classpathentry kind="lib" path="build/ivy/lib/Hadoop/common/avro-1.2.0.jar"/>
+ <classpathentry kind="lib" path="build/ivy/lib/Hadoop/common/avro-1.3.0.jar"/>
<classpathentry kind="lib" path="build/ivy/lib/Hadoop/common/commons-cli-1.2.jar"/>
<classpathentry kind="lib" path="build/ivy/lib/Hadoop/common/commons-codec-1.4.jar"/>
<classpathentry kind="lib" path="build/ivy/lib/Hadoop/common/commons-el-1.0.jar"/>
Modified: hadoop/mapreduce/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/CHANGES.txt?rev=922047&r1=922046&r2=922047&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/CHANGES.txt (original)
+++ hadoop/mapreduce/trunk/CHANGES.txt Thu Mar 11 22:38:21 2010
@@ -231,6 +231,8 @@ Trunk (unreleased changes)
MAPREDUCE-1501. FileInputFormat supports multi-level, recursive
directory listing. (Zheng Shao via dhruba)
+ MAPREDUCE-1556. upgrade to Avro 1.3.0. (cutting via tomwhite)
+
BUG FIXES
MAPREDUCE-1258. Fix fair scheduler event log not logging job info.
Modified: hadoop/mapreduce/trunk/ivy/hadoop-mapred-template.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/ivy/hadoop-mapred-template.xml?rev=922047&r1=922046&r2=922047&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/ivy/hadoop-mapred-template.xml (original)
+++ hadoop/mapreduce/trunk/ivy/hadoop-mapred-template.xml Thu Mar 11 22:38:21 2010
@@ -30,20 +30,5 @@
<artifactId>hadoop-core</artifactId>
<version>0.22.0-dev-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
- <version>1.0.1</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-core-asl</artifactId>
- <version>1.0.1</version>
- </dependency>
- <dependency>
- <groupId>com.thoughtworks.paranamer</groupId>
- <artifactId>paranamer</artifactId>
- <version>1.5</version>
- </dependency>
</dependencies>
</project>
Modified: hadoop/mapreduce/trunk/ivy/ivysettings.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/ivy/ivysettings.xml?rev=922047&r1=922046&r2=922047&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/ivy/ivysettings.xml (original)
+++ hadoop/mapreduce/trunk/ivy/ivysettings.xml Thu Mar 11 22:38:21 2010
@@ -43,8 +43,8 @@
checkmodified="true" changingPattern=".*SNAPSHOT"/>
<filesystem name="fs" m2compatible="true" force="true">
- <artifact pattern="${repo.dir}/org/apache/hadoop/[module]/[revision]/[module]-[revision].[ext]"/>
- <ivy pattern="${repo.dir}/org/apache/hadoop/[module]/[revision]/[module]-[revision].pom"/>
+ <artifact pattern="${repo.dir}/[organisation]/[module]/[revision]/[module]-[revision].[ext]"/>
+ <ivy pattern="${repo.dir}/[organisation]/[module]/[revision]/[module]-[revision].pom"/>
</filesystem>
<chain name="default" dual="true" checkmodified="true" changingPattern=".*SNAPSHOT">
Modified: hadoop/mapreduce/trunk/ivy/libraries.properties
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/ivy/libraries.properties?rev=922047&r1=922046&r2=922047&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/ivy/libraries.properties (original)
+++ hadoop/mapreduce/trunk/ivy/libraries.properties Thu Mar 11 22:38:21 2010
@@ -20,7 +20,7 @@ ant-task.version=2.0.10
#Aspectj depedency for Fault injection
aspectj.version=1.6.5
-avro.version=1.2.0
+avro.version=1.3.0
checkstyle.version=4.2
@@ -49,8 +49,6 @@ hsqldb.version=1.8.0.10
#ivy.version=2.0.0-beta2
ivy.version=2.0.0-rc2
-jackson.version=1.0.1
-
jasper.version=5.5.12
jsp.version=2.1
jsp-api.version=5.5.12
@@ -71,8 +69,6 @@ mockito-all.version=1.8.0
oro.version=2.0.8
-paranamer.version=1.5
-
rats-lib.version=0.6
servlet.version=4.0.6
Modified: hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapreduce/jobhistory/EventReader.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapreduce/jobhistory/EventReader.java?rev=922047&r1=922046&r2=922047&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapreduce/jobhistory/EventReader.java (original)
+++ hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapreduce/jobhistory/EventReader.java Thu Mar 11 22:38:21 2010
@@ -83,7 +83,7 @@ public class EventReader implements Clos
Event wrapper;
try {
wrapper = (Event)reader.read(null, decoder);
- } catch (AvroRuntimeException e) { // at EOF
+ } catch (EOFException e) { // at EOF
return null;
}
HistoryEvent result;
Modified: hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapreduce/jobhistory/EventWriter.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapreduce/jobhistory/EventWriter.java?rev=922047&r1=922046&r2=922047&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapreduce/jobhistory/EventWriter.java (original)
+++ hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapreduce/jobhistory/EventWriter.java Thu Mar 11 22:38:21 2010
@@ -44,16 +44,17 @@ class EventWriter {
static final String VERSION = "Avro-Json";
private FSDataOutputStream out;
- private DatumWriter<Object> writer = new SpecificDatumWriter(Event.class);
+ private DatumWriter<Event> writer =
+ new SpecificDatumWriter<Event>(Event.class);
private Encoder encoder;
EventWriter(FSDataOutputStream out) throws IOException {
this.out = out;
out.writeBytes(VERSION);
out.writeBytes("\n");
- out.writeBytes(Event._SCHEMA.toString());
+ out.writeBytes(Event.SCHEMA$.toString());
out.writeBytes("\n");
- this.encoder = new JsonEncoder(Event._SCHEMA, out);
+ this.encoder = new JsonEncoder(Event.SCHEMA$, out);
}
synchronized void write(HistoryEvent event) throws IOException {
@@ -75,10 +76,10 @@ class EventWriter {
}
private static final Schema GROUPS =
- Schema.createArray(JhCounterGroup._SCHEMA);
+ Schema.createArray(JhCounterGroup.SCHEMA$);
private static final Schema COUNTERS =
- Schema.createArray(JhCounter._SCHEMA);
+ Schema.createArray(JhCounter.SCHEMA$);
static JhCounters toAvro(Counters counters) {
return toAvro(counters, "COUNTERS");