Author: szetszwo
Date: Thu Jun 28 06:59:38 2012
New Revision: 1354832
URL: http://svn.apache.org/viewvc?rev=1354832&view=rev
Log:
Merge r1346682 through r1354801 from trunk.
Added:
hadoop/common/branches/HDFS-3092/hadoop-assemblies/src/main/resources/assemblies/hadoop-raid-dist.xml
- copied unchanged from r1354801,
hadoop/common/trunk/hadoop-assemblies/src/main/resources/assemblies/hadoop-raid-dist.xml
hadoop/common/branches/HDFS-3092/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml
- copied unchanged from r1354801,
hadoop/common/trunk/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml
hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/contrib/utils/join/README.txt
- copied unchanged from r1354801,
hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/contrib/utils/join/README.txt
hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/contrib/utils/join/SampleDataJoinMapper.java
- copied unchanged from r1354801,
hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/contrib/utils/join/SampleDataJoinMapper.java
hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/contrib/utils/join/SampleDataJoinReducer.java
- copied unchanged from r1354801,
hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/contrib/utils/join/SampleDataJoinReducer.java
hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/contrib/utils/join/SampleTaggedMapOutput.java
- copied unchanged from r1354801,
hadoop/common/trunk/hadoop-tools/hadoop-datajoin/src/test/java/org/apache/hadoop/contrib/utils/join/SampleTaggedMapOutput.java
hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-pipes/ (props
changed)
- copied from r1354801, hadoop/common/trunk/hadoop-tools/hadoop-pipes/
hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-pipes/pom.xml
- copied unchanged from r1354801,
hadoop/common/trunk/hadoop-tools/hadoop-pipes/pom.xml
hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-pipes/src/
- copied from r1354801, hadoop/common/trunk/hadoop-tools/hadoop-pipes/src/
hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-pipes/src/CMakeLists.txt
- copied unchanged from r1354801,
hadoop/common/trunk/hadoop-tools/hadoop-pipes/src/CMakeLists.txt
hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-pipes/src/main/
- copied from r1354801,
hadoop/common/trunk/hadoop-tools/hadoop-pipes/src/main/
hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-pipes/src/main/native/
- copied from r1354801,
hadoop/common/trunk/hadoop-tools/hadoop-pipes/src/main/native/
hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-pipes/src/main/native/examples/
- copied from r1354801,
hadoop/common/trunk/hadoop-tools/hadoop-pipes/src/main/native/examples/
hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-pipes/src/main/native/examples/README.txt
- copied unchanged from r1354801,
hadoop/common/trunk/hadoop-tools/hadoop-pipes/src/main/native/examples/README.txt
hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-pipes/src/main/native/examples/conf/
- copied from r1354801,
hadoop/common/trunk/hadoop-tools/hadoop-pipes/src/main/native/examples/conf/
hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-pipes/src/main/native/examples/conf/word-part.xml
- copied unchanged from r1354801,
hadoop/common/trunk/hadoop-tools/hadoop-pipes/src/main/native/examples/conf/word-part.xml
hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-pipes/src/main/native/examples/conf/word.xml
- copied unchanged from r1354801,
hadoop/common/trunk/hadoop-tools/hadoop-pipes/src/main/native/examples/conf/word.xml
hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-pipes/src/main/native/examples/impl/
- copied from r1354801,
hadoop/common/trunk/hadoop-tools/hadoop-pipes/src/main/native/examples/impl/
hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-pipes/src/main/native/examples/impl/sort.cc
- copied unchanged from r1354801,
hadoop/common/trunk/hadoop-tools/hadoop-pipes/src/main/native/examples/impl/sort.cc
hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-pipes/src/main/native/examples/impl/wordcount-nopipe.cc
- copied unchanged from r1354801,
hadoop/common/trunk/hadoop-tools/hadoop-pipes/src/main/native/examples/impl/wordcount-nopipe.cc
hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-pipes/src/main/native/examples/impl/wordcount-part.cc
- copied unchanged from r1354801,
hadoop/common/trunk/hadoop-tools/hadoop-pipes/src/main/native/examples/impl/wordcount-part.cc
hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-pipes/src/main/native/examples/impl/wordcount-simple.cc
- copied unchanged from r1354801,
hadoop/common/trunk/hadoop-tools/hadoop-pipes/src/main/native/examples/impl/wordcount-simple.cc
hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-pipes/src/main/native/pipes/
- copied from r1354801,
hadoop/common/trunk/hadoop-tools/hadoop-pipes/src/main/native/pipes/
hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-pipes/src/main/native/pipes/api/
- copied from r1354801,
hadoop/common/trunk/hadoop-tools/hadoop-pipes/src/main/native/pipes/api/
hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-pipes/src/main/native/pipes/api/hadoop/
- copied from r1354801,
hadoop/common/trunk/hadoop-tools/hadoop-pipes/src/main/native/pipes/api/hadoop/
hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-pipes/src/main/native/pipes/api/hadoop/Pipes.hh
- copied unchanged from r1354801,
hadoop/common/trunk/hadoop-tools/hadoop-pipes/src/main/native/pipes/api/hadoop/Pipes.hh
hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-pipes/src/main/native/pipes/api/hadoop/TemplateFactory.hh
- copied unchanged from r1354801,
hadoop/common/trunk/hadoop-tools/hadoop-pipes/src/main/native/pipes/api/hadoop/TemplateFactory.hh
hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-pipes/src/main/native/pipes/debug/
- copied from r1354801,
hadoop/common/trunk/hadoop-tools/hadoop-pipes/src/main/native/pipes/debug/
hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-pipes/src/main/native/pipes/debug/pipes-default-gdb-commands.txt
- copied unchanged from r1354801,
hadoop/common/trunk/hadoop-tools/hadoop-pipes/src/main/native/pipes/debug/pipes-default-gdb-commands.txt
hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-pipes/src/main/native/pipes/debug/pipes-default-script
- copied unchanged from r1354801,
hadoop/common/trunk/hadoop-tools/hadoop-pipes/src/main/native/pipes/debug/pipes-default-script
hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-pipes/src/main/native/pipes/impl/
- copied from r1354801,
hadoop/common/trunk/hadoop-tools/hadoop-pipes/src/main/native/pipes/impl/
hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-pipes/src/main/native/pipes/impl/HadoopPipes.cc
- copied unchanged from r1354801,
hadoop/common/trunk/hadoop-tools/hadoop-pipes/src/main/native/pipes/impl/HadoopPipes.cc
hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-pipes/src/main/native/utils/
- copied from r1354801,
hadoop/common/trunk/hadoop-tools/hadoop-pipes/src/main/native/utils/
hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-pipes/src/main/native/utils/api/
- copied from r1354801,
hadoop/common/trunk/hadoop-tools/hadoop-pipes/src/main/native/utils/api/
hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-pipes/src/main/native/utils/api/hadoop/
- copied from r1354801,
hadoop/common/trunk/hadoop-tools/hadoop-pipes/src/main/native/utils/api/hadoop/
hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-pipes/src/main/native/utils/api/hadoop/SerialUtils.hh
- copied unchanged from r1354801,
hadoop/common/trunk/hadoop-tools/hadoop-pipes/src/main/native/utils/api/hadoop/SerialUtils.hh
hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-pipes/src/main/native/utils/api/hadoop/StringUtils.hh
- copied unchanged from r1354801,
hadoop/common/trunk/hadoop-tools/hadoop-pipes/src/main/native/utils/api/hadoop/StringUtils.hh
hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-pipes/src/main/native/utils/impl/
- copied from r1354801,
hadoop/common/trunk/hadoop-tools/hadoop-pipes/src/main/native/utils/impl/
hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-pipes/src/main/native/utils/impl/SerialUtils.cc
- copied unchanged from r1354801,
hadoop/common/trunk/hadoop-tools/hadoop-pipes/src/main/native/utils/impl/SerialUtils.cc
hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-pipes/src/main/native/utils/impl/StringUtils.cc
- copied unchanged from r1354801,
hadoop/common/trunk/hadoop-tools/hadoop-pipes/src/main/native/utils/impl/StringUtils.cc
hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-pipes/src/main/native/utils/m4/
- copied from r1354801,
hadoop/common/trunk/hadoop-tools/hadoop-pipes/src/main/native/utils/m4/
Removed:
hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-datajoin/src/test/java/README.txt
hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-datajoin/src/test/java/SampleDataJoinMapper.java
hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-datajoin/src/test/java/SampleDataJoinReducer.java
hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-datajoin/src/test/java/SampleTaggedMapOutput.java
Modified:
hadoop/common/branches/HDFS-3092/ (props changed)
hadoop/common/branches/HDFS-3092/dev-support/test-patch.sh
hadoop/common/branches/HDFS-3092/hadoop-dist/pom.xml
hadoop/common/branches/HDFS-3092/hadoop-project/pom.xml
hadoop/common/branches/HDFS-3092/hadoop-project/src/site/apt/index.apt.vm
hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-datajoin/ (props
changed)
hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-gridmix/ (props
changed)
hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-gridmix/pom.xml
hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ParsedTask.java
hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-tools-dist/pom.xml
hadoop/common/branches/HDFS-3092/hadoop-tools/pom.xml
Propchange: hadoop/common/branches/HDFS-3092/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk:r1346682-1354801
Modified: hadoop/common/branches/HDFS-3092/dev-support/test-patch.sh
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3092/dev-support/test-patch.sh?rev=1354832&r1=1354831&r2=1354832&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-3092/dev-support/test-patch.sh (original)
+++ hadoop/common/branches/HDFS-3092/dev-support/test-patch.sh Thu Jun 28
06:59:38 2012
@@ -418,8 +418,8 @@ checkJavacWarnings () {
echo "======================================================================"
echo ""
echo ""
- echo "$MVN clean test -DskipTests -D${PROJECT_NAME}PatchProcess -Ptest-patch
> $PATCH_DIR/patchJavacWarnings.txt 2>&1"
- $MVN clean test -DskipTests -D${PROJECT_NAME}PatchProcess -Ptest-patch >
$PATCH_DIR/patchJavacWarnings.txt 2>&1
+ echo "$MVN clean test -DskipTests -D${PROJECT_NAME}PatchProcess -Pnative
-Ptest-patch > $PATCH_DIR/patchJavacWarnings.txt 2>&1"
+ $MVN clean test -DskipTests -D${PROJECT_NAME}PatchProcess -Pnative
-Ptest-patch > $PATCH_DIR/patchJavacWarnings.txt 2>&1
if [[ $? != 0 ]] ; then
JIRA_COMMENT="$JIRA_COMMENT
Modified: hadoop/common/branches/HDFS-3092/hadoop-dist/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3092/hadoop-dist/pom.xml?rev=1354832&r1=1354831&r2=1354832&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-3092/hadoop-dist/pom.xml (original)
+++ hadoop/common/branches/HDFS-3092/hadoop-dist/pom.xml Thu Jun 28 06:59:38
2012
@@ -52,6 +52,11 @@
<artifactId>hadoop-yarn-api</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-hdfs-raid</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
@@ -120,6 +125,7 @@
run cp -r
$ROOT/hadoop-common-project/hadoop-common/target/hadoop-common-${project.version}/*
.
run cp -r
$ROOT/hadoop-hdfs-project/hadoop-hdfs/target/hadoop-hdfs-${project.version}/* .
run cp -r
$ROOT/hadoop-hdfs-project/hadoop-hdfs-httpfs/target/hadoop-hdfs-httpfs-${project.version}/*
.
+ run cp -r
$ROOT/hadoop-hdfs-project/hadoop-hdfs-raid/target/hadoop-hdfs-raid-${project.version}/*
.
run cp -r
$ROOT/hadoop-mapreduce-project/target/hadoop-mapreduce-${project.version}/* .
run cp -r
$ROOT/hadoop-tools/hadoop-tools-dist/target/hadoop-tools-dist-${project.version}/*
.
echo
Modified: hadoop/common/branches/HDFS-3092/hadoop-project/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3092/hadoop-project/pom.xml?rev=1354832&r1=1354831&r2=1354832&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-3092/hadoop-project/pom.xml (original)
+++ hadoop/common/branches/HDFS-3092/hadoop-project/pom.xml Thu Jun 28 06:59:38
2012
@@ -259,6 +259,12 @@
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-hdfs-raid</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-minicluster</artifactId>
<version>${project.version}</version>
</dependency>
@@ -380,7 +386,7 @@
<dependency>
<groupId>org.jboss.netty</groupId>
<artifactId>netty</artifactId>
- <version>3.2.3.Final</version>
+ <version>3.2.4.Final</version>
</dependency>
<dependency>
Modified:
hadoop/common/branches/HDFS-3092/hadoop-project/src/site/apt/index.apt.vm
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3092/hadoop-project/src/site/apt/index.apt.vm?rev=1354832&r1=1354831&r2=1354832&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-3092/hadoop-project/src/site/apt/index.apt.vm
(original)
+++ hadoop/common/branches/HDFS-3092/hadoop-project/src/site/apt/index.apt.vm
Thu Jun 28 06:59:38 2012
@@ -16,10 +16,10 @@
---
${maven.build.timestamp}
-Apache Hadoop 0.23
+Apache Hadoop ${project.version}
- Apache Hadoop 0.23 consists of significant improvements over the previous
- stable release (hadoop-0.20.205).
+ Apache Hadoop ${project.version} consists of significant
+ improvements over the previous stable release (hadoop-1.x).
Here is a short overview of the improvments to both HDFS and MapReduce.
Propchange: hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-datajoin/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Jun 28 06:59:38 2012
@@ -0,0 +1 @@
+target
Propchange: hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-gridmix/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Jun 28 06:59:38 2012
@@ -0,0 +1 @@
+target
Modified: hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-gridmix/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-gridmix/pom.xml?rev=1354832&r1=1354831&r2=1354832&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-gridmix/pom.xml
(original)
+++ hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-gridmix/pom.xml Thu
Jun 28 06:59:38 2012
@@ -121,7 +121,7 @@
<configuration>
<archive>
<manifest>
- <mainClass>org.apache.hadoop.tools.HadoopArchives</mainClass>
+ <mainClass>org.apache.hadoop.mapred.gridmix.Gridmix</mainClass>
</manifest>
</archive>
</configuration>
Propchange: hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-pipes/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Jun 28 06:59:38 2012
@@ -0,0 +1 @@
+target
Modified:
hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ParsedTask.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ParsedTask.java?rev=1354832&r1=1354831&r2=1354832&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ParsedTask.java
(original)
+++
hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-rumen/src/main/java/org/apache/hadoop/tools/rumen/ParsedTask.java
Thu Jun 28 06:59:38 2012
@@ -91,7 +91,10 @@ public class ParsedTask extends LoggedTa
return failedDueToAttempt;
}
- List<ParsedTaskAttempt> obtainTaskAttempts() {
+ /**
+ * @return the list of attempts of this task.
+ */
+ public List<ParsedTaskAttempt> obtainTaskAttempts() {
List<LoggedTaskAttempt> attempts = getAttempts();
return convertTaskAttempts(attempts);
}
Modified:
hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-tools-dist/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-tools-dist/pom.xml?rev=1354832&r1=1354831&r2=1354832&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-tools-dist/pom.xml
(original)
+++ hadoop/common/branches/HDFS-3092/hadoop-tools/hadoop-tools-dist/pom.xml Thu
Jun 28 06:59:38 2012
@@ -70,6 +70,13 @@
<artifactId>hadoop-gridmix</artifactId>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-pipes</artifactId>
+ <scope>compile</scope>
+ <type>pom</type>
+ <version>${project.version}</version>
+ </dependency>
</dependencies>
<build>
@@ -92,4 +99,44 @@
</plugins>
</build>
+ <profiles>
+ <profile>
+ <id>dist</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-assemblies</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>dist</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <appendAssemblyId>false</appendAssemblyId>
+ <attach>false</attach>
+
<finalName>${project.artifactId}-${project.version}</finalName>
+ <descriptorRefs>
+ <descriptorRef>hadoop-tools</descriptorRef>
+ </descriptorRefs>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
Modified: hadoop/common/branches/HDFS-3092/hadoop-tools/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-3092/hadoop-tools/pom.xml?rev=1354832&r1=1354831&r2=1354832&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-3092/hadoop-tools/pom.xml (original)
+++ hadoop/common/branches/HDFS-3092/hadoop-tools/pom.xml Thu Jun 28 06:59:38
2012
@@ -39,6 +39,7 @@
<module>hadoop-datajoin</module>
<module>hadoop-tools-dist</module>
<module>hadoop-extras</module>
+ <module>hadoop-pipes</module>
</modules>
<build>
