svn commit: r1125406 - in /zookeeper/bookkeeper/trunk: CHANGES.txt bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/LedgerCache.java

[fp...@apache.org]

Author: fpj
Date: Fri May 20 14:11:04 2011
New Revision: 1125406

URL: http://svn.apache.org/viewvc?rev=1125406&view=rev
Log:
BOOKKEEPER-19: BookKeeper doesn't support more than 2Gig of memory (ivan via fpj)


Added:
    zookeeper/bookkeeper/trunk/CHANGES.txt
Modified:
    zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/LedgerCache.java

Added: zookeeper/bookkeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/CHANGES.txt?rev=1125406&view=auto
==============================================================================
--- zookeeper/bookkeeper/trunk/CHANGES.txt (added)
+++ zookeeper/bookkeeper/trunk/CHANGES.txt Fri May 20 14:11:04 2011
@@ -0,0 +1,13 @@
+Trunk
+
+Non-backward compatible changes:
+
+BUGFIXES:
+
+Backward compatible changes:
+
+BUGFIXES:
+
+bookkeeper-server/
+
+BOOKKEEPER-19: BookKeeper doesn't support more than 2Gig of memory (ivan via fpj)

Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/LedgerCache.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/LedgerCache.java?rev=1125406&r1=1125405&r2=1125406&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/LedgerCache.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/LedgerCache.java Fri May 20 14:11:04 2011
@@ -79,7 +79,7 @@ public class LedgerCache {
     }
     
     // allocate half of the memory to the page cache
-    private static int pageLimit = (int)(Runtime.getRuntime().maxMemory() / 3) / LedgerEntryPage.PAGE_SIZE;
+    private static int pageLimit = (int)((Runtime.getRuntime().maxMemory() / 3) / LedgerEntryPage.PAGE_SIZE);
     static {
         LOG.info("maxMemory = " + Runtime.getRuntime().maxMemory());
         if (System.getProperty("pageLimit") != null) {
@@ -88,7 +88,7 @@ public class LedgerCache {
         LOG.info("pageLimit is " + pageLimit);
     }
     // The number of pages that have actually been used
-    private int pageCount;
+    private int pageCount = 0;
     HashMap<Long, HashMap<Long,LedgerEntryPage>> pages = new HashMap<Long, HashMap<Long,LedgerEntryPage>>();
     
     private void putIntoTable(HashMap<Long, HashMap<Long,LedgerEntryPage>> table, LedgerEntryPage lep) {