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 2011/05/22 19:24:49 UTC
svn commit: r1126111 - in /subversion/trunk/subversion:
include/svn_cache_config.h libsvn_fs_fs/caching.c
libsvn_subr/svn_cache_config.c
Author: stefan2
Date: Sun May 22 17:24:49 2011
New Revision: 1126111
URL: http://svn.apache.org/viewvc?rev=1126111&view=rev
Log:
Finally remove FS-specific caching flags from global cache config.
* subversion/include/svn_cache_config.h
(svn_cache_config_t): drop cache_fulltexts and cache_txdeltas members
* subversion/libsvn_subr/svn_cache_config.c
(cache_settings): don't default-initialize them anymore
* subversion/libsvn_fs_fs/caching.c
(read_config): move defaults here, including commentary
Modified:
subversion/trunk/subversion/include/svn_cache_config.h
subversion/trunk/subversion/libsvn_fs_fs/caching.c
subversion/trunk/subversion/libsvn_subr/svn_cache_config.c
Modified: subversion/trunk/subversion/include/svn_cache_config.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_cache_config.h?rev=1126111&r1=1126110&r2=1126111&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_cache_config.h (original)
+++ subversion/trunk/subversion/include/svn_cache_config.h Sun May 22 17:24:49 2011
@@ -54,12 +54,6 @@ typedef struct svn_cache_config_t
/** maximum number of files kept open */
apr_size_t file_handle_count;
- /** shall fulltexts be cached? */
- svn_boolean_t cache_fulltexts;
-
- /** shall text deltas be cached? */
- svn_boolean_t cache_txdeltas;
-
/** is this application guaranteed to be single-threaded? */
svn_boolean_t single_threaded;
} svn_cache_config_t;
Modified: subversion/trunk/subversion/libsvn_fs_fs/caching.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/caching.c?rev=1126111&r1=1126110&r2=1126111&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/caching.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/caching.c Sun May 22 17:24:49 2011
@@ -53,14 +53,27 @@ read_config(svn_memcache_t **memcache_p,
SVN_ERR(svn_cache__make_memcache_from_config(memcache_p, ffd->config,
fs->pool));
+ /* don't cache text deltas by default.
+ * Once we reconstructed the fulltexts from the deltas,
+ * these deltas are rarely re-used. Therefore, only tools
+ * like svnadmin will activate this to speed up operations
+ * dump and verify.
+ */
*cache_txdeltas
= svn_hash_get_bool(fs->config,
SVN_FS_CONFIG_FSFS_CACHE_DELTAS,
- svn_get_cache_config()->cache_txdeltas);
+ FALSE);
+ /* by default, cache fulltexts.
+ * Most SVN tools care about reconstructed file content.
+ * Thus, this is a reasonable default.
+ * SVN admin tools may set that to FALSE because fulltexts
+ * won't be re-used rendering the cache less effective
+ * by squeezing wanted data out.
+ */
*cache_fulltexts
= svn_hash_get_bool(fs->config,
SVN_FS_CONFIG_FSFS_CACHE_FULLTEXTS,
- svn_get_cache_config()->cache_fulltexts);
+ TRUE);
return svn_config_get_bool(ffd->config, fail_stop,
CONFIG_SECTION_CACHES, CONFIG_OPTION_FAIL_STOP,
Modified: subversion/trunk/subversion/libsvn_subr/svn_cache_config.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/svn_cache_config.c?rev=1126111&r1=1126110&r2=1126111&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/svn_cache_config.c (original)
+++ subversion/trunk/subversion/libsvn_subr/svn_cache_config.c Sun May 22 17:24:49 2011
@@ -52,19 +52,6 @@ static svn_cache_config_t cache_settings
* has little impact on performance and a more modest
* value (< 100) may be more suitable.
*/
- TRUE, /* cache fulltexts.
- * Most SVN tools care about reconstructed file content.
- * Thus, this is a reasonable default.
- * SVN admin tools may set that to FALSE because fulltexts
- * won't be re-used rendering the cache less effective
- * by squeezing wanted data out.
- */
- FALSE, /* don't cache text deltas.
- * Once we reconstructed the fulltexts from the deltas,
- * these deltas are rarely re-used. Therefore, only tools
- * like svnadmin will activate this to speed up operations
- * dump and verify.
- */
#ifdef APR_HAS_THREADS
FALSE /* assume multi-threaded operation.
* Because this simply activates proper synchronization