You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2014/09/22 13:00:30 UTC
svn commit: r1626729 - in /subversion/branches/1.8.x-r1619774: ./
subversion/libsvn_fs_fs/caching.c
Author: stefan2
Date: Mon Sep 22 11:00:30 2014
New Revision: 1626729
URL: http://svn.apache.org/r1626729
Log:
Merge r1543594,1619774 from /trunk without conflicts.
This contains the actual patch.
Modified:
subversion/branches/1.8.x-r1619774/ (props changed)
subversion/branches/1.8.x-r1619774/subversion/libsvn_fs_fs/caching.c
Propchange: subversion/branches/1.8.x-r1619774/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1543594,1619774
Modified: subversion/branches/1.8.x-r1619774/subversion/libsvn_fs_fs/caching.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x-r1619774/subversion/libsvn_fs_fs/caching.c?rev=1626729&r1=1626728&r2=1626729&view=diff
==============================================================================
--- subversion/branches/1.8.x-r1619774/subversion/libsvn_fs_fs/caching.c (original)
+++ subversion/branches/1.8.x-r1619774/subversion/libsvn_fs_fs/caching.c Mon Sep 22 11:00:30 2014
@@ -89,7 +89,7 @@ read_config(svn_memcache_t **memcache_p,
fs_fs_data_t *ffd = fs->fsap_data;
SVN_ERR(svn_cache__make_memcache_from_config(memcache_p, ffd->config,
- fs->pool));
+ fs->pool));
/* No cache namespace by default. I.e. all FS instances share the
* cached data. If you specify different namespaces, the data will
@@ -129,23 +129,9 @@ read_config(svn_memcache_t **memcache_p,
SVN_FS_CONFIG_FSFS_CACHE_FULLTEXTS,
TRUE);
- /* don't cache revprops by default.
- * Revprop caching significantly speeds up operations like
- * svn ls -v. However, it requires synchronization that may
- * not be available or efficient in the current server setup.
- *
- * If the caller chose option "2", enable revprop caching if
- * the required API support is there to make it efficient.
+ /* For now, always disable revprop caching.
*/
- if (strcmp(svn_hash__get_cstring(fs->config,
- SVN_FS_CONFIG_FSFS_CACHE_REVPROPS,
- ""), "2"))
- *cache_revprops
- = svn_hash__get_bool(fs->config,
- SVN_FS_CONFIG_FSFS_CACHE_REVPROPS,
- FALSE);
- else
- *cache_revprops = svn_named_atomic__is_efficient();
+ *cache_revprops = FALSE;
return svn_config_get_bool(ffd->config, fail_stop,
CONFIG_SECTION_CACHES, CONFIG_OPTION_FAIL_STOP,