some fixes to bring back lulabads peer..

see also: http://forum.yacy-websuche.de/viewtopic.php?p=4772#p4772 git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@4366 6c8d7289-2bf4-0310-a012-ef5d649a1542
yacy · Jan 22, 2008 · d372a78 · d372a78
1 parent f4799c2
commit d372a78
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/source/de/anomic/kelondro/kelondroCollectionIndex.java b/source/de/anomic/kelondro/kelondroCollectionIndex.java
@@ -153,7 +153,7 @@ public kelondroCollectionIndex(File path, String filenameStub, int keyLength, ke
                     continue;
                 }
             }
-            serverLog.logFine("STARTUP", "STARTED INITIALIZATION OF NEW COLLECTION INDEX WITH " + initialSpace + " ENTRIES. THIS WILL TAKE SOME TIME");
+            serverLog.logFine("STARTUP", "STARTED INITIALIZATION OF NEW COLLECTION INDEX WITH " + initialSpace + " ENTRIES.  THIS WILL TAKE SOME TIME. " + (serverMemory.available() / 1024 / 1024) + "MB AVAILABLE.");
             kelondroRow indexRowdef = indexRow(keyLength, indexOrder);
             long necessaryRAM4fullTable = minimumRAM4Eco + (indexRowdef.objectsize + 4) * initialSpace * 3 / 2;
             long necessaryRAM4fullIndex = minimumRAM4Eco + (indexRowdef.primaryKeyLength + 4) * initialSpace * 3 / 2;

diff --git a/source/de/anomic/kelondro/kelondroEcoTable.java b/source/de/anomic/kelondro/kelondroEcoTable.java
@@ -76,7 +76,7 @@ public kelondroEcoTable(File tablefile, kelondroRow rowdef, int useTailCache, in
         for (int i = 0; i < cols.length; i++) {
             cols[i] = rowdef.column(i + 1);
         }
-        this.taildef = new kelondroRow(cols, kelondroNaturalOrder.naturalOrder, rowdef.primaryKeyIndex);
+        this.taildef = new kelondroRow(cols, kelondroNaturalOrder.naturalOrder, -1);
 
         // initialize table file
         if (!tablefile.exists()) {
@@ -97,11 +97,12 @@ public kelondroEcoTable(File tablefile, kelondroRow rowdef, int useTailCache, in
 
             // initialize index and copy table
             int  records = (int) Math.max(file.size(), initialSpace);
-            long neededRAM4table = 10 * 1024 * 1024 + records * (rowdef.objectsize + 4) * 3 / 2;
+            long neededRAM4table = 200 * 1024 * 1024 + records * (rowdef.objectsize + 4) * 3 / 2;
             table = ((neededRAM4table < maxarraylength) &&
                      ((useTailCache == tailCacheForceUsage) ||
-                      ((useTailCache == tailCacheUsageAuto) && (serverMemory.request(neededRAM4table, true))))) ?
+                      ((useTailCache == tailCacheUsageAuto) && (serverMemory.request(neededRAM4table, false))))) ?
                     new kelondroRowSet(taildef, records) : null;
+            System.out.println("*** DEBUG: available RAM: " + (serverMemory.available() / 1024 / 1024) + "MB, allocating space for " + records + " entries");
             index = new kelondroBytesIntMap(rowdef.primaryKeyLength, rowdef.objectOrder, records);
             System.out.println("*** DEBUG: EcoTable " + tablefile.toString() + " has table copy " + ((table == null) ? "DISABLED" : "ENABLED"));
 

diff --git a/source/de/anomic/kelondro/kelondroRAMIndex.java b/source/de/anomic/kelondro/kelondroRAMIndex.java
@@ -48,6 +48,7 @@ public void reset() {
 	}
 
 	public void reset(int initialspace) {
+	    this.index0 = null; // first flush RAM to make room
 		this.index0 = new kelondroRowSet(rowdef, initialspace);
         this.index1 = null; // to show that this is the initialization phase
 	}