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/05/16 04:54:02 UTC
svn commit: r1595091 - in /subversion/trunk/subversion/libsvn_fs_x: ./
hotcopy.c pack.c util.c util.h
Author: stefan2
Date: Fri May 16 02:54:02 2014
New Revision: 1595091
URL: http://svn.apache.org/r1595091
Log:
Sync'ing FSX with FSFS:
Merge r1510344 from /branches/fsfs-improvements/subversion/libsvn_fs_fs
into /trunk/subversion/libsvn_fs_x and resolve mostly name conflicts.
Modified:
subversion/trunk/subversion/libsvn_fs_x/ (props changed)
subversion/trunk/subversion/libsvn_fs_x/hotcopy.c
subversion/trunk/subversion/libsvn_fs_x/pack.c
subversion/trunk/subversion/libsvn_fs_x/util.c
subversion/trunk/subversion/libsvn_fs_x/util.h
Propchange: subversion/trunk/subversion/libsvn_fs_x/
------------------------------------------------------------------------------
Merged /subversion/branches/fsfs-improvements/subversion/libsvn_fs_fs:r1510344
Modified: subversion/trunk/subversion/libsvn_fs_x/hotcopy.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/hotcopy.c?rev=1595091&r1=1595090&r2=1595091&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/hotcopy.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/hotcopy.c Fri May 16 02:54:02 2014
@@ -351,9 +351,9 @@ hotcopy_copy_packed_shard(svn_revnum_t *
if (*dst_min_unpacked_rev < rev + max_files_per_dir)
{
*dst_min_unpacked_rev = rev + max_files_per_dir;
- SVN_ERR(svn_fs_x__write_revnum_file(dst_fs,
- *dst_min_unpacked_rev,
- scratch_pool));
+ SVN_ERR(svn_fs_x__write_min_unpacked_rev(dst_fs,
+ *dst_min_unpacked_rev,
+ scratch_pool));
}
return SVN_NO_ERROR;
Modified: subversion/trunk/subversion/libsvn_fs_x/pack.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/pack.c?rev=1595091&r1=1595090&r2=1595091&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/pack.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/pack.c Fri May 16 02:54:02 2014
@@ -2229,9 +2229,9 @@ pack_shard(const char *revs_dir,
}
/* Update the min-unpacked-rev file to reflect our newly packed shard. */
- SVN_ERR(svn_fs_x__write_revnum_file(fs,
- (svn_revnum_t)((shard + 1) * max_files_per_dir),
- pool));
+ SVN_ERR(svn_fs_x__write_min_unpacked_rev(fs,
+ (svn_revnum_t)((shard + 1) * max_files_per_dir),
+ pool));
ffd->min_unpacked_rev = (svn_revnum_t)((shard + 1) * max_files_per_dir);
/* Finally, remove the existing shard directories.
Modified: subversion/trunk/subversion/libsvn_fs_x/util.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/util.c?rev=1595091&r1=1595090&r2=1595091&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/util.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/util.c Fri May 16 02:54:02 2014
@@ -472,9 +472,9 @@ svn_fs_x__update_min_unpacked_rev(svn_fs
*
* Similar to write_current(). */
svn_error_t *
-svn_fs_x__write_revnum_file(svn_fs_t *fs,
- svn_revnum_t revnum,
- apr_pool_t *scratch_pool)
+svn_fs_x__write_min_unpacked_rev(svn_fs_t *fs,
+ svn_revnum_t revnum,
+ apr_pool_t *scratch_pool)
{
const char *final_path;
char buf[SVN_INT64_BUFFER_SIZE];
Modified: subversion/trunk/subversion/libsvn_fs_x/util.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/util.h?rev=1595091&r1=1595090&r2=1595091&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/util.h (original)
+++ subversion/trunk/subversion/libsvn_fs_x/util.h Fri May 16 02:54:02 2014
@@ -261,15 +261,13 @@ svn_error_t *
svn_fs_x__update_min_unpacked_rev(svn_fs_t *fs,
apr_pool_t *pool);
-/* Write a file FILENAME in directory FS_PATH, containing a single line
- * with the number REVNUM in ASCII decimal. Move the file into place
- * atomically, overwriting any existing file.
- *
- * Similar to write_current(). */
+/* Atomically update the 'min-unpacked-rev' file in FS to hold the specifed
+ * REVNUM. Perform temporary allocations in SCRATCH_POOL.
+ */
svn_error_t *
-svn_fs_x__write_revnum_file(svn_fs_t *fs,
- svn_revnum_t revnum,
- apr_pool_t *scratch_pool);
+svn_fs_x__write_min_unpacked_rev(svn_fs_t *fs,
+ svn_revnum_t revnum,
+ apr_pool_t *scratch_pool);
/* Atomically update the 'current' file to hold the specifed REV.
Perform temporary allocations in POOL. */