[freenet-dev] [freenet-cvs] r19306 - trunk/freenet/src/freenet/store

[Matthew Toseland]

On Monday 14 April 2008 08:53, j16sdiz at freenetproject.org wrote:
> Author: j16sdiz
> Date: 2008-04-14 07:53:47 +0000 (Mon, 14 Apr 2008)
> New Revision: 19306
> 
> Modified:
>    trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java
>    trunk/freenet/src/freenet/store/FreenetStore.java
>    trunk/freenet/src/freenet/store/RAMFreenetStore.java
> Log:
> change javadoc and RAMFS.put() to match BDBFS.put() behaviour

Eh? Did you actually read BDBFS.put() ?
> 
> 
> Modified: trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java
> ===================================================================
> --- trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java	2008-04-14 
07:04:26 UTC (rev 19305)
> +++ trunk/freenet/src/freenet/store/BerkeleyDBFreenetStore.java	2008-04-14 
07:53:47 UTC (rev 19306)
> @@ -170,7 +170,8 @@
>  	 * @param lruFile
>  	 *            LRU data file, flat file store for recovery
>  	 * @param keysFile
> -	 *            Keys data file, flat file store for recvoery
> +	 *            Keys data file, flat file store for recovery, created only 
if
> +	 *            <code>callback.storeFullKeys()</code> is <code>true</code>
>  	 * @param fixSecondaryFile
>  	 *            Flag file. Created when secondary database error occur. If
>  	 *            this file exist on start, delete it and recreate the 
secondary
> 
> Modified: trunk/freenet/src/freenet/store/FreenetStore.java
> ===================================================================
> --- trunk/freenet/src/freenet/store/FreenetStore.java	2008-04-14 07:04:26 
UTC (rev 19305)
> +++ trunk/freenet/src/freenet/store/FreenetStore.java	2008-04-14 07:53:47 
UTC (rev 19306)
> @@ -22,15 +22,16 @@
>  	 */
>  	StorableBlock fetch(byte[] routingKey, byte[] fullKey, boolean 
dontPromote) throws IOException;
>  	
> -    /**
> -     * Store a block.
> -     * 
> -     * @throws KeyCollisionException
> -     *                 If the key already exists but has different 
contents.
> -     * @param overwrite
> -     *                If true, overwrite old content rather than throwing a
> -     *                <code>KeyCollisionException</code>.
> -     */
> +	/**
> +	 * Store a block.
> +	 * 
> +	 * @throws KeyCollisionException
> +	 *             If the key already exists and 
<code>callback.collisionPossible()</code> is
> +	 *             <code>true</code>.
> +	 * @param overwrite
> +	 *            If true, overwrite old content rather than throwing a
> +	 *            <code>KeyCollisionException</code>.
> +	 */
>      public void put(StorableBlock block, byte[] routingkey, byte[] fullKey, 
byte[] data, byte[] header, 
>      		boolean overwrite) throws IOException, KeyCollisionException;
>      
> 
> Modified: trunk/freenet/src/freenet/store/RAMFreenetStore.java
> ===================================================================
> --- trunk/freenet/src/freenet/store/RAMFreenetStore.java	2008-04-14 07:04:26 
UTC (rev 19305)
> +++ trunk/freenet/src/freenet/store/RAMFreenetStore.java	2008-04-14 07:53:47 
UTC (rev 19306)
> @@ -81,10 +81,6 @@
>  		boolean storeFullKeys = callback.storeFullKeys();
>  		if(oldBlock != null) {
>  			if(callback.collisionPossible()) {
> -				boolean equals = Arrays.equals(oldBlock.data, data) &&
> -					Arrays.equals(oldBlock.header, header) &&
> -					(storeFullKeys ? Arrays.equals(oldBlock.fullKey, fullKey) : true);
> -				if(equals) return;
>  				if(overwrite) {
>  					oldBlock.data = data;
>  					oldBlock.header = header;
> 
> _______________________________________________
> cvs mailing list
> cvs at freenetproject.org
> http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
> 
> 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://emu.freenetproject.org/pipermail/devl/attachments/20080414/a3288154/attachment.pgp