Author: j16sdiz
Date: 2008-05-06 07:39:23 +0000 (Tue, 06 May 2008)
New Revision: 19788
Modified:
branches/saltedhashstore/freenet/src/freenet/store/SaltedHashFreenetStore.java
Log:
Better key count estimation
Modified:
branches/saltedhashstore/freenet/src/freenet/store/SaltedHashFreenetStore.java
===================================================================
---
branches/saltedhashstore/freenet/src/freenet/store/SaltedHashFreenetStore.java
2008-05-06 07:39:04 UTC (rev 19787)
+++
branches/saltedhashstore/freenet/src/freenet/store/SaltedHashFreenetStore.java
2008-05-06 07:39:23 UTC (rev 19788)
@@ -573,7 +573,9 @@
storeSize = raf.readLong();
prevStoreSize = raf.readLong();
- estimatedCount = new SimpleRunningAverage(3,
raf.readLong());
+ long oldEstimatedCount = raf.readLong();
+ estimatedCount = new SimpleRunningAverage(3,
oldEstimatedCount);
+ estimatedCount.report(oldEstimatedCount);
raf.readLong();
raf.close();
@@ -653,7 +655,7 @@
*/
private void estimateStoreSize() {
Logger.minor(this, "start estimating key count");
- long numSample = (long) (SAMPLE_RATE * storeSize);
+ long numSample = Math.min((long) (SAMPLE_RATE *
storeSize), 10000);
long sampled = 0;
long occupied = 0;
while (sampled < numSample) {
