You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Greg Stein <gs...@gmail.com> on 2009/04/01 22:49:32 UTC
Re: svn commit: r36926 - trunk/subversion/libsvn_wc
I've verified this fixes diff_test 4.
Cool!
On Wed, Apr 1, 2009 at 19:18, Hyrum K. Wright <hy...@hyrumwright.org> wrote:
> Author: hwright
> Date: Wed Apr 1 10:18:51 2009
> New Revision: 36926
>
> Log:
> De-couple the storing of translated size in a WORKING node from
> the checksum. Also, store NULL in the database, in place of -1
> if the filesize is invalid.
>
> * subversion/libsvn_wc/entries.c
> (insert_base_node): Don't bind an invalid filesize.
> (insert_working_node): Bind a valid translated size, even if there
> isn't a checksum.
>
> Modified:
> trunk/subversion/libsvn_wc/entries.c
>
> Modified: trunk/subversion/libsvn_wc/entries.c
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_wc/entries.c?pathrev=36926&r1=36925&r2=36926
> ==============================================================================
> --- trunk/subversion/libsvn_wc/entries.c Wed Apr 1 10:06:12 2009 (r36925)
> +++ trunk/subversion/libsvn_wc/entries.c Wed Apr 1 10:18:51 2009 (r36926)
> @@ -1695,7 +1695,8 @@ insert_base_node(svn_sqlite__db_t *wc_db
> scratch_pool), NULL)));
> }
>
> - SVN_ERR(svn_sqlite__bind_int64(stmt, 10, base_node->translated_size));
> + if (base_node->translated_size != SVN_INVALID_FILESIZE)
> + SVN_ERR(svn_sqlite__bind_int64(stmt, 10, base_node->translated_size));
>
> /* ### strictly speaking, changed_rev should be valid for present nodes. */
> if (SVN_IS_VALID_REVNUM(base_node->changed_rev))
> @@ -1780,9 +1781,11 @@ insert_working_node(svn_sqlite__db_t *wc
> SVN_ERR(svn_sqlite__bind_text(stmt, 11, apr_pstrcat(scratch_pool,
> kind_str, svn_checksum_to_cstring(working_node->checksum,
> scratch_pool), NULL)));
> - SVN_ERR(svn_sqlite__bind_int64(stmt, 12, working_node->translated_size));
> }
>
> + if (working_node->translated_size != SVN_INVALID_FILESIZE)
> + SVN_ERR(svn_sqlite__bind_int64(stmt, 12, working_node->translated_size));
> +
> if (SVN_IS_VALID_REVNUM(working_node->changed_rev))
> SVN_ERR(svn_sqlite__bind_int64(stmt, 13, working_node->changed_rev));
> if (working_node->changed_date)
>
> ------------------------------------------------------
> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=495&dsMessageId=1509038
>
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1511428
Re: svn commit: r36926 - trunk/subversion/libsvn_wc
Posted by Greg Stein <gs...@gmail.com>.
And with my latest commit, it should be down to just two tests:
update 34
revert 17
Cheers,
-g
On Thu, Apr 2, 2009 at 00:49, Greg Stein <gs...@gmail.com> wrote:
> I've verified this fixes diff_test 4.
>
> Cool!
>
> On Wed, Apr 1, 2009 at 19:18, Hyrum K. Wright <hy...@hyrumwright.org> wrote:
>> Author: hwright
>> Date: Wed Apr 1 10:18:51 2009
>> New Revision: 36926
>>
>> Log:
>> De-couple the storing of translated size in a WORKING node from
>> the checksum. Also, store NULL in the database, in place of -1
>> if the filesize is invalid.
>>
>> * subversion/libsvn_wc/entries.c
>> (insert_base_node): Don't bind an invalid filesize.
>> (insert_working_node): Bind a valid translated size, even if there
>> isn't a checksum.
>>
>> Modified:
>> trunk/subversion/libsvn_wc/entries.c
>>
>> Modified: trunk/subversion/libsvn_wc/entries.c
>> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_wc/entries.c?pathrev=36926&r1=36925&r2=36926
>> ==============================================================================
>> --- trunk/subversion/libsvn_wc/entries.c Wed Apr 1 10:06:12 2009 (r36925)
>> +++ trunk/subversion/libsvn_wc/entries.c Wed Apr 1 10:18:51 2009 (r36926)
>> @@ -1695,7 +1695,8 @@ insert_base_node(svn_sqlite__db_t *wc_db
>> scratch_pool), NULL)));
>> }
>>
>> - SVN_ERR(svn_sqlite__bind_int64(stmt, 10, base_node->translated_size));
>> + if (base_node->translated_size != SVN_INVALID_FILESIZE)
>> + SVN_ERR(svn_sqlite__bind_int64(stmt, 10, base_node->translated_size));
>>
>> /* ### strictly speaking, changed_rev should be valid for present nodes. */
>> if (SVN_IS_VALID_REVNUM(base_node->changed_rev))
>> @@ -1780,9 +1781,11 @@ insert_working_node(svn_sqlite__db_t *wc
>> SVN_ERR(svn_sqlite__bind_text(stmt, 11, apr_pstrcat(scratch_pool,
>> kind_str, svn_checksum_to_cstring(working_node->checksum,
>> scratch_pool), NULL)));
>> - SVN_ERR(svn_sqlite__bind_int64(stmt, 12, working_node->translated_size));
>> }
>>
>> + if (working_node->translated_size != SVN_INVALID_FILESIZE)
>> + SVN_ERR(svn_sqlite__bind_int64(stmt, 12, working_node->translated_size));
>> +
>> if (SVN_IS_VALID_REVNUM(working_node->changed_rev))
>> SVN_ERR(svn_sqlite__bind_int64(stmt, 13, working_node->changed_rev));
>> if (working_node->changed_date)
>>
>> ------------------------------------------------------
>> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=495&dsMessageId=1509038
>>
>
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1513136