boxtec
/
yacy_search_server
mirror of https://github.com/yacy/yacy_search_server
4
1
Fork 0
Code Issues Projects Releases Wiki Activity

next try for for http://forum.yacy-websuche.de/viewtopic.php?f=5&t=2703

Browse Source 
(reverted 6692)

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@6694 6c8d7289-2bf4-0310-a012-ef5d649a1542
pull/1/head
sixcooler 15 years ago
parent bfe4693e9a
commit cd6de83905
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File

16
source/net/yacy/kelondro/index/RowCollection.java
Unescape View File

@ -208,11 +208,6 @@ public class RowCollection implements Iterable<Row.Entry> {
return this.rowdef; return this.rowdef;
} }
protected final int maxIntFromLong(long val) {
if (val >= Integer.MAX_VALUE) return Integer.MAX_VALUE;
return (int) val;
}
protected final long neededSpaceForEnsuredSize(final int elements, final boolean forcegc) { protected final long neededSpaceForEnsuredSize(final int elements, final boolean forcegc) {
assert elements > 0 : "elements = " + elements; assert elements > 0 : "elements = " + elements;
final long needed = elements * rowdef.objectsize; final long needed = elements * rowdef.objectsize;
@ -220,21 +215,22 @@ public class RowCollection implements Iterable<Row.Entry> {
assert needed > 0 : "needed = " + needed; assert needed > 0 : "needed = " + needed;
long allocram = needed * growfactorLarge100 / 100L; long allocram = needed * growfactorLarge100 / 100L;
assert allocram > 0 : "elements = " + elements + ", new = " + allocram; assert allocram > 0 : "elements = " + elements + ", new = " + allocram;
if (MemoryControl.request(allocram, false)) return allocram; if (allocram <= Integer.MAX_VALUE && MemoryControl.request(allocram, false)) return allocram;
allocram = needed * growfactorSmall100 / 100L; allocram = needed * growfactorSmall100 / 100L;
assert allocram > 0 : "elements = " + elements + ", new = " + allocram; assert allocram > 0 : "elements = " + elements + ", new = " + allocram;
if (MemoryControl.request(allocram, forcegc)) return allocram; if (allocram <= Integer.MAX_VALUE && MemoryControl.request(allocram, forcegc)) return allocram;
return needed; return needed;
} }
protected final void ensureSize(final int elements) throws RowSpaceExceededException { protected final void ensureSize(final int elements) throws RowSpaceExceededException {
if (elements == 0) return; if (elements == 0) return;
final int allocram = maxIntFromLong(neededSpaceForEnsuredSize(elements, true)); final long allocram = neededSpaceForEnsuredSize(elements, true);
if (allocram == 0) return; if (allocram == 0) return;
assert allocram > chunkcache.length : "wrong alloc computation: allocram = " + allocram + ", chunkcache.length = " + chunkcache.length; assert allocram > chunkcache.length : "wrong alloc computation: allocram = " + allocram + ", chunkcache.length = " + chunkcache.length;
if (!MemoryControl.request(allocram, true)) throw new RowSpaceExceededException(allocram, "RowCollection grow"); if (allocram > Integer.MAX_VALUE || !MemoryControl.request(allocram, true))
throw new RowSpaceExceededException(allocram, "RowCollection grow");
try { try {
final byte[] newChunkcache = new byte[allocram]; // increase space final byte[] newChunkcache = new byte[(int) allocram]; // increase space
System.arraycopy(chunkcache, 0, newChunkcache, 0, chunkcache.length); System.arraycopy(chunkcache, 0, newChunkcache, 0, chunkcache.length);
chunkcache = newChunkcache; chunkcache = newChunkcache;
} catch (OutOfMemoryError e) { } catch (OutOfMemoryError e) {

Write Preview
Loading…
Cancel
Save