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 14:39:10 UTC
svn commit: r1498412 - in
/subversion/branches/fsfs-format7/subversion/libsvn_fs_x: fs.h fs_x.c
hotcopy.c pack.c revprops.c util.c
Author: stefan2
Date: Mon Jul 1 12:39:10 2013
New Revision: 1498412
URL: http://svn.apache.org/r1498412
Log:
On the fsfs-format7 branch: remove the SVN_FS_FS__MIN_PACKED_REVPROP_FORMAT
flag from FSX because we always pack revprops. Remove checks for that flag
and the corresponding old FSFS format code.
* subversion/libsvn_fs_x/fs.h
(SVN_FS_FS__MIN_PACKED_REVPROP_FORMAT): be gone
* subversion/libsvn_fs_x/fs_x.c
(read_config): remove check & pre-f7 code
* subversion/libsvn_fs_x/hotcopy.c
(hotcopy_copy_packed_shard): remove check
* subversion/libsvn_fs_x/pack.c
(pack_body): ditto
* subversion/libsvn_fs_x/revprops.c
(svn_fs_x__get_revision_proplist): same here
* subversion/libsvn_fs_x/util.c
(svn_fs_x__is_packed_revprop): and here
Modified:
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/pack.c
subversion/branches/fsfs-format7/subversion/libsvn_fs_x/revprops.c
subversion/branches/fsfs-format7/subversion/libsvn_fs_x/util.c
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=1498412&r1=1498411&r2=1498412&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 12:39:10 2013
@@ -157,9 +157,6 @@ extern "C" {
revprops.db . */
#define SVN_FS_FS__PACKED_REVPROP_SQLITE_DEV_FORMAT 5
-/* The minimum format number that supports packed revprops. */
-#define SVN_FS_FS__MIN_PACKED_REVPROP_FORMAT 6
-
/* The minimum format number that supports a configuration file (fsfs.conf) */
#define SVN_FS_FS__MIN_CONFIG_FILE 4
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=1498412&r1=1498411&r2=1498412&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 12:39:10 2013
@@ -306,27 +306,20 @@ read_config(fs_x_data_t *ffd,
}
/* Initialize revprop packing settings in ffd. */
- if (ffd->format >= SVN_FS_FS__MIN_PACKED_REVPROP_FORMAT)
- {
- SVN_ERR(svn_config_get_bool(ffd->config, &ffd->compress_packed_revprops,
- CONFIG_SECTION_PACKED_REVPROPS,
- CONFIG_OPTION_COMPRESS_PACKED_REVPROPS,
- TRUE));
- SVN_ERR(svn_config_get_int64(ffd->config, &ffd->revprop_pack_size,
- CONFIG_SECTION_PACKED_REVPROPS,
- CONFIG_OPTION_REVPROP_PACK_SIZE,
- ffd->compress_packed_revprops
- ? 0x100
- : 0x40));
+ SVN_ERR(svn_config_get_bool(ffd->config, &ffd->compress_packed_revprops,
+ CONFIG_SECTION_PACKED_REVPROPS,
+ CONFIG_OPTION_COMPRESS_PACKED_REVPROPS,
+ TRUE));
+ SVN_ERR(svn_config_get_int64(ffd->config, &ffd->revprop_pack_size,
+ CONFIG_SECTION_PACKED_REVPROPS,
+ CONFIG_OPTION_REVPROP_PACK_SIZE,
+ ffd->compress_packed_revprops
+ ? 0x100
+ : 0x40));
- ffd->revprop_pack_size *= 1024;
- }
- else
- {
- ffd->revprop_pack_size = 0x10000;
- ffd->compress_packed_revprops = FALSE;
- }
+ ffd->revprop_pack_size *= 1024;
+ /* I/O settings in ffd. */
SVN_ERR(svn_config_get_int64(ffd->config, &ffd->block_size,
CONFIG_SECTION_IO,
CONFIG_OPTION_BLOCK_SIZE,
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=1498412&r1=1498411&r2=1498412&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 12:39:10 2013
@@ -300,8 +300,7 @@ hotcopy_copy_packed_shard(svn_revnum_t *
src_subdir = svn_dirent_join(src_fs->path, PATH_REVPROPS_DIR, scratch_pool);
dst_subdir = svn_dirent_join(dst_fs->path, PATH_REVPROPS_DIR, scratch_pool);
- if ( src_ffd->format < SVN_FS_FS__MIN_PACKED_REVPROP_FORMAT
- || src_ffd->min_unpacked_rev < rev + max_files_per_dir)
+ if (src_ffd->min_unpacked_rev < rev + max_files_per_dir)
{
/* copy unpacked revprops rev by rev */
iterpool = svn_pool_create(scratch_pool);
Modified: subversion/branches/fsfs-format7/subversion/libsvn_fs_x/pack.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_fs_x/pack.c?rev=1498412&r1=1498411&r2=1498412&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_fs_x/pack.c (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_fs_x/pack.c Mon Jul 1 12:39:10 2013
@@ -2324,9 +2324,8 @@ pack_body(void *baton,
return SVN_NO_ERROR;
rev_data_path = svn_dirent_join(pb->fs->path, PATH_REVS_DIR, pool);
- if (ffd->format >= SVN_FS_FS__MIN_PACKED_REVPROP_FORMAT)
- revprops_data_path = svn_dirent_join(pb->fs->path, PATH_REVPROPS_DIR,
- pool);
+ revprops_data_path = svn_dirent_join(pb->fs->path, PATH_REVPROPS_DIR,
+ pool);
iterpool = svn_pool_create(pool);
for (i = ffd->min_unpacked_rev / ffd->max_files_per_dir;
Modified: subversion/branches/fsfs-format7/subversion/libsvn_fs_x/revprops.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_fs_x/revprops.c?rev=1498412&r1=1498411&r2=1498412&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_fs_x/revprops.c (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_fs_x/revprops.c Mon Jul 1 12:39:10 2013
@@ -937,8 +937,7 @@ svn_fs_x__get_revision_proplist(apr_hash
generation, pool);
if (err)
{
- if (!APR_STATUS_IS_ENOENT(err->apr_err)
- || ffd->format < SVN_FS_FS__MIN_PACKED_REVPROP_FORMAT)
+ if (!APR_STATUS_IS_ENOENT(err->apr_err))
return svn_error_trace(err);
svn_error_clear(err);
@@ -949,7 +948,7 @@ svn_fs_x__get_revision_proplist(apr_hash
/* if revprop packing is available and we have not read the revprops, yet,
* try reading them from a packed shard. If that fails, REV is most
* likely invalid (or its revprops highly contested). */
- if (ffd->format >= SVN_FS_FS__MIN_PACKED_REVPROP_FORMAT && !*proplist_p)
+ if (!*proplist_p)
{
packed_revprops_t *packed_revprops;
SVN_ERR(read_pack_revprop(&packed_revprops, fs, rev, generation, pool));
Modified: subversion/branches/fsfs-format7/subversion/libsvn_fs_x/util.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_fs_x/util.c?rev=1498412&r1=1498411&r2=1498412&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_fs_x/util.c (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_fs_x/util.c Mon Jul 1 12:39:10 2013
@@ -67,9 +67,7 @@ svn_fs_x__is_packed_revprop(svn_fs_t *fs
fs_x_data_t *ffd = fs->fsap_data;
/* rev 0 will not be packed */
- return (rev < ffd->min_unpacked_rev)
- && (rev != 0)
- && (ffd->format >= SVN_FS_FS__MIN_PACKED_REVPROP_FORMAT);
+ return (rev < ffd->min_unpacked_rev) && (rev != 0);
}
svn_revnum_t