Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@subversion.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1341009 - in /subversion/trunk/subversion:
 libsvn_subr/io.c
 libsvn_subr/skel.c libsvn_wc/wc_db.c
Date: Mon, 21 May 2012 13:23:49 -0000
To: commits@subversion.apache.org
From: stsp@apache.org
Message-Id: <20120521132349.ED4DD2388865@eris.apache.org>

Author: stsp
Date: Mon May 21 13:23:49 2012
New Revision: 1341009

URL: http://svn.apache.org/viewvc?rev=1341009&view=rev
Log:
Revert r1338350. It has been met with objection on the dev@ list:
http://svn.haxx.se/dev/archive-2012-05/0239.shtml
The random output problem will be fixed in future revisions by sorting hash
table keys instead of relying on a hash function with stable key ordering.

Modified:
    subversion/trunk/subversion/libsvn_subr/io.c
    subversion/trunk/subversion/libsvn_subr/skel.c
    subversion/trunk/subversion/libsvn_wc/wc_db.c

Modified: subversion/trunk/subversion/libsvn_subr/io.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/io.c?rev=1341009&r1=1341008&r2=1341009&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/io.c (original)
+++ subversion/trunk/subversion/libsvn_subr/io.c Mon May 21 13:23:49 2012
@@ -65,7 +65,6 @@
 
 #include "private/svn_atomic.h"
 #include "private/svn_io_private.h"
-#include "private/svn_subr_private.h"
 
 #define SVN_SLEEP_ENV_VAR "SVN_I_LOVE_CORRUPTED_WORKING_COPIES_SO_DISABLE_SLEEP_FOR_TIMESTAMPS"
 

@@ -2395,7 +2394,7 @@ svn_io_get_dirents3(apr_hash_t **dirents
   if (!only_check_type)
     flags |= APR_FINFO_SIZE | APR_FINFO_MTIME;
 
-  *dirents = svn_hash__make(result_pool);
+  *dirents = apr_hash_make(result_pool);
 
   SVN_ERR(svn_io_dir_open(&this_dir, path, scratch_pool));
 

Modified: subversion/trunk/subversion/libsvn_subr/skel.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/skel.c?rev=1341009&r1=1341008&r2=1341009&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/skel.c (original)
+++ subversion/trunk/subversion/libsvn_subr/skel.c Mon May 21 13:23:49 2012
@@ -25,7 +25,6 @@
 #include "svn_error.h"
 #include "private/svn_skel.h"
 #include "private/svn_string_private.h"
-#include "private/svn_subr_private.h"
 
 

 /* Parsing skeletons.  */
@@ -681,7 +680,7 @@ svn_skel__parse_proplist(apr_hash_t **pr
     return skel_err("proplist");
 
   /* Create the returned structure */
-  proplist = svn_hash__make(pool);
+  proplist = apr_hash_make(pool);
   for (elt = skel->children; elt; elt = elt->next->next)
     {
       svn_string_t *value = svn_string_ncreate(elt->next->data,

Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=1341009&r1=1341008&r2=1341009&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Mon May 21 13:23:49 2012
@@ -51,7 +51,6 @@
 #include "private/svn_skel.h"
 #include "private/svn_wc_private.h"
 #include "private/svn_token.h"
-#include "private/svn_subr_private.h"
 
 
 #define NOT_IMPLEMENTED() SVN__NOT_IMPLEMENTED()
@@ -1187,7 +1186,7 @@ gather_children2(const apr_array_header_
                  apr_pool_t *result_pool,
                  apr_pool_t *scratch_pool)
 {
-  apr_hash_t *names_hash = svn_hash__make(scratch_pool);
+  apr_hash_t *names_hash = apr_hash_make(scratch_pool);
   apr_array_header_t *names_array;
 
   /* All of the names get allocated in RESULT_POOL.  It
@@ -1211,7 +1210,7 @@ gather_children(const apr_array_header_t
                 apr_pool_t *result_pool,
                 apr_pool_t *scratch_pool)
 {
-  apr_hash_t *names_hash = svn_hash__make(scratch_pool);
+  apr_hash_t *names_hash = apr_hash_make(scratch_pool);
   apr_array_header_t *names_array;
 
   /* All of the names get allocated in RESULT_POOL.  It
@@ -2211,7 +2210,7 @@ svn_wc__db_base_get_children_info(apr_ha
                               dir_abspath, scratch_pool, scratch_pool));
   VERIFY_USABLE_WCROOT(wcroot);
 
-  *nodes = svn_hash__make(result_pool);
+  *nodes = apr_hash_make(result_pool);
 
   SVN_ERR(svn_sqlite__get_statement(&stmt, wcroot->sdb,
                                     STMT_SELECT_BASE_CHILDREN_INFO));
@@ -7727,8 +7726,8 @@ svn_wc__db_read_children_info(apr_hash_t
   svn_wc__db_wcroot_t *wcroot;
   const char *dir_relpath;
 
-  *conflicts = svn_hash__make(result_pool);
-  *nodes = svn_hash__make(result_pool);
+  *conflicts = apr_hash_make(result_pool);
+  *nodes = apr_hash_make(result_pool);
   SVN_ERR_ASSERT(svn_dirent_is_absolute(dir_abspath));
 
   SVN_ERR(svn_wc__db_wcroot_parse_local_abspath(&wcroot, &dir_relpath, db,
@@ -7921,7 +7920,7 @@ svn_wc__db_read_children_walker_info(apr
   SVN_ERR(svn_sqlite__bindf(stmt, "is", wcroot->wc_id, dir_relpath));
   SVN_ERR(svn_sqlite__step(&have_row, stmt));
 
-  *nodes = svn_hash__make(result_pool);
+  *nodes = apr_hash_make(result_pool);
   while (have_row)
     {
       struct svn_wc__db_walker_info_t *child;