Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-403 Fix build after move of hbase in svn 

Removed vestiges of HADOOP-1398, temporarily backed-out.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@618457 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2008-02-04 21:56:34 +00:00
parent c6b29235e7
commit 24a864704d
2 changed files with 17 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
build.xml
View File

@ -176,18 +176,24 @@
</chmod>
</target>
<!-- ================================================================== -->
<!-- Run unit tests -->
<!-- ================================================================== -->
<path id="test.classpath">
<pathelement location="${build.test}" />
<pathelement location="${src.test}"/>
<pathelement location="${conf.dir}"/>
<pathelement location="${build.dir}"/>
<path refid="classpath"/>
</path>
<!-- Override compile-test target so can generate a hbase
test jar that has test and hbase classes.
-->
<target name="compile-test" depends="compile" >
<javac
encoding="${build.encoding}"
srcdir="${src.test}"
includes="**/*.java"
destdir="${build.test}"
debug="${javac.debug}">
<classpath refid="test.classpath"/>
<javac encoding="${build.encoding}"
srcdir="${src.test}"
includes="**/*.java"
destdir="${build.test}"
debug="${javac.debug}">
<classpath refid="test.classpath"/>
</javac>
<jar jarfile="${build.dir}/hadoop-${version}-${name}-test.jar" >
<fileset dir="${build.test}" includes="org/**" />
@ -200,20 +206,6 @@
</jar>
</target>
<!-- the unit test classpath
Copied from ../build-contrib.xml so can add to it.
-->
<path id="test.classpath">
<pathelement location="${build.test}" />
<pathelement location="${src.test}"/>
<pathelement location="${conf.dir}"/>
<pathelement location="${build.dir}"/>
<path refid="classpath"/>
</path>
<!-- ================================================================== -->
<!-- Run unit tests -->
<!-- ================================================================== -->
<target name="test" depends="compile-test, compile" >
<delete dir="${test.log.dir}"/>
<mkdir dir="${test.log.dir}"/>
@ -247,7 +239,6 @@
</batchtest>
</junit>
<fail if="tests.failed">Tests failed!</fail>
</target>
<!-- ================================================================== -->

4
src/java/org/apache/hadoop/hbase/thrift/ThriftUtilities.java
View File

@ -58,8 +58,7 @@ public class ThriftUtilities {
throw new IllegalArgument("column name is empty");
}
HColumnDescriptor col = new HColumnDescriptor(new Text(in.name),
in.maxVersions, comp, in.inMemory, in.blockCacheEnabled,
in.maxValueLength, bloom);
in.maxVersions, comp, in.inMemory, in.maxValueLength, bloom);
return col;
}
@ -77,7 +76,6 @@ public class ThriftUtilities {
col.maxVersions = in.getMaxVersions();
col.compression = in.getCompression().toString();
col.inMemory = in.isInMemory();
col.blockCacheEnabled = in.isBlockCacheEnabled();
col.maxValueLength = in.getMaxValueLength();
BloomFilterDescriptor bloom = in.getBloomFilter();
if (bloom != null) {