Author: stefan2
Date: Sun Aug 4 11:09:44 2013
New Revision: 1510134
URL: http://svn.apache.org/r1510134
Log:
On the fsfs-improvements branch: Rename the uniquifier.txn_id member
in representation_t to avoid confusion with the txn_id member.
No functional change.
* subversion/libsvn_fs_fs/fs.h
(representation_t): rename uniquifier.txn_id to uniquifier.noderev_txn_id;
extend commentary
* subversion/libsvn_fs_fs/low_level.c
(svn_fs_fs__parse_representation,
svn_fs_fs__unparse_representation): update caller
* subversion/libsvn_fs_fs/transaction.c
(set_uniquifier): update caller
Suggested by: danielsh
Modified:
subversion/branches/fsfs-improvements/subversion/libsvn_fs_fs/fs.h
subversion/branches/fsfs-improvements/subversion/libsvn_fs_fs/low_level.c
subversion/branches/fsfs-improvements/subversion/libsvn_fs_fs/transaction.c
Modified: subversion/branches/fsfs-improvements/subversion/libsvn_fs_fs/fs.h
URL:
http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/libsvn_fs_fs/fs.h?rev=1510134&r1=1510133&r2=1510134&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/libsvn_fs_fs/fs.h
(original)
+++ subversion/branches/fsfs-improvements/subversion/libsvn_fs_fs/fs.h Sun Aug
4 11:09:44 2013
@@ -457,7 +457,7 @@ typedef struct representation_t
* the fulltext size is equal to representation size in the rev file, */
svn_filesize_t expanded_size;
- /* Is this representation a transaction? */
+ /* Is this a representation (still) within a transaction? */
svn_fs_fs__id_part_t txn_id;
/* For rep-sharing, we need a way of uniquifying node-revs which share the
@@ -466,7 +466,10 @@ typedef struct representation_t
intra-node uniqification content. */
struct
{
- svn_fs_fs__id_part_t txn_id;
+ /* unique context, i.e. txn ID, in which the noderev (!) got created */
+ svn_fs_fs__id_part_t noderev_txn_id;
+
+ /* unique value within that txn */
apr_uint64_t number;
} uniquifier;
} representation_t;
Modified:
subversion/branches/fsfs-improvements/subversion/libsvn_fs_fs/low_level.c
URL:
http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/libsvn_fs_fs/low_level.c?rev=1510134&r1=1510133&r2=1510134&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/libsvn_fs_fs/low_level.c
(original)
+++ subversion/branches/fsfs-improvements/subversion/libsvn_fs_fs/low_level.c
Sun Aug 4 11:09:44 2013
@@ -598,7 +598,7 @@ svn_fs_fs__parse_representation(represen
return svn_error_create(SVN_ERR_FS_CORRUPT, NULL,
_("Malformed text representation offset line in
node-rev"));
- SVN_ERR(svn_fs_fs__id_txn_parse(&rep->uniquifier.txn_id, str));
+ SVN_ERR(svn_fs_fs__id_txn_parse(&rep->uniquifier.noderev_txn_id, str));
str = svn_cstring_tokenize(" ", &string);
if (str == NULL || *str != '_')
@@ -846,7 +846,7 @@ svn_fs_fs__unparse_representation(repres
format_digest(rep->md5_digest, svn_checksum_md5, FALSE, pool),
format_digest(rep->sha1_digest, svn_checksum_sha1,
!rep->has_sha1, pool),
- svn_fs_fs__id_txn_unparse(&rep->uniquifier.txn_id, pool),
+ svn_fs_fs__id_txn_unparse(&rep->uniquifier.noderev_txn_id, pool),
buffer);
#undef DISPLAY_MAYBE_NULL_CHECKSUM
Modified:
subversion/branches/fsfs-improvements/subversion/libsvn_fs_fs/transaction.c
URL:
http://svn.apache.org/viewvc/subversion/branches/fsfs-improvements/subversion/libsvn_fs_fs/transaction.c?rev=1510134&r1=1510133&r2=1510134&view=diff
==============================================================================
--- subversion/branches/fsfs-improvements/subversion/libsvn_fs_fs/transaction.c
(original)
+++ subversion/branches/fsfs-improvements/subversion/libsvn_fs_fs/transaction.c
Sun Aug 4 11:09:44 2013
@@ -1381,7 +1381,7 @@ set_uniquifier(svn_fs_t *fs,
svn_fs_fs__id_part_t temp;
SVN_ERR(get_new_txn_node_id(&temp, fs, &rep->txn_id, pool));
- rep->uniquifier.txn_id = rep->txn_id;
+ rep->uniquifier.noderev_txn_id = rep->txn_id;
rep->uniquifier.number = temp.number;
return SVN_NO_ERROR;
