subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stef...@apache.org
Subject svn commit: r1619860 - in /subversion/branches/revprop-caching-ng/subversion: libsvn_fs_fs/revprops.c tests/libsvn_fs_fs/fs-fs-pack-test.c
Date Fri, 22 Aug 2014 16:40:06 GMT
Author: stefan2
Date: Fri Aug 22 16:40:05 2014
New Revision: 1619860

URL: http://svn.apache.org/r1619860
Log:
On the revprop-caching-ng branch:  Always bump the generation upon
changing existing revprops - even if revprop caching has not been
enabled for the repo.

* subversion/libsvn_fs_fs/revprops.c
  (svn_fs_fs__set_revision_proplist): The criterion is that we can
                                      support caching, not that we
                                      use it. Somebody else might.

* subversion/tests/libsvn_fs_fs/fs-fs-pack-test.c
  (test_funcs): revprop_caching_on_off passes now.

Modified:
    subversion/branches/revprop-caching-ng/subversion/libsvn_fs_fs/revprops.c
    subversion/branches/revprop-caching-ng/subversion/tests/libsvn_fs_fs/fs-fs-pack-test.c

Modified: subversion/branches/revprop-caching-ng/subversion/libsvn_fs_fs/revprops.c
URL: http://svn.apache.org/viewvc/subversion/branches/revprop-caching-ng/subversion/libsvn_fs_fs/revprops.c?rev=1619860&r1=1619859&r2=1619860&view=diff
==============================================================================
--- subversion/branches/revprop-caching-ng/subversion/libsvn_fs_fs/revprops.c (original)
+++ subversion/branches/revprop-caching-ng/subversion/libsvn_fs_fs/revprops.c Fri Aug 22 16:40:05
2014
@@ -1397,6 +1397,7 @@ svn_fs_fs__set_revision_proplist(svn_fs_
   const char *tmp_path;
   const char *perms_reference;
   apr_array_header_t *files_to_delete = NULL;
+  fs_fs_data_t *ffd = fs->fsap_data;
 
   SVN_ERR(svn_fs_fs__ensure_revision_exists(rev, fs, pool));
 
@@ -1404,8 +1405,9 @@ svn_fs_fs__set_revision_proplist(svn_fs_
   is_packed = svn_fs_fs__is_packed_revprop(fs, rev);
 
   /* Test whether revprops already exist for this revision.
-   * Only then will we need to bump the revprop generation. */
-  if (has_revprop_cache(fs, pool))
+   * Only then will we need to bump the revprop generation.
+   * The fact that they did not yet exist is never cached. */
+  if (ffd->format >= SVN_FS_FS__MIN_REVPROP_CACHING_FORMAT)
     {
       if (is_packed)
         {

Modified: subversion/branches/revprop-caching-ng/subversion/tests/libsvn_fs_fs/fs-fs-pack-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/revprop-caching-ng/subversion/tests/libsvn_fs_fs/fs-fs-pack-test.c?rev=1619860&r1=1619859&r2=1619860&view=diff
==============================================================================
--- subversion/branches/revprop-caching-ng/subversion/tests/libsvn_fs_fs/fs-fs-pack-test.c
(original)
+++ subversion/branches/revprop-caching-ng/subversion/tests/libsvn_fs_fs/fs-fs-pack-test.c
Fri Aug 22 16:40:05 2014
@@ -1266,9 +1266,8 @@ static struct svn_test_descriptor_t test
                        "upgrade txns started before svnadmin upgrade"),
     SVN_TEST_OPTS_PASS(metadata_checksumming,
                        "metadata checksums being checked"),
-    SVN_TEST_OPTS_WIMP(revprop_caching_on_off,
-                       "change revprops with enabled and disabled caching",
-                       "fails with FSFS / svn_named_atomic__is_efficient()"),
+    SVN_TEST_OPTS_PASS(revprop_caching_on_off,
+                       "change revprops with enabled and disabled caching"),
     SVN_TEST_NULL
   };
 



Mime
View raw message