Re: svn commit: r40308 - trunk/subversion/libsvn_wc

[Greg Stein-4]

On Thu, Oct 29, 2009 at 22:58, C. Michael Pilato <cmpilato@...> wrote:

>...
> +++ trunk/subversion/libsvn_wc/wc-queries.sql   Thu Oct 29 19:58:01 2009        (r40308)
> @@ -164,6 +164,12 @@ where wc_id = ?1 and local_relpath = ?2;
>  delete from lock
>  where repos_id = ?1 and repos_relpath = ?2;
>
> +-- STMT_CLEAR_BASE_RECURSIVE_DAV_CACHE
> +update base_node set dav_cache = ?4
> +where dav_cache is not null and wc_id = ?1 and
> +  (local_relpath = ?2 or
> +   local_relpath like ?3 escape '#');

This can be simplified with: set dav_cache = null

No need to use a parameter here.

>...
> +++ trunk/subversion/libsvn_wc/wc_db.c  Thu Oct 29 19:58:01 2009        (r40308)
> @@ -3702,6 +3702,14 @@ relocate_txn(void *baton, svn_sqlite__db
>      base_node in the first place. */
>   if (rb->have_base_node)
>     {
> +      /* Purge the DAV cache (wcprops) from any BASE that have 'em. */
> +      SVN_ERR(svn_sqlite__get_statement(&stmt, sdb,
> +                                        STMT_CLEAR_BASE_RECURSIVE_DAV_CACHE));
> +      SVN_ERR(svn_sqlite__bindf(stmt, "iss", rb->wc_id, rb->local_relpath,
> +                                like_arg));
> +      SVN_ERR(svn_sqlite__bind_properties(stmt, 4, NULL, scratch_pool));
> +      SVN_ERR(svn_sqlite__step_done(stmt));

The bind_properties() can be skipped, since 'null' will be the
default. But with the above change, then even this won't be necessary.

>...

Cheers,
-g

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2413205

[C. Michael Pilato]

r40367.  Thanks.  (See what coding at awful hours in foreign timezones causes?)

Greg Stein wrote:

> On Thu, Oct 29, 2009 at 22:58, C. Michael Pilato <cmpilato@...> wrote:
>> ...
>> +++ trunk/subversion/libsvn_wc/wc-queries.sql   Thu Oct 29 19:58:01 2009        (r40308)
>> @@ -164,6 +164,12 @@ where wc_id = ?1 and local_relpath = ?2;
>>  delete from lock
>>  where repos_id = ?1 and repos_relpath = ?2;
>>
>> +-- STMT_CLEAR_BASE_RECURSIVE_DAV_CACHE
>> +update base_node set dav_cache = ?4
>> +where dav_cache is not null and wc_id = ?1 and
>> +  (local_relpath = ?2 or
>> +   local_relpath like ?3 escape '#');
>
> This can be simplified with: set dav_cache = null
>
> No need to use a parameter here.
>
>> ...
>> +++ trunk/subversion/libsvn_wc/wc_db.c  Thu Oct 29 19:58:01 2009        (r40308)
>> @@ -3702,6 +3702,14 @@ relocate_txn(void *baton, svn_sqlite__db
>>      base_node in the first place. */
>>   if (rb->have_base_node)
>>     {
>> +      /* Purge the DAV cache (wcprops) from any BASE that have 'em. */
>> +      SVN_ERR(svn_sqlite__get_statement(&stmt, sdb,
>> +                                        STMT_CLEAR_BASE_RECURSIVE_DAV_CACHE));
>> +      SVN_ERR(svn_sqlite__bindf(stmt, "iss", rb->wc_id, rb->local_relpath,
>> +                                like_arg));
>> +      SVN_ERR(svn_sqlite__bind_properties(stmt, 4, NULL, scratch_pool));
>> +      SVN_ERR(svn_sqlite__step_done(stmt));
>
> The bind_properties() can be skipped, since 'null' will be the
> default. But with the above change, then even this won't be necessary.
>
>> ...
>
> Cheers,
> -g
>
> ------------------------------------------------------
> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2413205

--
C. Michael Pilato <cmpilato@...>
CollabNet   <>   www.collab.net   <>   Distributed Development On Demand

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2414263