Distributed Peer-to-Peer Web Search Engine and Intranet Search Appliance
Java decentralizedintranet-searchintranet-search-enginep2pp2p-networkprivacyprivacy-protectionsearch-enginesearchenginewebweb-search-enginewebsearchwebseearch-engine
reduced memory footprint during indexing/crawling
admin9b7668fa5872
diff --git a/defaults/yacy.init b/defaults/yacy.initindex bc1992310..ca99068f6 100644--- a/defaults/yacy.init+++ b/defaults/yacy.init@@ -788,7 +788,7 @@ javastart_priority=10# wordCacheMaxLow/High is the number of word indexes that shall be held in the# ram cache during indexing. If you want to increase indexing speed, increase this# value i.e. up to one million, but increase also the memory limit to a minimum of 2GB-wordCacheMaxCount = 50000+wordCacheMaxCount = 20000# Specifies if yacy can be used as transparent http proxy.#diff --git a/htroot/Performance_p.html b/htroot/Performance_p.htmlindex 6dd62dddc..d50b72286 100644--- a/htroot/Performance_p.html+++ b/htroot/Performance_p.html@@ -56,7 +56,7 @@</div><div class="form-group"><label for="diskFreeHardlimit">Absolute minimum</label>- <input name="diskFreeHardlimit" id="diskFreeHardlimit" type="text" size="4" value="#[diskFreeHardlimit]#" title="Amount of space (in Mebibytes) that should at least be kept free as hard limit"/> <abbr title="Mebibyte">MiB</abbr>. Disable <abbr title="Distributed Hash Table">DHT</abbr>-in when free space is below.+ <input name="diskFreeHardlimit" id="diskFreeHardlimit" type="text" size="4" value="#[diskFreeHardlimit]#" title="Amount of space (in Megabytes) that should at least be kept free as hard limit"/> <abbr title="Mebibyte">MiB</abbr>. Disable <abbr title="Distributed Hash Table">DHT</abbr>-in when free space is below.</div><div class="form-group"><label for="diskFreeAutoregulate">Autoregulate</label>diff --git a/source/net/yacy/kelondro/rwi/IndexCell.java b/source/net/yacy/kelondro/rwi/IndexCell.javaindex aeaca15ef..0574570d3 100644--- a/source/net/yacy/kelondro/rwi/IndexCell.java+++ b/source/net/yacy/kelondro/rwi/IndexCell.java@@ -65,7 +65,7 @@ import net.yacy.search.Switchboard;public final class IndexCell<ReferenceType extends Reference> extends AbstractBufferedIndex<ReferenceType> implements BufferedIndex<ReferenceType>, Iterable<ReferenceContainer<ReferenceType>> {private static final long cleanupCycle = 60000;- private static final long dumpCycle = 600000;+ private static final long dumpCycle = 300000;// class variablesprivate final ReferenceContainerArray<ReferenceType> array;@@ -115,7 +115,7 @@ public final class IndexCell<ReferenceType extends Reference> extends AbstractBupublic FlushThread(String name) {super("IndexCell.FlushThread(" + name + ")");}-+@Overridepublic void run() {while (IndexCell.this.flushShallRun) {@@ -133,7 +133,7 @@ public final class IndexCell<ReferenceType extends Reference> extends AbstractBu// dump the cache if necessaryfinal long t = System.currentTimeMillis();if ((IndexCell.this.ram.size() >= IndexCell.this.maxRamEntries ||- (IndexCell.this.ram.size() > 3000 && !MemoryControl.request(80L * 1024L * 1024L, false)) ||+ (IndexCell.this.ram.size() > 2000 && !MemoryControl.request(120L * 1024L * 1024L, false)) ||(!IndexCell.this.ram.isEmpty() && IndexCell.this.lastDump + dumpCycle < t))) {synchronized (IndexCell.this.merger) {if (IndexCell.this.ram.size() >= IndexCell.this.maxRamEntries ||