Author: stefan2
Date: Sun Aug 4 21:01:05 2013
New Revision: 1510344
URL: http://svn.apache.org/r1510344
Log:
On the fsfs-improvements branch: Rename svn_fs_fs__write_revnum_file
to reflect its actual purpose and document it properly
* subversion/libsvn_fs_fs/util.h
(svn_fs_fs__write_revnum_file): rename this ...
(svn_fs_fs__write_min_unpacked_rev): ... to this; fix docstring
* subversion/libsvn_fs_fs/util.c
(svn_fs_fs__write_revnum_file): rename implementation ...
(svn_fs_fs__write_min_unpacked_rev): ... as well
* subversion/libsvn_fs_fs/hotcopy.c
(hotcopy_copy_packed_shard): update caller
* subversion/libsvn_fs_fs/pack.c
(pack_shard): update caller
Found by: danielsh
Modified:
subversion/branches/fsfs-improvements/subversion/libsvn_fs_fs/hotcopy.c
subversion/branches/fsfs-improvements/subversion/libsvn_fs_fs/pack.c
subversion/branches/fsfs-improvements/subversion/libsvn_fs_fs/util.c
subversion/branches/fsfs-improvements/subversion/libsvn_fs_fs/util.h
Modified:
subversion/branches/fsfs-improvements/subversion/libsvn_fs_fs/hotcopy.c
URL:
http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/libsvn_fs_fs/hotcopy.c?rev=1510344&r1=1510343&r2=1510344&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/libsvn_fs_fs/hotcopy.c
(original)
+++ subversion/branches/fsfs-improvements/subversion/libsvn_fs_fs/hotcopy.c Sun
Aug 4 21:01:05 2013
@@ -340,8 +340,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_fs__write_revnum_file(dst_fs, *dst_min_unpacked_rev,
- scratch_pool));
+ SVN_ERR(svn_fs_fs__write_min_unpacked_rev(dst_fs,
+ *dst_min_unpacked_rev,
+ scratch_pool));
}
return SVN_NO_ERROR;
Modified: subversion/branches/fsfs-improvements/subversion/libsvn_fs_fs/pack.c
URL:
http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/libsvn_fs_fs/pack.c?rev=1510344&r1=1510343&r2=1510344&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/libsvn_fs_fs/pack.c
(original)
+++ subversion/branches/fsfs-improvements/subversion/libsvn_fs_fs/pack.c Sun
Aug 4 21:01:05 2013
@@ -344,7 +344,7 @@ pack_shard(const char *revs_dir,
}
/* Update the min-unpacked-rev file to reflect our newly packed shard. */
- SVN_ERR(svn_fs_fs__write_revnum_file(fs,
+ SVN_ERR(svn_fs_fs__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);
Modified: subversion/branches/fsfs-improvements/subversion/libsvn_fs_fs/util.c
URL:
http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/libsvn_fs_fs/util.c?rev=1510344&r1=1510343&r2=1510344&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/libsvn_fs_fs/util.c
(original)
+++ subversion/branches/fsfs-improvements/subversion/libsvn_fs_fs/util.c Sun
Aug 4 21:01:05 2013
@@ -354,9 +354,9 @@ svn_fs_fs__update_min_unpacked_rev(svn_f
}
svn_error_t *
-svn_fs_fs__write_revnum_file(svn_fs_t *fs,
- svn_revnum_t revnum,
- apr_pool_t *scratch_pool)
+svn_fs_fs__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/branches/fsfs-improvements/subversion/libsvn_fs_fs/util.h
URL:
http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/libsvn_fs_fs/util.h?rev=1510344&r1=1510343&r2=1510344&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/libsvn_fs_fs/util.h
(original)
+++ subversion/branches/fsfs-improvements/subversion/libsvn_fs_fs/util.h Sun
Aug 4 21:01:05 2013
@@ -262,15 +262,13 @@ svn_error_t *
svn_fs_fs__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_fs__write_revnum_file(svn_fs_t *fs,
- svn_revnum_t revnum,
- apr_pool_t *scratch_pool);
+svn_fs_fs__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,
NEXT_NODE_ID, and NEXT_COPY_ID. (The two next-ID parameters are
