svn commit: r668266 - in /hadoop/hbase/branches/0.1: CHANGES.txt src/java/org/apache/hadoop/hbase/HStore.java src/java/org/apache/hadoop/hbase/HStoreFile.java

[stack]

Author: stack
Date: Mon Jun 16 12:21:50 2008
New Revision: 668266

URL: http://svn.apache.org/viewvc?rev=668266&view=rev
Log:
HBASE-680 config parameter hbase.io.index.interval should be 
hbase.index.interval, accroding to HBaseMapFile.HbaseWriter
HBASE-684 unnecessary iteration in HMemcache.internalGet? got much better 
reading performance after break it.

Modified:
    hadoop/hbase/branches/0.1/CHANGES.txt
    hadoop/hbase/branches/0.1/src/java/org/apache/hadoop/hbase/HStore.java
    hadoop/hbase/branches/0.1/src/java/org/apache/hadoop/hbase/HStoreFile.java

Modified: hadoop/hbase/branches/0.1/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/hbase/branches/0.1/CHANGES.txt?rev=668266&r1=668265&r2=668266&view=diff
==============================================================================
--- hadoop/hbase/branches/0.1/CHANGES.txt (original)
+++ hadoop/hbase/branches/0.1/CHANGES.txt Mon Jun 16 12:21:50 2008
@@ -16,6 +16,12 @@
    HBASE-674   Memcache size unreliable
    HBASE-665   server side scanner doesn't honor stop row
    HBASE-681   NPE in Memcache (Clint Morgan via Jim Kellerman)
+   HBASE-680   config parameter hbase.io.index.interval should be
+               hbase.index.interval, accroding to HBaseMapFile.HbaseWriter
+               (LN via Stack)
+   HBASE-684   unnecessary iteration in HMemcache.internalGet? got much better
+               reading performance after break it (LN via Stack)
+
 
 Release 0.1.2 - 05/13/2008
 

Modified: hadoop/hbase/branches/0.1/src/java/org/apache/hadoop/hbase/HStore.java
URL: 
http://svn.apache.org/viewvc/hadoop/hbase/branches/0.1/src/java/org/apache/hadoop/hbase/HStore.java?rev=668266&r1=668265&r2=668266&view=diff
==============================================================================
--- hadoop/hbase/branches/0.1/src/java/org/apache/hadoop/hbase/HStore.java 
(original)
+++ hadoop/hbase/branches/0.1/src/java/org/apache/hadoop/hbase/HStore.java Mon 
Jun 16 12:21:50 2008
@@ -478,8 +478,11 @@
           if (!HLogEdit.isDeleted(es.getValue())) { 
             result.add(tailMap.get(itKey));
           }
-        }
-        if (numVersions > 0 && result.size() >= numVersions) {
+          if (numVersions > 0 && result.size() >= numVersions) {
+            break;
+          }
+        } else {
+          // By L.N. HBASE-684, map is sorted, so we can't find match any more.
           break;
         }
       }

Modified: 
hadoop/hbase/branches/0.1/src/java/org/apache/hadoop/hbase/HStoreFile.java
URL: 
http://svn.apache.org/viewvc/hadoop/hbase/branches/0.1/src/java/org/apache/hadoop/hbase/HStoreFile.java?rev=668266&r1=668265&r2=668266&view=diff
==============================================================================
--- hadoop/hbase/branches/0.1/src/java/org/apache/hadoop/hbase/HStoreFile.java 
(original)
+++ hadoop/hbase/branches/0.1/src/java/org/apache/hadoop/hbase/HStoreFile.java 
Mon Jun 16 12:21:50 2008
@@ -580,7 +580,7 @@
         // Default for mapfiles is 128.  Makes random reads faster if we
         // have more keys indexed and we're not 'next'-ing around in the
         // mapfile.
-        setIndexInterval(conf.getInt("hbase.index.interval", 128));
+        setIndexInterval(conf.getInt("hbase.io.index.interval", 128));
       }
     }
   }
@@ -838,4 +838,4 @@
       return super.seek(key);
     }
   }
-}
\ No newline at end of file
+}