[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: [VOTE] Merging 1.9-cache-improvements to /trunk

From: Ivan Zhakov <ivan_at_visualsvn.com>
Date: Fri, 15 May 2015 14:28:23 +0300

On 14 May 2015 at 15:37, Branko Čibej <brane_at_wandisco.com> wrote:
> On 13.05.2015 19:04, Ivan Zhakov wrote:
>> [adjusting subject to make it valid vote thread]
>>
>> On 13 May 2015 at 19:23, Stefan Fuhrmann <stefan.fuhrmann_at_wandisco.com> wrote:
>>> Hi there,
>>>
>>> Ivan has reviewed my recent membuffer cache
>>> key handling changes, corrected and backported
>>> them on the 1.9-cache-improvements branch.
>>>
>>> I reviewed it and I'm +1 on merging it to /trunk -
>>> hoping we may even get it into 1.9. Since this
>>> touches a sensitive part of the server code, I'd
>>> like to see 2 more +1s for the branch->/trunk
>>> merge.
>>>
>> +1.
>>
>> PS: I think detailed log message will be useful for reviewers. I'll
>> make it tomorrow if you didn't outstrip me.
>
> -0 because:
>
> $ make
> .../subversion/libsvn_subr/cache-membuffer.c:2626:59: warning: implicit conversion loses integer
> precision: 'unsigned long' to 'apr_uint32_t' (aka 'unsigned int') [-Wshorten-64-to-32]
> cache->combined_key.entry_key.key_len = aligned_key_len + prefix_len;
> ~ ~~~~~~~~~~~~~~~~^~~~~~~~~~~~
> .../subversion/libsvn_subr/cache-membuffer.c:2664:58: warning: implicit conversion loses integer
> precision: 'unsigned long' to 'apr_uint32_t' (aka 'unsigned int') [-Wshorten-64-to-32]
> cache->combined_key.entry_key.key_len = prefix_len + 16;
> ~ ~~~~~~~~~~~^~~~
> .../subversion/libsvn_subr/cache-membuffer.c:3161:37: warning: implicit conversion loses integer
> precision: 'apr_size_t' (aka 'unsigned long') to 'apr_uint32_t' (aka 'unsigned int') [-Wshorten-64-to-32]
> cache->prefix.entry_key.key_len = prefix_len;
> ~ ^~~~~~~~~~
> 3 warnings generated.
>
> +1 if these warnings get fixed before or as part of the merge without
> adding casts.
>

I suggest attached patch to resolve these warnings.

Log message:
[[[
* subversion/libsvn_subr/cache-membuffer.c
  (entry_key_t): Change type of KEY_LEN field to apr_size_t instead of
   apr_uint32_t.
]]]

-- 
Ivan Zhakov

Received on 2015-05-15 13:29:01 CEST

This is an archived mail posted to the Subversion Dev mailing list.