You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2015/05/13 07:13:45 UTC
svn commit: r1679143 - in /subversion/branches/1.10-cache-improvements: ./
subversion/libsvn_subr/cache-membuffer.c
Author: stefan2
Date: Wed May 13 05:13:44 2015
New Revision: 1679143
URL: http://svn.apache.org/r1679143
Log:
On the 1.10-cache-improvements branch:
Merge r1679015 and R1679022 (key length handling fixes) from
1.9-cache-improvements branch and resolve one text conflict.
Modified:
subversion/branches/1.10-cache-improvements/ (props changed)
subversion/branches/1.10-cache-improvements/subversion/libsvn_subr/cache-membuffer.c
Propchange: subversion/branches/1.10-cache-improvements/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 05:13:44 2015
@@ -1,6 +1,6 @@
/subversion/branches/1.5.x-r30215:870312
/subversion/branches/1.7.x-fs-verify:1146708,1161180
-/subversion/branches/1.9-cache-improvements:1678990,1679000
+/subversion/branches/1.9-cache-improvements:1678990,1679000,1679015,1679022
/subversion/branches/10Gb:1388102,1388163-1388190,1388195,1388202,1388205,1388211,1388276,1388362,1388375,1388394,1388636,1388639-1388640,1388643-1388644,1388654,1388720,1388789,1388795,1388801,1388805,1388807,1388810,1388816,1389044,1389276,1389289,1389662,1389867,1390017,1390209,1390216,1390407,1390409,1390414,1390419,1390955
/subversion/branches/atomic-revprop:965046-1000689
/subversion/branches/authzperf:1615360
Modified: subversion/branches/1.10-cache-improvements/subversion/libsvn_subr/cache-membuffer.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.10-cache-improvements/subversion/libsvn_subr/cache-membuffer.c?rev=1679143&r1=1679142&r2=1679143&view=diff
==============================================================================
--- subversion/branches/1.10-cache-improvements/subversion/libsvn_subr/cache-membuffer.c (original)
+++ subversion/branches/1.10-cache-improvements/subversion/libsvn_subr/cache-membuffer.c Wed May 13 05:13:44 2015
@@ -2799,7 +2799,7 @@ combine_long_key(svn_membuffer_cache_t *
{
apr_uint32_t *digest_buffer;
char *key_copy;
- apr_size_t prefix_len = cache->prefix.full_key.size;
+ apr_size_t prefix_len = cache->prefix.entry_key.key_len;
apr_size_t aligned_key_len;
/* handle variable-length keys */
@@ -2809,7 +2809,7 @@ combine_long_key(svn_membuffer_cache_t *
/* Combine keys. */
aligned_key_len = ALIGN_VALUE(key_len);
svn_membuf__ensure(&cache->combined_key.full_key,
- key_len + prefix_len);
+ aligned_key_len + prefix_len);
key_copy = (char *)cache->combined_key.full_key.data + prefix_len;
cache->combined_key.entry_key.key_len = aligned_key_len + prefix_len;