svn commit: r618457 - in /hadoop/hbase/trunk: build.xml src/java/org/apache/hadoop/hbase/thrift/ThriftUtilities.java

[stack]

Author: stack
Date: Mon Feb  4 13:56:34 2008
New Revision: 618457

URL: http://svn.apache.org/viewvc?rev=618457&view=rev
Log:
HBASE-403 Fix build after move of hbase in svn
Removed vestiges of HADOOP-1398, temporarily backed-out.

Modified:
    hadoop/hbase/trunk/build.xml
    
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/thrift/ThriftUtilities.java

Modified: hadoop/hbase/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/hadoop/hbase/trunk/build.xml?rev=618457&r1=618456&r2=618457&view=diff
==============================================================================
--- hadoop/hbase/trunk/build.xml (original)
+++ hadoop/hbase/trunk/build.xml Mon Feb  4 13:56:34 2008
@@ -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>
 
   <!-- ================================================================== -->

Modified: 
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/thrift/ThriftUtilities.java
URL: 
http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/thrift/ThriftUtilities.java?rev=618457&r1=618456&r2=618457&view=diff
==============================================================================
--- 
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/thrift/ThriftUtilities.java 
(original)
+++ 
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/thrift/ThriftUtilities.java 
Mon Feb  4 13:56:34 2008
@@ -58,8 +58,7 @@
       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 @@
     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) {