svn commit: r772429 - in /hadoop/hbase/trunk: ./ src/java/org/apache/hadoop/hbase/io/ src/java/org/apache/hadoop/hbase/util/ src/java/org/onelab/ src/test/org/onelab/

[st...@apache.org]

Author: stack
Date: Wed May  6 21:16:56 2009
New Revision: 772429

URL: http://svn.apache.org/viewvc?rev=772429&view=rev
Log:
HBASE-1381 Remove onelab and bloom filters files from hbase

Removed:
    hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/io/BloomFilterMapFile.java
    hadoop/hbase/trunk/src/java/org/onelab/
    hadoop/hbase/trunk/src/test/org/onelab/
Modified:
    hadoop/hbase/trunk/CHANGES.txt
    hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/io/HalfMapFileReader.java
    hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/util/Hash.java

Modified: hadoop/hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/CHANGES.txt?rev=772429&r1=772428&r2=772429&view=diff
==============================================================================
--- hadoop/hbase/trunk/CHANGES.txt (original)
+++ hadoop/hbase/trunk/CHANGES.txt Wed May  6 21:16:56 2009
@@ -17,6 +17,7 @@
    HBASE-1342  Add to filesystem info needed to rebuild .META.
    HBASE-1361  Disable bloom filters
    HBASE-1367  Get rid of Thrift exception 'NotFound'
+   HBASE-1381  Remove onelab and bloom filters files from hbase
 
   BUG FIXES
    HBASE-1140  "ant clean test" fails (Nitay Joffe via Stack)

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/io/HalfMapFileReader.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/io/HalfMapFileReader.java?rev=772429&r1=772428&r2=772429&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/io/HalfMapFileReader.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/io/HalfMapFileReader.java Wed May  6 21:16:56 2009
@@ -44,7 +44,7 @@
  * <p>This file is not splitable.  Calls to {@link #midKey()} return null.
  */
 //TODO should be fixed generic warnings from MapFile methods
-public class HalfMapFileReader extends BloomFilterMapFile.Reader {
+public class HalfMapFileReader extends HBaseMapFile.HBaseReader {
   private final boolean top;
   private final HStoreKey midkey;
   private boolean firstNextCall = true;
@@ -63,7 +63,7 @@
       final WritableComparable<HStoreKey> mk,
       final HRegionInfo hri)
   throws IOException {
-    this(fs, dirName, conf, r, mk, false, false, hri);
+    this(fs, dirName, conf, r, mk, false, hri);
   }
   
   /**
@@ -72,18 +72,17 @@
    * @param conf
    * @param r
    * @param mk
-   * @param filter
    * @param blockCacheEnabled
    * @param hri
    * @throws IOException
    */
   public HalfMapFileReader(final FileSystem fs, final String dirName, 
       final Configuration conf, final Range r,
-      final WritableComparable<HStoreKey> mk, final boolean filter,
+      final WritableComparable<HStoreKey> mk,
       final boolean blockCacheEnabled,
       final HRegionInfo hri)
   throws IOException {
-    super(fs, dirName, conf, filter, blockCacheEnabled, hri);
+    super(fs, dirName, conf, blockCacheEnabled, hri);
     // This is not actual midkey for this half-file; its just border
     // around which we split top and bottom.  Have to look in files to find
     // actual last and first keys for bottom and top halves.  Half-files don't
@@ -211,4 +210,4 @@
     checkKey(key);
     return super.seek(key);
   }
-}
\ No newline at end of file
+}

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/util/Hash.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/util/Hash.java?rev=772429&r1=772428&r2=772429&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/util/Hash.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/util/Hash.java Wed May  6 21:16:56 2009
@@ -24,9 +24,6 @@
  * This class represents a common API for hashing functions.
  */
 public abstract class Hash {
-  // TODO: Fix the design tangle that has classes over in org.onelab.filter
-  // referring to this class.  Would need to also move the Jenkins and Murmur
-  // hashing function too.
   /** Constant to denote invalid hash type. */
   public static final int INVALID_HASH = -1;
   /** Constant to denote {@link JenkinsHash}. */