Author: szetszwo
Date: Sat Oct 20 00:33:57 2012
New Revision: 1400351
URL: http://svn.apache.org/viewvc?rev=1400351&view=rev
Log:
Merge r1399946 through r1400349 from trunk.
Modified:
hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/CHANGES.txt
(contents, props changed)
hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/pom.xml
hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/main/docs/
(props changed)
hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/main/java/
(props changed)
hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/test/core/
(props changed)
hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileUtil.java
Modified:
hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1400351&r1=1400350&r2=1400351&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++
hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/CHANGES.txt
Sat Oct 20 00:33:57 2012
@@ -330,8 +330,6 @@ Release 2.0.3-alpha - Unreleased
HADOOP-8925. Remove the packaging. (eli)
- HADOOP-8887. Use a Maven plugin to build the native code using CMake.
(cmccabe via tucu)
-
OPTIMIZATIONS
HADOOP-8866. SampleQuantiles#query is O(N^2) instead of O(N). (Andrew Wang
@@ -379,6 +377,9 @@ Release 2.0.3-alpha - Unreleased
HADOOP-8900. BuiltInGzipDecompressor throws IOException - stored gzip size
doesn't match decompressed size. (Slavik Krassovsky via suresh)
+ HADOOP-8948. TestFileUtil.testGetDU fails on Windows due to incorrect
+ assumption of line separator. (Chris Nauroth via suresh)
+
Release 2.0.2-alpha - 2012-09-07
INCOMPATIBLE CHANGES
Propchange:
hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/CHANGES.txt
------------------------------------------------------------------------------
Merged
/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt:r1399946-1400349
Modified:
hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/pom.xml?rev=1400351&r1=1400350&r2=1400351&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/pom.xml
(original)
+++
hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/pom.xml
Sat Oct 20 00:33:57 2012
@@ -496,34 +496,37 @@
</execution>
</executions>
</plugin>
-
<plugin>
- <groupId>org.apache.hadoop.cmake.maven.ng</groupId>
- <artifactId>cmake-ng</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
- <id>cmake-compile</id>
- <goals><goal>compile</goal></goals>
+ <id>make</id>
+ <phase>compile</phase>
+ <goals><goal>run</goal></goals>
<configuration>
- <target>all</target>
- <source>${basedir}/src</source>
- <vars>
-
<GENERATED_JAVAH>${project.build.directory}/native/javah</GENERATED_JAVAH>
-
<JVM_ARCH_DATA_MODEL>${sun.arch.data.model}</JVM_ARCH_DATA_MODEL>
- <REQUIRE_SNAPPY>${require.snappy}</REQUIRE_SNAPPY>
-
<CUSTOM_SNAPPY_PREFIX>${snappy.prefix}</CUSTOM_SNAPPY_PREFIX>
- <CUSTOM_SNAPPY_LIB>${snappy.lib}</CUSTOM_SNAPPY_LIB>
-
<CUSTOM_SNAPPY_INCLUDE>${snappy.include}</CUSTOM_SNAPPY_INCLUDE>
- </vars>
+ <target>
+ <exec executable="cmake"
dir="${project.build.directory}/native" failonerror="true">
+ <arg line="${basedir}/src/
-DGENERATED_JAVAH=${project.build.directory}/native/javah
-DJVM_ARCH_DATA_MODEL=${sun.arch.data.model} -DREQUIRE_SNAPPY=${require.snappy}
-DCUSTOM_SNAPPY_PREFIX=${snappy.prefix} -DCUSTOM_SNAPPY_LIB=${snappy.lib}
-DCUSTOM_SNAPPY_INCLUDE=${snappy.include}"/>
+ </exec>
+ <exec executable="make"
dir="${project.build.directory}/native" failonerror="true">
+ <arg line="VERBOSE=1"/>
+ </exec>
+ </target>
</configuration>
</execution>
<execution>
- <id>test_bulk_crc32</id>
- <goals><goal>test</goal></goals>
+ <id>native_tests</id>
+ <phase>test</phase>
+ <goals><goal>run</goal></goals>
<configuration>
-
<binary>${project.build.directory}/native/test_bulk_crc32</binary>
- <timeout>300</timeout>
- <results>${project.build.directory}/results</results>
+ <target>
+ <exec executable="sh" failonerror="true"
dir="${project.build.directory}/native">
+ <arg value="-c"/>
+ <arg value="[ x$SKIPTESTS = xtrue ] ||
${project.build.directory}/native/test_bulk_crc32"/>
+ <env key="SKIPTESTS" value="${skipTests}"/>
+ </exec>
+ </target>
</configuration>
</execution>
</executions>
Propchange:
hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/main/docs/
------------------------------------------------------------------------------
Merged
/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/docs:r1399946-1400349
Propchange:
hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/main/java/
------------------------------------------------------------------------------
Merged
/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java:r1399946-1400349
Propchange:
hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/test/core/
------------------------------------------------------------------------------
Merged
/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/core:r1399946-1400349
Modified:
hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileUtil.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileUtil.java?rev=1400351&r1=1400350&r2=1400351&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileUtil.java
(original)
+++
hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileUtil.java
Sat Oct 20 00:33:57 2012
@@ -472,7 +472,9 @@ public class TestFileUtil {
setupDirs();
long du = FileUtil.getDU(TEST_DIR);
- //Only two files (in partitioned) have 4 bytes each
- Assert.assertEquals(du, 8);
+ // Only two files (in partitioned). Each has 3 characters +
system-specific
+ // line separator.
+ long expected = 2 * (3 + System.getProperty("line.separator").length());
+ Assert.assertEquals(expected, du);
}
}
