You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by tg...@apache.org on 2012/05/15 21:10:00 UTC
svn commit: r1338835 - in /hadoop/common/trunk: hadoop-project/
hadoop-tools/ hadoop-tools/hadoop-datajoin/
hadoop-tools/hadoop-datajoin/src/ hadoop-tools/hadoop-datajoin/src/main/
hadoop-tools/hadoop-datajoin/src/main/java/ hadoop-tools/hadoop-datajoi...
Author: tgraves
Date: Tue May 15 19:09:59 2012
New Revision: 1338835
URL: http://svn.apache.org/viewvc?rev=1338835&view=rev
Log:
MAPREDUCE-4238. mavenize data_join. (tgraves)
Added:
hadoop/common/trunk/hadoop-tools/hadoop-datajoin/
hadoop/common/trunk/hadoop-tools/hadoop-datajoin/pom.xml
hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/
hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/main/
hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/main/java/
hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/main/java/org/
- copied from r1338828, hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/data_join/src/java/org/
hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/test/
hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/test/java/
hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/test/java/README.txt
- copied unchanged from r1338828, hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/data_join/src/examples/org/apache/hadoop/contrib/utils/join/README.txt
hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/test/java/SampleDataJoinMapper.java
- copied unchanged from r1338828, hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/data_join/src/examples/org/apache/hadoop/contrib/utils/join/SampleDataJoinMapper.java
hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/test/java/SampleDataJoinReducer.java
- copied unchanged from r1338828, hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/data_join/src/examples/org/apache/hadoop/contrib/utils/join/SampleDataJoinReducer.java
hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/test/java/SampleTaggedMapOutput.java
- copied unchanged from r1338828, hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/data_join/src/examples/org/apache/hadoop/contrib/utils/join/SampleTaggedMapOutput.java
hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/test/java/org/
- copied from r1338828, hadoop/common/trunk/hadoop-mapreduce-project/src/contrib/data_join/src/test/org/
Modified:
hadoop/common/trunk/hadoop-project/pom.xml
hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/JobBase.java
hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/contrib/utils/join/TestDataJoin.java
hadoop/common/trunk/hadoop-tools/hadoop-tools-dist/pom.xml
hadoop/common/trunk/hadoop-tools/pom.xml
Modified: hadoop/common/trunk/hadoop-project/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-project/pom.xml?rev=1338835&r1=1338834&r2=1338835&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-project/pom.xml (original)
+++ hadoop/common/trunk/hadoop-project/pom.xml Tue May 15 19:09:59 2012
@@ -230,6 +230,11 @@
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-datajoin</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-rumen</artifactId>
<version>${project.version}</version>
</dependency>
Added: hadoop/common/trunk/hadoop-tools/hadoop-datajoin/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-tools/hadoop-datajoin/pom.xml?rev=1338835&view=auto
==============================================================================
--- hadoop/common/trunk/hadoop-tools/hadoop-datajoin/pom.xml (added)
+++ hadoop/common/trunk/hadoop-tools/hadoop-datajoin/pom.xml Tue May 15 19:09:59 2012
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License. See accompanying LICENSE file.
+-->
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-project</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ <relativePath>../../hadoop-project</relativePath>
+ </parent>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-datajoin</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ <description>Apache Hadoop Data Join</description>
+ <name>Apache Hadoop Data Join</name>
+ <packaging>jar</packaging>
+
+ <properties>
+ <hadoop.log.dir>${project.build.directory}/log</hadoop.log.dir>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-mapreduce-client-hs</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-mapreduce-client-core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-mapreduce-client-jobclient</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-mapreduce-client-jobclient</artifactId>
+ <scope>test</scope>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-common</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-hdfs</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-common</artifactId>
+ <scope>test</scope>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-hdfs</artifactId>
+ <scope>test</scope>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-yarn-server-tests</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>create-log-dir</id>
+ <phase>process-test-resources</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target>
+ <delete dir="${test.build.data}"/>
+ <mkdir dir="${test.build.data}"/>
+ <mkdir dir="${hadoop.log.dir}"/>
+ </target>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+</project>
+
Modified: hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/JobBase.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/JobBase.java?rev=1338835&r1=1338828&r2=1338835&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/JobBase.java (original)
+++ hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/main/java/org/apache/hadoop/contrib/utils/join/JobBase.java Tue May 15 19:09:59 2012
@@ -51,7 +51,7 @@ public abstract class JobBase implements
* the value for the counter
*/
protected void setLongValue(Object name, long value) {
- this.longCounters.put(name, new Long(value));
+ this.longCounters.put(name, Long.valueOf(value));
}
/**
@@ -100,9 +100,9 @@ public abstract class JobBase implements
Long val = this.longCounters.get(name);
Long retv = null;
if (val == null) {
- retv = new Long(inc);
+ retv = Long.valueOf(inc);
} else {
- retv = new Long(val.longValue() + inc);
+ retv = Long.valueOf(val.longValue() + inc);
}
this.longCounters.put(name, retv);
return retv;
Modified: hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/contrib/utils/join/TestDataJoin.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/contrib/utils/join/TestDataJoin.java?rev=1338835&r1=1338828&r2=1338835&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/contrib/utils/join/TestDataJoin.java (original)
+++ hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/contrib/utils/join/TestDataJoin.java Tue May 15 19:09:59 2012
@@ -57,6 +57,7 @@ public class TestDataJoin extends TestCa
public void testDataJoin() throws Exception {
final int srcs = 4;
JobConf job = new JobConf();
+ job.setBoolean("mapreduce.fileoutputcommitter.marksuccessfuljobs", false);
Path base = cluster.getFileSystem().makeQualified(new Path("/inner"));
Path[] src = writeSimpleSrc(base, job, srcs);
job.setInputFormat(SequenceFileInputFormat.class);
Modified: hadoop/common/trunk/hadoop-tools/hadoop-tools-dist/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-tools/hadoop-tools-dist/pom.xml?rev=1338835&r1=1338834&r2=1338835&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-tools/hadoop-tools-dist/pom.xml (original)
+++ hadoop/common/trunk/hadoop-tools/hadoop-tools-dist/pom.xml Tue May 15 19:09:59 2012
@@ -54,6 +54,11 @@
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-datajoin</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-extras</artifactId>
<scope>compile</scope>
</dependency>
Modified: hadoop/common/trunk/hadoop-tools/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-tools/pom.xml?rev=1338835&r1=1338834&r2=1338835&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-tools/pom.xml (original)
+++ hadoop/common/trunk/hadoop-tools/pom.xml Tue May 15 19:09:59 2012
@@ -32,6 +32,7 @@
<module>hadoop-distcp</module>
<module>hadoop-archives</module>
<module>hadoop-rumen</module>
+ <module>hadoop-datajoin</module>
<module>hadoop-tools-dist</module>
<module>hadoop-extras</module>
</modules>