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/12/15 10:38:25 UTC
svn commit: r1645606 - in
/subversion/branches/fsx-id/subversion/libsvn_fs_x: cached_data.c
transaction.c util.c util.h
Author: stefan2
Date: Mon Dec 15 09:38:24 2014
New Revision: 1645606
URL: http://svn.apache.org/r1645606
Log:
On the fsx-id branch: Push the noderev ID change from its implementation
to svn_fs_x__path_txn_node_rev() signature. Update callers.
* subversion/libsvn_fs_x/util.h
(svn_fs_x__path_txn_node_rev): Expect our new noderev ID type instead of
the FS API ID.
* subversion/libsvn_fs_x/util.c
(svn_fs_x__path_txn_node_rev): Update and simplify.
(svn_fs_x__path_txn_node_props,
svn_fs_x__path_txn_node_children): Update callers.
* subversion/libsvn_fs_x/cached_data.c
(get_node_revision_body): Ditto.
* subversion/libsvn_fs_x/transaction.c
(svn_fs_x__put_node_revision,
svn_fs_x__delete_node_revision): Ditto.
Modified:
subversion/branches/fsx-id/subversion/libsvn_fs_x/cached_data.c
subversion/branches/fsx-id/subversion/libsvn_fs_x/transaction.c
subversion/branches/fsx-id/subversion/libsvn_fs_x/util.c
subversion/branches/fsx-id/subversion/libsvn_fs_x/util.h
Modified: subversion/branches/fsx-id/subversion/libsvn_fs_x/cached_data.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsx-id/subversion/libsvn_fs_x/cached_data.c?rev=1645606&r1=1645605&r2=1645606&view=diff
==============================================================================
--- subversion/branches/fsx-id/subversion/libsvn_fs_x/cached_data.c (original)
+++ subversion/branches/fsx-id/subversion/libsvn_fs_x/cached_data.c Mon Dec 15 09:38:24 2014
@@ -276,6 +276,7 @@ get_node_revision_body(node_revision_t *
svn_error_t *err;
svn_boolean_t is_cached = FALSE;
fs_x_data_t *ffd = fs->fsap_data;
+ const svn_fs_x__noderev_id_t *noderev_id = svn_fs_x__id_noderev_id(id);
if (svn_fs_x__id_is_txn(id))
{
@@ -284,7 +285,7 @@ get_node_revision_body(node_revision_t *
/* This is a transaction node-rev. Its storage logic is very
different from that of rev / pack files. */
err = svn_io_file_open(&file,
- svn_fs_x__path_txn_node_rev(fs, id,
+ svn_fs_x__path_txn_node_rev(fs, noderev_id,
scratch_pool),
APR_READ | APR_BUFFERED, APR_OS_DEFAULT,
scratch_pool);
@@ -310,7 +311,6 @@ get_node_revision_body(node_revision_t *
svn_fs_x__revision_file_t *revision_file;
/* noderevs in rev / pack files can be cached */
- const svn_fs_x__id_part_t *noderev_id = svn_fs_x__id_noderev_id(id);
svn_revnum_t revision = svn_fs_x__get_revnum(noderev_id->change_set);
pair_cache_key_t key;
Modified: subversion/branches/fsx-id/subversion/libsvn_fs_x/transaction.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsx-id/subversion/libsvn_fs_x/transaction.c?rev=1645606&r1=1645605&r2=1645606&view=diff
==============================================================================
--- subversion/branches/fsx-id/subversion/libsvn_fs_x/transaction.c (original)
+++ subversion/branches/fsx-id/subversion/libsvn_fs_x/transaction.c Mon Dec 15 09:38:24 2014
@@ -752,6 +752,7 @@ svn_fs_x__put_node_revision(svn_fs_t *fs
apr_pool_t *pool)
{
apr_file_t *noderev_file;
+ const svn_fs_x__noderev_id_t *noderev_id = svn_fs_x__id_noderev_id(id);
noderev->is_fresh_txn_root = fresh_txn_root;
@@ -761,7 +762,7 @@ svn_fs_x__put_node_revision(svn_fs_t *fs
svn_fs_x__id_unparse(id, pool)->data);
SVN_ERR(svn_io_file_open(&noderev_file,
- svn_fs_x__path_txn_node_rev(fs, id, pool),
+ svn_fs_x__path_txn_node_rev(fs, noderev_id, pool),
APR_WRITE | APR_CREATE | APR_TRUNCATE
| APR_BUFFERED, APR_OS_DEFAULT, pool));
@@ -3616,6 +3617,7 @@ svn_fs_x__delete_node_revision(svn_fs_t
apr_pool_t *pool)
{
node_revision_t *noderev;
+ const svn_fs_x__noderev_id_t *noderev_id = svn_fs_x__id_noderev_id(id);
SVN_ERR(svn_fs_x__get_node_revision(&noderev, fs, id, pool, pool));
@@ -3641,7 +3643,8 @@ svn_fs_x__delete_node_revision(svn_fs_t
SVN_ERR(svn_cache__set(ffd->dir_cache, key, NULL, pool));
}
- return svn_io_remove_file2(svn_fs_x__path_txn_node_rev(fs, id, pool),
+ return svn_io_remove_file2(svn_fs_x__path_txn_node_rev(fs, noderev_id,
+ pool),
FALSE, pool);
}
Modified: subversion/branches/fsx-id/subversion/libsvn_fs_x/util.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsx-id/subversion/libsvn_fs_x/util.c?rev=1645606&r1=1645605&r2=1645606&view=diff
==============================================================================
--- subversion/branches/fsx-id/subversion/libsvn_fs_x/util.c (original)
+++ subversion/branches/fsx-id/subversion/libsvn_fs_x/util.c Mon Dec 15 09:38:24 2014
@@ -388,10 +388,9 @@ svn_fs_x__path_txn_proto_rev_lock(svn_fs
const char *
svn_fs_x__path_txn_node_rev(svn_fs_t *fs,
- const svn_fs_id_t *fs_id,
+ const svn_fs_x__noderev_id_t *id,
apr_pool_t *pool)
{
- const svn_fs_x__noderev_id_t *id = svn_fs_x__id_noderev_id(fs_id);
const char *filename = svn_fs_x__noderev_id_unparse(id, pool)->data;
apr_int64_t txn_id = svn_fs_x__get_txn_id(id->change_set);
@@ -405,14 +404,16 @@ svn_fs_x__path_txn_node_props(svn_fs_t *
const svn_fs_id_t *id,
apr_pool_t *pool)
{
- return apr_pstrcat(pool, svn_fs_x__path_txn_node_rev(fs, id, pool),
+ const svn_fs_x__noderev_id_t *noderev_id = svn_fs_x__id_noderev_id(id);
+ return apr_pstrcat(pool, svn_fs_x__path_txn_node_rev(fs, noderev_id, pool),
PATH_EXT_PROPS, SVN_VA_NULL);
}
const char *
svn_fs_x__path_txn_node_children(svn_fs_t *fs, const svn_fs_id_t *id, apr_pool_t *pool)
{
- return apr_pstrcat(pool, svn_fs_x__path_txn_node_rev(fs, id, pool),
+ const svn_fs_x__noderev_id_t *noderev_id = svn_fs_x__id_noderev_id(id);
+ return apr_pstrcat(pool, svn_fs_x__path_txn_node_rev(fs, noderev_id, pool),
PATH_EXT_CHILDREN, SVN_VA_NULL);
}
Modified: subversion/branches/fsx-id/subversion/libsvn_fs_x/util.h
URL: http://svn.apache.org/viewvc/subversion/branches/fsx-id/subversion/libsvn_fs_x/util.h?rev=1645606&r1=1645605&r2=1645606&view=diff
==============================================================================
--- subversion/branches/fsx-id/subversion/libsvn_fs_x/util.h (original)
+++ subversion/branches/fsx-id/subversion/libsvn_fs_x/util.h Mon Dec 15 09:38:24 2014
@@ -245,7 +245,7 @@ svn_fs_x__path_txn_proto_rev_lock(svn_fs
const char *
svn_fs_x__path_txn_node_rev(svn_fs_t *fs,
- const svn_fs_id_t *id,
+ const svn_fs_x__noderev_id_t *id,
apr_pool_t *pool);
const char *