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/19 14:04:37 UTC
svn commit: r1504852 - in
/subversion/branches/fsfs-improvements/subversion/libsvn_fs_fs:
cached_data.c fs_fs.c fs_fs.h rep-cache.c revprops.c verify.c
Author: stefan2
Date: Fri Jul 19 12:04:37 2013
New Revision: 1504852
URL: http://svn.apache.org/r1504852
Log:
On the fsfs-improvement branch: rename svn_fs_fs__revision_exists
to svn_fs_fs__ensure_revision_exists. No functional change.
* subversion/libsvn_fs_fs/fs_fs.h
(svn_fs_fs__revision_exists): rename to ...
(svn_fs_fs__ensure_revision_exists): ... this
* subversion/libsvn_fs_fs/fs_fs.c
(ensure_revision_exists): move code to ...
(svn_fs_fs__ensure_revision_exists): ... this
(svn_fs_fs__revision_exists): rename to the above
* subversion/libsvn_fs_fs/cached_data.c
(open_and_seek_revision,
svn_fs_fs__rev_get_root,
svn_fs_fs__get_changes): update callers
* subversion/libsvn_fs_fs/rep-cache.c
(rep_has_been_born,
svn_fs_fs__walk_rep_reference): ditto
* subversion/libsvn_fs_fs/revprops.c
(svn_fs_fs__get_revision_proplist,
svn_fs_fs__set_revision_proplist): same here
* subversion/libsvn_fs_fs/verify.c
(svn_fs_fs__verify): and here
Modified:
subversion/branches/fsfs-improvements/subversion/libsvn_fs_fs/cached_data.c
subversion/branches/fsfs-improvements/subversion/libsvn_fs_fs/fs_fs.c
subversion/branches/fsfs-improvements/subversion/libsvn_fs_fs/fs_fs.h
subversion/branches/fsfs-improvements/subversion/libsvn_fs_fs/rep-cache.c
subversion/branches/fsfs-improvements/subversion/libsvn_fs_fs/revprops.c
subversion/branches/fsfs-improvements/subversion/libsvn_fs_fs/verify.c
Modified: subversion/branches/fsfs-improvements/subversion/libsvn_fs_fs/cached_data.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/libsvn_fs_fs/cached_data.c?rev=1504852&r1=1504851&r2=1504852&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/libsvn_fs_fs/cached_data.c (original)
+++ subversion/branches/fsfs-improvements/subversion/libsvn_fs_fs/cached_data.c Fri Jul 19 12:04:37 2013
@@ -171,7 +171,7 @@ open_and_seek_revision(apr_file_t **file
{
apr_file_t *rev_file;
- SVN_ERR(svn_fs_fs__revision_exists(rev, fs, pool));
+ SVN_ERR(svn_fs_fs__ensure_revision_exists(rev, fs, pool));
SVN_ERR(svn_fs_fs__open_pack_or_rev_file(&rev_file, fs, rev, pool));
@@ -512,7 +512,7 @@ svn_fs_fs__rev_get_root(svn_fs_id_t **ro
svn_fs_id_t *root_id = NULL;
svn_boolean_t is_cached;
- SVN_ERR(svn_fs_fs__revision_exists(rev, fs, pool));
+ SVN_ERR(svn_fs_fs__ensure_revision_exists(rev, fs, pool));
SVN_ERR(svn_cache__get((void **) root_id_p, &is_cached,
ffd->rev_root_id_cache, &rev, pool));
@@ -1993,7 +1993,7 @@ svn_fs_fs__get_changes(apr_array_header_
/* read changes from revision file */
- SVN_ERR(svn_fs_fs__revision_exists(rev, fs, pool));
+ SVN_ERR(svn_fs_fs__ensure_revision_exists(rev, fs, pool));
SVN_ERR(svn_fs_fs__open_pack_or_rev_file(&revision_file, fs, rev, pool));
SVN_ERR(get_root_changes_offset(NULL, &changes_offset, revision_file, fs,
Modified: subversion/branches/fsfs-improvements/subversion/libsvn_fs_fs/fs_fs.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/libsvn_fs_fs/fs_fs.c?rev=1504852&r1=1504851&r2=1504852&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/libsvn_fs_fs/fs_fs.c (original)
+++ subversion/branches/fsfs-improvements/subversion/libsvn_fs_fs/fs_fs.c Fri Jul 19 12:04:37 2013
@@ -894,10 +894,10 @@ svn_fs_fs__youngest_rev(svn_revnum_t *yo
repository by resetting "current" without deleting rev files, etc), it
ought to be completely ignored. This function provides the check
by which callers can make that decision. */
-static svn_error_t *
-ensure_revision_exists(svn_fs_t *fs,
- svn_revnum_t rev,
- apr_pool_t *pool)
+svn_error_t *
+svn_fs_fs__ensure_revision_exists(svn_revnum_t rev,
+ svn_fs_t *fs,
+ apr_pool_t *pool)
{
fs_fs_data_t *ffd = fs->fsap_data;
@@ -922,16 +922,6 @@ ensure_revision_exists(svn_fs_t *fs,
}
svn_error_t *
-svn_fs_fs__revision_exists(svn_revnum_t rev,
- svn_fs_t *fs,
- apr_pool_t *pool)
-{
- /* Different order of parameters. */
- SVN_ERR(ensure_revision_exists(fs, rev, pool));
- return SVN_NO_ERROR;
-}
-
-svn_error_t *
svn_fs_fs__file_length(svn_filesize_t *length,
node_revision_t *noderev,
apr_pool_t *pool)
Modified: subversion/branches/fsfs-improvements/subversion/libsvn_fs_fs/fs_fs.h
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/libsvn_fs_fs/fs_fs.h?rev=1504852&r1=1504851&r2=1504852&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/libsvn_fs_fs/fs_fs.h (original)
+++ subversion/branches/fsfs-improvements/subversion/libsvn_fs_fs/fs_fs.h Fri Jul 19 12:04:37 2013
@@ -53,9 +53,9 @@ svn_error_t *svn_fs_fs__youngest_rev(svn
/* Return an error iff REV does not exist in FS. */
svn_error_t *
-svn_fs_fs__revision_exists(svn_revnum_t rev,
- svn_fs_t *fs,
- apr_pool_t *pool);
+svn_fs_fs__ensure_revision_exists(svn_revnum_t rev,
+ svn_fs_t *fs,
+ apr_pool_t *pool);
/* Set *LENGTH to the be fulltext length of the node revision
specified by NODEREV. Use POOL for temporary allocations. */
Modified: subversion/branches/fsfs-improvements/subversion/libsvn_fs_fs/rep-cache.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/libsvn_fs_fs/rep-cache.c?rev=1504852&r1=1504851&r2=1504852&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/libsvn_fs_fs/rep-cache.c (original)
+++ subversion/branches/fsfs-improvements/subversion/libsvn_fs_fs/rep-cache.c Fri Jul 19 12:04:37 2013
@@ -58,7 +58,7 @@ rep_has_been_born(representation_t *rep,
{
SVN_ERR_ASSERT(rep);
- SVN_ERR(svn_fs_fs__revision_exists(rep->revision, fs, pool));
+ SVN_ERR(svn_fs_fs__ensure_revision_exists(rep->revision, fs, pool));
return SVN_NO_ERROR;
}
@@ -163,7 +163,7 @@ svn_fs_fs__walk_rep_reference(svn_fs_t *
max = svn_sqlite__column_revnum(stmt, 0);
SVN_ERR(svn_sqlite__reset(stmt));
if (SVN_IS_VALID_REVNUM(max)) /* The rep-cache could be empty. */
- SVN_ERR(svn_fs_fs__revision_exists(max, fs, iterpool));
+ SVN_ERR(svn_fs_fs__ensure_revision_exists(max, fs, iterpool));
}
SVN_ERR(svn_sqlite__get_statement(&stmt, ffd->rep_cache_db,
Modified: subversion/branches/fsfs-improvements/subversion/libsvn_fs_fs/revprops.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/libsvn_fs_fs/revprops.c?rev=1504852&r1=1504851&r2=1504852&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/libsvn_fs_fs/revprops.c (original)
+++ subversion/branches/fsfs-improvements/subversion/libsvn_fs_fs/revprops.c Fri Jul 19 12:04:37 2013
@@ -916,7 +916,7 @@ svn_fs_fs__get_revision_proplist(apr_has
*proplist_p = NULL;
/* should they be available at all? */
- SVN_ERR(svn_fs_fs__revision_exists(rev, fs, pool));
+ SVN_ERR(svn_fs_fs__ensure_revision_exists(rev, fs, pool));
/* Try cache lookup first. */
if (has_revprop_cache(fs, pool))
@@ -1381,7 +1381,7 @@ svn_fs_fs__set_revision_proplist(svn_fs_
const char *perms_reference;
apr_array_header_t *files_to_delete = NULL;
- SVN_ERR(svn_fs_fs__revision_exists(rev, fs, pool));
+ SVN_ERR(svn_fs_fs__ensure_revision_exists(rev, fs, pool));
/* this info will not change while we hold the global FS write lock */
is_packed = svn_fs_fs__is_packed_revprop(fs, rev);
Modified: subversion/branches/fsfs-improvements/subversion/libsvn_fs_fs/verify.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/libsvn_fs_fs/verify.c?rev=1504852&r1=1504851&r2=1504852&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/libsvn_fs_fs/verify.c (original)
+++ subversion/branches/fsfs-improvements/subversion/libsvn_fs_fs/verify.c Fri Jul 19 12:04:37 2013
@@ -180,8 +180,8 @@ svn_fs_fs__verify(svn_fs_t *fs,
start = 0;
if (! SVN_IS_VALID_REVNUM(end))
end = youngest;
- SVN_ERR(svn_fs_fs__revision_exists(start, fs, pool));
- SVN_ERR(svn_fs_fs__revision_exists(end, fs, pool));
+ SVN_ERR(svn_fs_fs__ensure_revision_exists(start, fs, pool));
+ SVN_ERR(svn_fs_fs__ensure_revision_exists(end, fs, pool));
/* rep cache consistency */
if (ffd->format >= SVN_FS_FS__MIN_REP_SHARING_FORMAT)