svn commit: r1679020 - /subversion/branches/1.9-cache-improvements/subversion/libsvn_subr/cache-membuffer.c

[iv...@apache.org]

Author: ivan
Date: Tue May 12 18:07:08 2015
New Revision: 1679020

URL: http://svn.apache.org/r1679020
Log:
On the '1.9-cache-improvements' branch: Fix a bug when only cache prefix
will be compared in case of hash collision for fixed size keys in membuffer
cache.

* subversion/libsvn_subr/cache-membuffer.c
  (combine_key): Initialize COMBINED_KEY.ENTRY_KEY.KEY_LEN properly.

Modified:
    subversion/branches/1.9-cache-improvements/subversion/libsvn_subr/cache-membuffer.c

Modified: subversion/branches/1.9-cache-improvements/subversion/libsvn_subr/cache-membuffer.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.9-cache-improvements/subversion/libsvn_subr/cache-membuffer.c?rev=1679020&r1=1679019&r2=1679020&view=diff
==============================================================================
--- subversion/branches/1.9-cache-improvements/subversion/libsvn_subr/cache-membuffer.c (original)
+++ subversion/branches/1.9-cache-improvements/subversion/libsvn_subr/cache-membuffer.c Tue May 12 18:07:08 2015
@@ -2666,6 +2666,8 @@ combine_key(svn_membuffer_cache_t *cache
       data[1] = 0;
       memcpy(data, key, key_len);
 
+      cache->combined_key.entry_key.key_len = prefix_len + 16;
+
       /* scramble key DATA.  All of this must be reversible to prevent key
        * collisions.  So, we limit ourselves to xor and permutations. */
       data[1] = (data[1] << 27) | (data[1] >> 37);