svn commit: r1213690 - in /subversion/trunk/subversion/libsvn_fs_fs: rep-cache-db.sql rep-cache.c

[ph...@apache.org]

Author: philip
Date: Tue Dec 13 13:40:29 2011
New Revision: 1213690

URL: http://svn.apache.org/viewvc?rev=1213690&view=rev
Log:
* subversion/libsvn_fs_fs/rep-cache-db.sql
  (STMT_DEL_REPS_YOUNGER_THAN_REV): Only remove younger rows to make
   the behaviour match the name.

* subversion/libsvn_fs_fs/rep-cache.c
  (svn_fs_fs__del_rep_reference): No need to increment revision, drop
   unnecessary variable.

Modified:
    subversion/trunk/subversion/libsvn_fs_fs/rep-cache-db.sql
    subversion/trunk/subversion/libsvn_fs_fs/rep-cache.c

Modified: subversion/trunk/subversion/libsvn_fs_fs/rep-cache-db.sql
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/rep-cache-db.sql?rev=1213690&r1=1213689&r2=1213690&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/rep-cache-db.sql (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/rep-cache-db.sql Tue Dec 13 13:40:29 2011
@@ -54,6 +54,6 @@ FROM rep_cache
 
 -- STMT_DEL_REPS_YOUNGER_THAN_REV
 DELETE FROM rep_cache
-WHERE revision >= ?1
+WHERE revision > ?1
 
 

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=1213690&r1=1213689&r2=1213690&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/rep-cache.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/rep-cache.c Tue Dec 13 13:40:29 2011
@@ -340,7 +340,6 @@ svn_fs_fs__del_rep_reference(svn_fs_t *f
 {
   fs_fs_data_t *ffd = fs->fsap_data;
   svn_sqlite__stmt_t *stmt;
-  svn_boolean_t have_row;
 
   SVN_ERR_ASSERT(ffd->rep_sharing_allowed);
   if (! ffd->rep_cache_db)
@@ -348,9 +347,8 @@ svn_fs_fs__del_rep_reference(svn_fs_t *f
 
   SVN_ERR(svn_sqlite__get_statement(&stmt, ffd->rep_cache_db,
                                     STMT_DEL_REPS_YOUNGER_THAN_REV));
-  SVN_ERR(svn_sqlite__bindf(stmt, "r", youngest+1));
-  SVN_ERR(svn_sqlite__step(&have_row, stmt));
-  /* ignore HAVE_ROW */
+  SVN_ERR(svn_sqlite__bindf(stmt, "r", youngest));
+  SVN_ERR(svn_sqlite__step_done(stmt));
 
   SVN_ERR(svn_sqlite__reset(stmt));
   return SVN_NO_ERROR;