svn commit: r1345875 - /subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c

[st...@apache.org]

Author: stefan2
Date: Mon Jun  4 08:55:06 2012
New Revision: 1345875

URL: http://svn.apache.org/viewvc?rev=1345875&view=rev
Log:
For now, ensure that directory deltification works well with APR 1.4.6
and newer despite the change in APR's hash implementation. Add a
TODO to provide a more appropriate solution here in the future.

* subversion/libsvn_fs_fs/fs_fs.c
  (unparse_dir_entries): instantiate "stable" hash

Modified:
    subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c

Modified: subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c?rev=1345875&r1=1345874&r2=1345875&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c Mon Jun  4 08:55:06 2012
@@ -4184,7 +4184,14 @@ unparse_dir_entries(apr_hash_t **str_ent
 {
   apr_hash_index_t *hi;
 
-  *str_entries_p = apr_hash_make(pool);
+  /* For now, we use a our own hash function to ensure that we get a
+   * (largely) stable order when serializing the data.  It also gives
+   * us some performance improvement.
+   *
+   * ### TODO ###
+   * Use some sorted or other fixed order data container.
+   */
+  *str_entries_p = svn_hash__make(pool);
 
   for (hi = apr_hash_first(pool, entries); hi; hi = apr_hash_next(hi))
     {