You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2012/09/29 23:02:58 UTC
svn commit: r1391878 - in /hbase/branches/0.94: pom.xml
src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileInlineToRootChunkConversion.java
Author: stack
Date: Sat Sep 29 21:02:58 2012
New Revision: 1391878
URL: http://svn.apache.org/viewvc?rev=1391878&view=rev
Log:
HBASE-6871 HFileBlockIndex Write Error in HFile V2 due to incorrect split into intermediate index blocks; ADDENDUM2 OVERCOMMIT
Modified:
hbase/branches/0.94/pom.xml
hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileInlineToRootChunkConversion.java
Modified: hbase/branches/0.94/pom.xml
URL: http://svn.apache.org/viewvc/hbase/branches/0.94/pom.xml?rev=1391878&r1=1391877&r2=1391878&view=diff
==============================================================================
--- hbase/branches/0.94/pom.xml (original)
+++ hbase/branches/0.94/pom.xml Sat Sep 29 21:02:58 2012
@@ -871,14 +871,8 @@
<!-- Using Unix cp to preserve symlinks, using script to handle wildcards -->
<echo file="${project.build.directory}/copynativelibs.sh">
- which cygpath 2> /dev/null
- if [ $? = 1 ]; then
- BUILD_DIR="${project.build.directory}"
- else
- BUILD_DIR=`cygpath --unix '${project.build.directory}'`
- fi
- if [ `ls $BUILD_DIR/nativelib | wc -l` -ne 0 ]; then
- cp -PR $BUILD_DIR/nativelib/lib* $BUILD_DIR/${project.build.finalName}/${project.build.finalName}/lib/native/${build.platform}
+ if [ `ls ${project.build.directory}/nativelib | wc -l` -ne 0 ]; then
+ cp -PR ${project.build.directory}/nativelib/lib* ${project.build.directory}/${project.build.finalName}/${project.build.finalName}/lib/native/${build.platform}
fi
</echo>
<exec executable="sh" dir="${project.build.directory}" failonerror="true">
@@ -886,19 +880,11 @@
</exec>
<!-- Using Unix tar to preserve symlinks -->
- <echo file="${project.build.directory}/maketar.sh">
- which cygpath 2> /dev/null
- if [ $? = 1 ]; then
- BUILD_DIR="${project.build.directory}"
- else
- BUILD_DIR=`cygpath --unix '${project.build.directory}'`
- fi
-
- cd $BUILD_DIR/${project.build.finalName}
- tar czf $BUILD_DIR/${project.build.finalName}.tar.gz ${project.build.finalName}
- </echo>
- <exec executable="sh" dir="${project.build.directory}" failonerror="yes">
- <arg line="./maketar.sh"/>
+ <exec executable="tar" failonerror="yes"
+ dir="${project.build.directory}/${project.build.finalName}">
+ <arg value="czf"/>
+ <arg value="${project.build.directory}/${project.build.finalName}.tar.gz"/>
+ <arg value="${project.build.finalName}/" />
</exec>
</target>
@@ -1462,17 +1448,6 @@
<build.platform>Mac_OS_X-${sun.arch.data.model}</build.platform>
</properties>
</profile>
- <profile>
- <id>os.windows</id>
- <activation>
- <os>
- <family>Windows</family>
- </os>
- </activation>
- <properties>
- <build.platform>cygwin</build.platform>
- </properties>
- </profile>
<!-- this profile should be activated for release builds -->
<profile>
Modified: hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileInlineToRootChunkConversion.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileInlineToRootChunkConversion.java?rev=1391878&r1=1391877&r2=1391878&view=diff
==============================================================================
--- hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileInlineToRootChunkConversion.java (original)
+++ hbase/branches/0.94/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileInlineToRootChunkConversion.java Sat Sep 29 21:02:58 2012
@@ -23,7 +23,6 @@ import org.apache.hadoop.conf.Configurat
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.HBaseTestingUtility;
-import org.junit.experimental.categories.Category;
import org.apache.hadoop.hbase.SmallTests;
import org.apache.hadoop.hbase.util.Bytes;
import org.junit.Test;