On Tue, Aug 26, 2008 at 2:08 AM, Matthew Toseland
<toad at amphibian.dyndns.org> wrote:
> On Monday 25 August 2008 04:49, Daniel Cheng wrote:
>> On Sun, Aug 24, 2008 at 2:04 AM, Matthew Toseland
>> <toad at amphibian.dyndns.org> wrote:
>> > On Tuesday 19 August 2008 02:39, j16sdiz at freenetproject.org wrote:
>> >> Author: j16sdiz
>> >> Date: 2008-08-19 01:39:07 +0000 (Tue, 19 Aug 2008)
>> >> New Revision: 22020
>> >>
>> >> Modified:
>> >>
>> >
> branches/saltedhashstore/freenet/src/freenet/l10n/freenet.l10n.en.properties
>> >> branches/saltedhashstore/freenet/src/freenet/node/Node.java
>> >> Log:
>> >> doh! wrong size
>> >
>> > What's with the / 6 * 8 ?
>>
>> Counting filter use 2 bits per position (M).
>> The size of filter is specified in number of positions.
>
> The size given is divided by the number of stores (6) ?
yes.
>>
>>
>> >>
>> >> Modified:
>> >
> branches/saltedhashstore/freenet/src/freenet/l10n/freenet.l10n.en.properties
>> >> ===================================================================
>> >> ---
>> >
> branches/saltedhashstore/freenet/src/freenet/l10n/freenet.l10n.en.properties
>> > 2008-08-18 19:13:27 UTC (rev 22019)
>> >> +++
>> >
> branches/saltedhashstore/freenet/src/freenet/l10n/freenet.l10n.en.properties
>> > 2008-08-19 01:39:07 UTC (rev 22020)
>> >> @@ -709,7 +709,7 @@
>> >> Node.storeType=Store type (LEAVE THIS ALONE)
>> >> Node.storeTypeLong=Datastore type. Currently this can be salt-hash (use
> a
>> > salted on-disk hashtable with bloom filter), bdb-index (use a
>> > BerkeleyDBFreenetStore to store the index, and keep the data in files on
>> > disk), or ram (keep the index and the data in RAM). Only use ram if you
> know
>> > what you are doing and have enough RAM to store all your data (and note it
>> > will not be saved on shutdown)! Changes will not take effect until Freenet
>> > has been restarted.
>> >> Node.storeBloomFilterSize=Bloom filter size (total) in bytes
>> >> -Node.storeBloomFilterSizeLong=Bloom filter size (total) in bytes.
> Usually
>> > 1/2000 to 1/1000 the size of data store is more than enough.
>> >> +Node.storeBloomFilterSizeLong=Bloom filter size (total) in bytes.
> Usually
>> > 1/1000 the size of data store is more than enough.
>> >> Node.swapRInterval=Swap request send interval (ms)
>> >> Node.swapRIntervalLong=Interval between swap attempting to send swap
>> > requests in milliseconds. Leave this alone!
>> >> Node.throttleLocalTraffic=Throttle local traffic?
>> >>
>> >> Modified: branches/saltedhashstore/freenet/src/freenet/node/Node.java
>> >> ===================================================================
>> >> --- branches/saltedhashstore/freenet/src/freenet/node/Node.java
> 2008-08-18
>> > 19:13:27 UTC (rev 22019)
>> >> +++ branches/saltedhashstore/freenet/src/freenet/node/Node.java
> 2008-08-19
>> > 01:39:07 UTC (rev 22020)
>> >> @@ -1435,32 +1435,32 @@
>> >> System.out.println("Initializing CHK
> Datastore (" + maxStoreKeys + "
>> > keys)");
>> >> chkDatastore = new CHKStore();
>> >> SaltedHashFreenetStore chkDataFS =
>> > SaltedHashFreenetStore.construct(storeDir, "CHK-store",
>> >> - chkDatastore, random, maxStoreKeys,
> storeBloomFilterSize / 6 *
>> > 8, true, shutdownHook);
>> >> + chkDatastore, random, maxStoreKeys,
> storeBloomFilterSize / 6 *
>> > 4, true, shutdownHook);
>> >> Logger.normal(this, "Initializing CHK
> Datacache");
>> >> System.out.println("Initializing CHK
> Datacache (" + maxCacheKeys + ':'
>> > + maxCacheKeys + " keys)");
>> >> chkDatacache = new CHKStore();
>> >> SaltedHashFreenetStore chkCacheFS =
>> > SaltedHashFreenetStore.construct(storeDir, "CHK-cache",
>> >> - chkDatacache, random, maxCacheKeys,
> storeBloomFilterSize / 6 *
>> > 8, true, shutdownHook);
>> >> + chkDatacache, random, maxCacheKeys,
> storeBloomFilterSize / 6 *
>> > 4, true, shutdownHook);
>> >> Logger.normal(this, "Initializing pubKey
> Datastore");
>> >> System.out.println("Initializing pubKey
> Datastore");
>> >> pubKeyDatastore = new PubkeyStore();
>> >> SaltedHashFreenetStore pubkeyDataFS =
>> > SaltedHashFreenetStore.construct(storeDir, "PUBKEY-store",
>> >> - pubKeyDatastore, random,
> maxStoreKeys, storeBloomFilterSize / 6
>> > * 8, true, shutdownHook);
>> >> + pubKeyDatastore, random,
> maxStoreKeys, storeBloomFilterSize / 6
>> > * 4, true, shutdownHook);
>> >> Logger.normal(this, "Initializing pubKey
> Datacache");
>> >> System.out.println("Initializing pubKey
> Datacache (" + maxCacheKeys + "
>> > keys)");
>> >> pubKeyDatacache = new PubkeyStore();
>> >> SaltedHashFreenetStore pubkeyCacheFS =
>> > SaltedHashFreenetStore.construct(storeDir, "PUBKEY-cache",
>> >> - pubKeyDatacache, random,
> maxCacheKeys, storeBloomFilterSize / 6
>> > * 8, true, shutdownHook);
>> >> + pubKeyDatacache, random,
> maxCacheKeys, storeBloomFilterSize / 6
>> > * 4, true, shutdownHook);
>> >> Logger.normal(this, "Initializing SSK
> Datastore");
>> >> System.out.println("Initializing SSK
> Datastore");
>> >> sskDatastore = new SSKStore(this);
>> >> SaltedHashFreenetStore sskDataFS =
>> > SaltedHashFreenetStore.construct(storeDir, "SSK-store",
>> >> - sskDatastore, random, maxStoreKeys,
> storeBloomFilterSize / 6 *
>> > 8, true, shutdownHook);
>> >> + sskDatastore, random, maxStoreKeys,
> storeBloomFilterSize / 6 *
>> > 4, true, shutdownHook);
>> >> Logger.normal(this, "Initializing SSK
> Datacache");
>> >> System.out.println("Initializing SSK
> Datacache (" + maxCacheKeys + "
>> > keys)");
>> >> sskDatacache = new SSKStore(this);
>> >> SaltedHashFreenetStore sskCacheFS =
>> > SaltedHashFreenetStore.construct(storeDir, "SSK-cache",
>> >> - sskDatacache, random, maxCacheKeys,
> storeBloomFilterSize / 6 *
>> > 8, true, shutdownHook);
>> >> + sskDatacache, random, maxCacheKeys,
> storeBloomFilterSize / 6 *
>> > 4, true, shutdownHook);
>> >>
>> >> File migrationFile = new
> File(storeDir, "migrated");
>> >> if (!migrationFile.exists()) {
>> >>
>> >> _______________________________________________
>> >> cvs mailing list
>> >> cvs at freenetproject.org
>> >> http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
>> >>
>> >>
>> >
>> > _______________________________________________
>> > Devl mailing list
>> > Devl at freenetproject.org
>> > http://emu.freenetproject.org/cgi-bin/mailman/listinfo/devl
>> >
>> _______________________________________________
>> Devl mailing list
>> Devl at freenetproject.org
>> http://emu.freenetproject.org/cgi-bin/mailman/listinfo/devl
>>
>>
>
> _______________________________________________
> Devl mailing list
> Devl at freenetproject.org
> http://emu.freenetproject.org/cgi-bin/mailman/listinfo/devl
>
