You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by da...@apache.org on 2013/03/27 16:25:24 UTC
svn commit: r1461648 - in /subversion/trunk/subversion: include/svn_fs.h
libsvn_fs/fs-loader.c libsvn_fs/fs-loader.h libsvn_fs_base/fs.c
libsvn_fs_fs/fs.c libsvn_fs_fs/fs_fs.c libsvn_fs_fs/fs_fs.h
libsvn_fs_fs/tree.c libsvn_repos/dump.c
Author: danielsh
Date: Wed Mar 27 15:25:23 2013
New Revision: 1461648
URL: http://svn.apache.org/r1461648
Log:
Followup to r1461335: rename function and update its signature.
Notably, for FSFS a layer of indirection is removed: the tree.c implementation
is used directly without a fs_fs.c wrapper.
* subversion/include/svn_fs.h
(svn_fs_verify_rev): Morph into..
(svn_fs_verify_root): .. this.
* subversion/libsvn_fs/fs-loader.c
(svn_fs_verify_rev, svn_fs_verify_root): Propagate.
* subversion/libsvn_fs/fs-loader.h
(fs_vtable_t.verify_rev): Morph into ..
(fs_vtable_t.verify_root): .. this.
* subversion/libsvn_fs_base/fs.c
(base_bdb_verify_rev, base_bdb_verify_root): Propagate.
* subversion/libsvn_fs_fs/fs.c
(fs_vtable): Propagate.
* subversion/libsvn_fs_fs/fs_fs.c
(svn_fs_fs__verify_rev): Remove.
* subversion/libsvn_fs_fs/fs_fs.h
(svn_fs_fs__verify_rev): Remove.
* subversion/libsvn_fs_fs/tree.c
(svn_fs_fs__verify_root):
Add here the important parts of svn_fs_fs__verify_rev() --- namely, the
introductory comment.
* subversion/libsvn_repos/dump.c
(svn_repos_verify_fs2): Propagate.
Modified:
subversion/trunk/subversion/include/svn_fs.h
subversion/trunk/subversion/libsvn_fs/fs-loader.c
subversion/trunk/subversion/libsvn_fs/fs-loader.h
subversion/trunk/subversion/libsvn_fs_base/fs.c
subversion/trunk/subversion/libsvn_fs_fs/fs.c
subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
subversion/trunk/subversion/libsvn_fs_fs/fs_fs.h
subversion/trunk/subversion/libsvn_fs_fs/tree.c
subversion/trunk/subversion/libsvn_repos/dump.c
Modified: subversion/trunk/subversion/include/svn_fs.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_fs.h?rev=1461648&r1=1461647&r2=1461648&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_fs.h (original)
+++ subversion/trunk/subversion/include/svn_fs.h Wed Mar 27 15:25:23 2013
@@ -2464,9 +2464,8 @@ svn_fs_verify(const char *path,
* @since New in 1.8.
*/
svn_error_t *
-svn_fs_verify_rev(svn_fs_t *fs,
- svn_fs_root_t *root,
- apr_pool_t *scratch_pool);
+svn_fs_verify_root(svn_fs_root_t *root,
+ apr_pool_t *scratch_pool);
/** @} */
Modified: subversion/trunk/subversion/libsvn_fs/fs-loader.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs/fs-loader.c?rev=1461648&r1=1461647&r2=1461648&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs/fs-loader.c (original)
+++ subversion/trunk/subversion/libsvn_fs/fs-loader.c Wed Mar 27 15:25:23 2013
@@ -632,11 +632,11 @@ svn_fs_recover(const char *path,
}
svn_error_t *
-svn_fs_verify_rev(svn_fs_t *fs,
- svn_fs_root_t *root,
- apr_pool_t *scratch_pool)
+svn_fs_verify_root(svn_fs_root_t *root,
+ apr_pool_t *scratch_pool)
{
- SVN_ERR(fs->vtable->verify_rev(fs, root, scratch_pool));
+ svn_fs_t *fs = root->fs;
+ SVN_ERR(fs->vtable->verify_root(root, scratch_pool));
return SVN_NO_ERROR;
}
Modified: subversion/trunk/subversion/libsvn_fs/fs-loader.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs/fs-loader.h?rev=1461648&r1=1461647&r2=1461648&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs/fs-loader.h (original)
+++ subversion/trunk/subversion/libsvn_fs/fs-loader.h Wed Mar 27 15:25:23 2013
@@ -204,9 +204,8 @@ typedef struct fs_vtable_t
svn_fs_get_locks_callback_t get_locks_func,
void *get_locks_baton,
apr_pool_t *pool);
- svn_error_t *(*verify_rev)(svn_fs_t *fs,
- svn_fs_root_t *root,
- apr_pool_t *pool);
+ svn_error_t *(*verify_root)(svn_fs_root_t *root,
+ apr_pool_t *pool);
svn_error_t *(*freeze)(svn_fs_t *fs,
svn_error_t *(*freeze_body)(void *, apr_pool_t *),
void *baton, apr_pool_t *pool);
Modified: subversion/trunk/subversion/libsvn_fs_base/fs.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_base/fs.c?rev=1461648&r1=1461647&r2=1461648&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_base/fs.c (original)
+++ subversion/trunk/subversion/libsvn_fs_base/fs.c Wed Mar 27 15:25:23 2013
@@ -471,9 +471,8 @@ bdb_write_config(svn_fs_t *fs)
}
static svn_error_t *
-base_bdb_verify_rev(svn_fs_t *fs,
- svn_fs_root_t *root,
- apr_pool_t *scratch_pool)
+base_bdb_verify_root(svn_fs_root_t *root,
+ apr_pool_t *scratch_pool)
{
/* Verifying is currently a no op for BDB. */
return SVN_NO_ERROR;
@@ -508,7 +507,7 @@ static fs_vtable_t fs_vtable = {
svn_fs_base__unlock,
svn_fs_base__get_lock,
svn_fs_base__get_locks,
- base_bdb_verify_rev,
+ base_bdb_verify_root,
base_bdb_freeze,
base_bdb_set_errcall,
};
Modified: subversion/trunk/subversion/libsvn_fs_fs/fs.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/fs.c?rev=1461648&r1=1461647&r2=1461648&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/fs.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/fs.c Wed Mar 27 15:25:23 2013
@@ -184,7 +184,7 @@ static fs_vtable_t fs_vtable = {
svn_fs_fs__unlock,
svn_fs_fs__get_lock,
svn_fs_fs__get_locks,
- svn_fs_fs__verify_rev,
+ svn_fs_fs__verify_root,
fs_freeze,
fs_set_errcall
};
Modified: subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c?rev=1461648&r1=1461647&r2=1461648&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c Wed Mar 27 15:25:23 2013
@@ -10431,26 +10431,6 @@ svn_fs_fs__verify(svn_fs_t *fs,
return SVN_NO_ERROR;
}
-svn_error_t *
-svn_fs_fs__verify_rev(svn_fs_t *fs,
- svn_fs_root_t *root,
- apr_pool_t *pool)
-{
- /* Issue #4129: bogus pred-counts and minfo-cnt's on the root node-rev
- (and elsewhere). This code makes more thorough checks than the
- commit-time checks in validate_root_noderev(). */
-
- /* ### TODO: Make sure caches are disabled.
-
- When this code is called in the library, we want to ensure we
- use the on-disk data --- rather than some data that was read
- in the possibly-distance past and cached since. */
- SVN_ERR(svn_fs_fs__verify_root(root, pool));
-
- return SVN_NO_ERROR;
-}
-
-
/** Hotcopy. **/
Modified: subversion/trunk/subversion/libsvn_fs_fs/fs_fs.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/fs_fs.h?rev=1461648&r1=1461647&r2=1461648&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/fs_fs.h (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/fs_fs.h Wed Mar 27 15:25:23 2013
@@ -52,13 +52,6 @@ svn_error_t *svn_fs_fs__verify(svn_fs_t
void *cancel_baton,
apr_pool_t *pool);
-/* Verify metadata of REVISION in filesystem FS.
- * Use POOL for temporary allocations. */
-svn_error_t *
-svn_fs_fs__verify_rev(svn_fs_t *fs,
- svn_fs_root_t *root,
- apr_pool_t *pool);
-
/* Copy the fsfs filesystem SRC_FS at SRC_PATH into a new copy DST_FS at
* DST_PATH. If INCREMENTAL is TRUE, do not re-copy data which already
* exists in DST_FS. Use POOL for temporary allocations. */
Modified: subversion/trunk/subversion/libsvn_fs_fs/tree.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/tree.c?rev=1461648&r1=1461647&r2=1461648&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/tree.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/tree.c Wed Mar 27 15:25:23 2013
@@ -4327,6 +4327,16 @@ svn_fs_fs__verify_root(svn_fs_root_t *ro
{
fs_rev_root_data_t *frd;
+ /* Issue #4129: bogus pred-counts and minfo-cnt's on the root node-rev
+ (and elsewhere). This code makes more thorough checks than the
+ commit-time checks in validate_root_noderev(). */
+
+ /* ### TODO: Make sure caches are disabled.
+
+ When this code is called in the library, we want to ensure we
+ use the on-disk data --- rather than some data that was read
+ in the possibly-distance past and cached since. */
+
if (root->is_txn_root)
/* ### Not implemented */
return SVN_NO_ERROR;
Modified: subversion/trunk/subversion/libsvn_repos/dump.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_repos/dump.c?rev=1461648&r1=1461647&r2=1461648&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_repos/dump.c (original)
+++ subversion/trunk/subversion/libsvn_repos/dump.c Wed Mar 27 15:25:23 2013
@@ -1470,7 +1470,7 @@ svn_repos_verify_fs2(svn_repos_t *repos,
iterpool));
SVN_ERR(svn_fs_revision_root(&to_root, fs, rev, iterpool));
- SVN_ERR(svn_fs_verify_rev(fs, to_root, iterpool));
+ SVN_ERR(svn_fs_verify_root(to_root, iterpool));
SVN_ERR(svn_repos_replay2(to_root, "", SVN_INVALID_REVNUM, FALSE,
cancel_editor, cancel_edit_baton,