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 2013/07/01 22:39:59 UTC
svn commit: r1498677 - in /subversion/branches/fsfs-format7/subversion:
libsvn_fs_x/caching.c libsvn_fs_x/fs.c libsvn_fs_x/fs.h libsvn_fs_x/fs_x.c
libsvn_fs_x/hotcopy.c libsvn_fs_x/low_level.c tests/svn_test_fs.c
Author: stefan2
Date: Mon Jul 1 20:39:59 2013
New Revision: 1498677
URL: http://svn.apache.org/r1498677
Log:
On the fsfs-format7 branch: Remove further references to FSFS from
the FSX code, in particular file names and user visible strings.
* subversion/libsvn_fs_x/caching.c
(svn_fs_x__initialize_caches,
svn_fs_x__initialize_txn_caches): cache prefix is now "fsx"
* subversion/libsvn_fs_x/fs.c
(SVN_FSFS_SHARED_USERDATA_PREFIX): replace with ...
(SVN_FSX_SHARED_USERDATA_PREFIX): ... this one
(x_serialized_init): update; change error strings
* subversion/libsvn_fs_x/fs.h
(PATH_CONFIG): change name of FS-specific config file
* subversion/libsvn_fs_x/fs_x.c
(write_config): say "FSX" instead of "FSFS" in config file template
* subversion/libsvn_fs_x/hotcopy.c
(hotcopy_incremental_check_preconditions): update error message
* subversion/libsvn_fs_x/low_level.c
(FSFS_MAX_PATH_LEN): rename to ...
(FSX_MAX_PATH_LEN): ... this
(MAX_CHANGE_LINE_LEN): update
* subversion/tests/svn_test_fs.c
(maybe_install_fsfs_conf): rename to ...
(maybe_install_fs_conf): ... this; support config files for fsx as well
(svn_test__create_fs,
svn_test__create_repos): update callers
Modified:
subversion/branches/fsfs-format7/subversion/libsvn_fs_x/caching.c
subversion/branches/fsfs-format7/subversion/libsvn_fs_x/fs.c
subversion/branches/fsfs-format7/subversion/libsvn_fs_x/fs.h
subversion/branches/fsfs-format7/subversion/libsvn_fs_x/fs_x.c
subversion/branches/fsfs-format7/subversion/libsvn_fs_x/hotcopy.c
subversion/branches/fsfs-format7/subversion/libsvn_fs_x/low_level.c
subversion/branches/fsfs-format7/subversion/tests/svn_test_fs.c
Modified: subversion/branches/fsfs-format7/subversion/libsvn_fs_x/caching.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_fs_x/caching.c?rev=1498677&r1=1498676&r2=1498677&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_fs_x/caching.c (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_fs_x/caching.c Mon Jul 1 20:39:59 2013
@@ -376,7 +376,7 @@ svn_fs_x__initialize_caches(svn_fs_t *fs
{
fs_x_data_t *ffd = fs->fsap_data;
const char *prefix = apr_pstrcat(pool,
- "fsfs:", fs->uuid,
+ "fsx:", fs->uuid,
"/", normalize_key_part(fs->path, pool),
":",
(char *)NULL);
@@ -819,7 +819,7 @@ svn_fs_x__initialize_txn_caches(svn_fs_t
to start a new transaction later that receives the same id.
Therefore, throw in a uuid as well - just to be sure. */
const char *prefix = apr_pstrcat(pool,
- "fsfs:", fs->uuid,
+ "fsx:", fs->uuid,
"/", fs->path,
":", txn_id,
":", svn_uuid_generate(pool), ":",
Modified: subversion/branches/fsfs-format7/subversion/libsvn_fs_x/fs.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_fs_x/fs.c?rev=1498677&r1=1498676&r2=1498677&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_fs_x/fs.c (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_fs_x/fs.c Mon Jul 1 20:39:59 2013
@@ -52,7 +52,7 @@
/* A prefix for the pool userdata variables used to hold
per-filesystem shared data. See fs_serialized_init. */
-#define SVN_FSFS_SHARED_USERDATA_PREFIX "svn-fsfs-shared-"
+#define SVN_FSX_SHARED_USERDATA_PREFIX "svn-fsx-shared-"
@@ -81,11 +81,11 @@ x_serialized_init(svn_fs_t *fs, apr_pool
repository. */
SVN_ERR_ASSERT(fs->uuid);
- key = apr_pstrcat(pool, SVN_FSFS_SHARED_USERDATA_PREFIX, fs->uuid,
+ key = apr_pstrcat(pool, SVN_FSX_SHARED_USERDATA_PREFIX, fs->uuid,
(char *) NULL);
status = apr_pool_userdata_get(&val, key, common_pool);
if (status)
- return svn_error_wrap_apr(status, _("Can't fetch FSFS shared data"));
+ return svn_error_wrap_apr(status, _("Can't fetch FSX shared data"));
ffsd = val;
if (!ffsd)
@@ -109,7 +109,7 @@ x_serialized_init(svn_fs_t *fs, apr_pool
key = apr_pstrdup(common_pool, key);
status = apr_pool_userdata_set(ffsd, key, NULL, common_pool);
if (status)
- return svn_error_wrap_apr(status, _("Can't store FSFS shared data"));
+ return svn_error_wrap_apr(status, _("Can't store FSX shared data"));
}
ffd->shared = ffsd;
Modified: subversion/branches/fsfs-format7/subversion/libsvn_fs_x/fs.h
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_fs_x/fs.h?rev=1498677&r1=1498676&r2=1498677&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_fs_x/fs.h (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_fs_x/fs.h Mon Jul 1 20:39:59 2013
@@ -75,8 +75,8 @@ extern "C" {
to-phys index */
#define PATH_EXT_P2L_INDEX ".p2l" /* extension of the phys-
to-log index */
-/* If you change this, look at tests/svn_test_fs.c(maybe_install_fsfs_conf) */
-#define PATH_CONFIG "fsfs.conf" /* Configuration */
+/* If you change this, look at tests/svn_test_fs.c(maybe_install_fsx_conf) */
+#define PATH_CONFIG "fsx.conf" /* Configuration */
/* Names of special files and file extensions for transactions */
#define PATH_CHANGES "changes" /* Records changes made so far */
Modified: subversion/branches/fsfs-format7/subversion/libsvn_fs_x/fs_x.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_fs_x/fs_x.c?rev=1498677&r1=1498676&r2=1498677&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_fs_x/fs_x.c (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_fs_x/fs_x.c Mon Jul 1 20:39:59 2013
@@ -269,13 +269,13 @@ write_config(svn_fs_t *fs,
apr_pool_t *pool)
{
#define NL APR_EOL_STR
- static const char * const fsfs_conf_contents =
-"### This file controls the configuration of the FSFS filesystem." NL
+ static const char * const fsx_conf_contents =
+"### This file controls the configuration of the FSX filesystem." NL
"" NL
"[" SVN_CACHE_CONFIG_CATEGORY_MEMCACHED_SERVERS "]" NL
-"### These options name memcached servers used to cache internal FSFS" NL
+"### These options name memcached servers used to cache internal FSX" NL
"### data. See http://www.danga.com/memcached/ for more information on" NL
-"### memcached. To use memcached with FSFS, run one or more memcached" NL
+"### memcached. To use memcached with FSX, run one or more memcached" NL
"### servers, and specify each of them as an option like so:" NL
"# first-server = 127.0.0.1:11211" NL
"# remote-memcached = mymemcached.corp.example.com:11212" NL
@@ -356,7 +356,7 @@ write_config(svn_fs_t *fs,
"### For 1.8, the default value is 1023; earlier versions have no limit." NL
"# " CONFIG_OPTION_MAX_DELTIFICATION_WALK " = 1023" NL
"###" NL
-"### The skip-delta scheme used by FSFS tends to repeatably store redundant" NL
+"### The skip-delta scheme used by FSX tends to repeatably store redundant" NL
"### delta information where a simple delta against the latest version is" NL
"### often smaller. By default, 1.8+ will therefore use skip deltas only" NL
"### after the linear chain of deltas has grown beyond the threshold" NL
@@ -450,7 +450,7 @@ write_config(svn_fs_t *fs,
;
#undef NL
return svn_io_file_create(svn_dirent_join(fs->path, PATH_CONFIG, pool),
- fsfs_conf_contents, pool);
+ fsx_conf_contents, pool);
}
svn_error_t *
Modified: subversion/branches/fsfs-format7/subversion/libsvn_fs_x/hotcopy.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_fs_x/hotcopy.c?rev=1498677&r1=1498676&r2=1498677&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_fs_x/hotcopy.c (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_fs_x/hotcopy.c Mon Jul 1 20:39:59 2013
@@ -430,8 +430,8 @@ hotcopy_incremental_check_preconditions(
/* We only support incremental hotcopy between the same format. */
if (src_ffd->format != dst_ffd->format)
return svn_error_createf(SVN_ERR_UNSUPPORTED_FEATURE, NULL,
- _("The FSFS format (%d) of the hotcopy source does not match the "
- "FSFS format (%d) of the hotcopy destination; please upgrade "
+ _("The FSX format (%d) of the hotcopy source does not match the "
+ "FSX format (%d) of the hotcopy destination; please upgrade "
"both repositories to the same format"),
src_ffd->format, dst_ffd->format);
Modified: subversion/branches/fsfs-format7/subversion/libsvn_fs_x/low_level.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_fs_x/low_level.c?rev=1498677&r1=1498676&r2=1498677&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_fs_x/low_level.c (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_fs_x/low_level.c Mon Jul 1 20:39:59 2013
@@ -64,11 +64,11 @@
/* An arbitrary maximum path length, so clients can't run us out of memory
* by giving us arbitrarily large paths. */
-#define FSFS_MAX_PATH_LEN 4096
+#define FSX_MAX_PATH_LEN 4096
/* The 256 is an arbitrary size large enough to hold the node id and the
* various flags. */
-#define MAX_CHANGE_LINE_LEN FSFS_MAX_PATH_LEN + 256
+#define MAX_CHANGE_LINE_LEN FSX_MAX_PATH_LEN + 256
svn_error_t *
svn_fs_x__parse_revision_trailer(apr_off_t *root_offset,
Modified: subversion/branches/fsfs-format7/subversion/tests/svn_test_fs.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/tests/svn_test_fs.c?rev=1498677&r1=1498676&r2=1498677&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/tests/svn_test_fs.c (original)
+++ subversion/branches/fsfs-format7/subversion/tests/svn_test_fs.c Mon Jul 1 20:39:59 2013
@@ -144,21 +144,36 @@ create_fs(svn_fs_t **fs_p,
* copy that file into the filesystem FS and set *MUST_REOPEN to TRUE, else
* set *MUST_REOPEN to FALSE. */
static svn_error_t *
-maybe_install_fsfs_conf(svn_fs_t *fs,
- const svn_test_opts_t *opts,
- svn_boolean_t *must_reopen,
- apr_pool_t *pool)
+maybe_install_fs_conf(svn_fs_t *fs,
+ const svn_test_opts_t *opts,
+ svn_boolean_t *must_reopen,
+ apr_pool_t *pool)
{
*must_reopen = FALSE;
- if (strcmp(opts->fs_type, "fsfs") != 0 || ! opts->config_file)
+ if (! opts->config_file)
return SVN_NO_ERROR;
- *must_reopen = TRUE;
- return svn_io_copy_file(opts->config_file,
- svn_path_join(svn_fs_path(fs, pool),
- "fsfs.conf", pool),
- FALSE /* copy_perms */,
- pool);
+ if (strcmp(opts->fs_type, "fsfs") == 0)
+ {
+ *must_reopen = TRUE;
+ return svn_io_copy_file(opts->config_file,
+ svn_path_join(svn_fs_path(fs, pool),
+ "fsfs.conf", pool),
+ FALSE /* copy_perms */,
+ pool);
+ }
+
+ if (strcmp(opts->fs_type, "fsx") == 0)
+ {
+ *must_reopen = TRUE;
+ return svn_io_copy_file(opts->config_file,
+ svn_path_join(svn_fs_path(fs, pool),
+ "fsx.conf", pool),
+ FALSE /* copy_perms */,
+ pool);
+ }
+
+ return SVN_NO_ERROR;
}
@@ -183,7 +198,7 @@ svn_test__create_fs(svn_fs_t **fs_p,
SVN_ERR(create_fs(fs_p, name, opts->fs_type,
opts->server_minor_version, pool));
- SVN_ERR(maybe_install_fsfs_conf(*fs_p, opts, &must_reopen, pool));
+ SVN_ERR(maybe_install_fs_conf(*fs_p, opts, &must_reopen, pool));
if (must_reopen)
{
SVN_ERR(svn_fs_open(fs_p, name, NULL, pool));
@@ -229,8 +244,8 @@ svn_test__create_repos(svn_repos_t **rep
/* Register this repo for cleanup. */
svn_test_add_dir_cleanup(name);
- SVN_ERR(maybe_install_fsfs_conf(svn_repos_fs(repos), opts, &must_reopen,
- pool));
+ SVN_ERR(maybe_install_fs_conf(svn_repos_fs(repos), opts, &must_reopen,
+ pool));
if (must_reopen)
{
SVN_ERR(svn_repos_open2(&repos, name, NULL, pool));