subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danie...@apache.org
Subject svn commit: r1213716 - in /subversion/trunk/subversion/libsvn_fs_fs: fs_fs.c rep-cache.c
Date Tue, 13 Dec 2011 14:37:49 GMT
Author: danielsh
Date: Tue Dec 13 14:37:48 2011
New Revision: 1213716

URL: http://svn.apache.org/viewvc?rev=1213716&view=rev
Log:
Follow-up to r1213681: also prune the rep-cache when it's present
but reportedly not being used.

* subversion/libsvn_fs_fs/fs_fs.c
  (recover_body): Relax condition.

* subversion/libsvn_fs_fs/rep-cache.c
  (svn_fs_fs__del_rep_reference): Relax assertion.

Modified:
    subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
    subversion/trunk/subversion/libsvn_fs_fs/rep-cache.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=1213716&r1=1213715&r2=1213716&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c Tue Dec 13 14:37:48 2011
@@ -7054,7 +7054,7 @@ recover_body(void *baton, apr_pool_t *po
     }
 
   /* Prune younger-than-(newfound-youngest) revisions from the rep cache. */
-  if (ffd->rep_sharing_allowed)
+  if (ffd->format >= SVN_FS_FS__MIN_REP_SHARING_FORMAT)
     SVN_ERR(svn_fs_fs__del_rep_reference(fs, max_rev, pool));
 
   /* Now store the discovered youngest revision, and the next IDs if

Modified: subversion/trunk/subversion/libsvn_fs_fs/rep-cache.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/rep-cache.c?rev=1213716&r1=1213715&r2=1213716&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/rep-cache.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/rep-cache.c Tue Dec 13 14:37:48 2011
@@ -341,7 +341,7 @@ svn_fs_fs__del_rep_reference(svn_fs_t *f
   fs_fs_data_t *ffd = fs->fsap_data;
   svn_sqlite__stmt_t *stmt;
 
-  SVN_ERR_ASSERT(ffd->rep_sharing_allowed);
+  SVN_ERR_ASSERT(ffd->format >= SVN_FS_FS__MIN_REP_SHARING_FORMAT);
   if (! ffd->rep_cache_db)
     SVN_ERR(svn_fs_fs__open_rep_cache(fs, pool));
 



Mime
View raw message