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/01 22:12:33 UTC
svn commit: r1498660 - in
/subversion/branches/fsfs-format7/subversion/libsvn_fs_x: cached_data.c
fs.c fs.h fs_x.c id.c index.h low_level.c low_level.h pack.c rep-cache.h
string_table.h transaction.c
Author: stefan2
Date: Mon Jul 1 20:12:33 2013
New Revision: 1498660
URL: http://svn.apache.org/r1498660
Log:
On the fsfs-format7 branch:
Mass-replace SVN_FS_FS__* #defines with SVN_FS_X__* ones.
* subversion/libsvn_fs_x/cached_data.c
* subversion/libsvn_fs_x/fs.c
* subversion/libsvn_fs_x/fs.h
* subversion/libsvn_fs_x/fs_x.c
* subversion/libsvn_fs_x/id.c
* subversion/libsvn_fs_x/index.h
* subversion/libsvn_fs_x/low_level.c
* subversion/libsvn_fs_x/low_level.h
* subversion/libsvn_fs_x/pack.c
* subversion/libsvn_fs_x/rep-cache.h
* subversion/libsvn_fs_x/string_table.h
* subversion/libsvn_fs_x/transaction.c: s/SVN_FS_FS__/SVN_FS_X__/g
Modified:
subversion/branches/fsfs-format7/subversion/libsvn_fs_x/cached_data.c
subversion/branches/fsfs-format7/subversion/libsvn_fs_x/fs.c
subversion/branches/fsfs-format7/subversion/libsvn_fs_x/fs.h
subversion/branches/fsfs-format7/subversion/libsvn_fs_x/fs_x.c
subversion/branches/fsfs-format7/subversion/libsvn_fs_x/id.c
subversion/branches/fsfs-format7/subversion/libsvn_fs_x/index.h
subversion/branches/fsfs-format7/subversion/libsvn_fs_x/low_level.c
subversion/branches/fsfs-format7/subversion/libsvn_fs_x/low_level.h
subversion/branches/fsfs-format7/subversion/libsvn_fs_x/pack.c
subversion/branches/fsfs-format7/subversion/libsvn_fs_x/rep-cache.h
subversion/branches/fsfs-format7/subversion/libsvn_fs_x/string_table.h
subversion/branches/fsfs-format7/subversion/libsvn_fs_x/transaction.c
Modified: subversion/branches/fsfs-format7/subversion/libsvn_fs_x/cached_data.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_fs_x/cached_data.c?rev=1498660&r1=1498659&r2=1498660&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_fs_x/cached_data.c (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_fs_x/cached_data.c Mon Jul 1 20:12:33 2013
@@ -54,13 +54,13 @@ block_read(void **result,
/* Defined this to enable access logging via dgb__log_access
-#define SVN_FS_FS__LOG_ACCESS
+#define SVN_FS_X__LOG_ACCESS
*/
-/* When SVN_FS_FS__LOG_ACCESS has been defined, write a line to console
+/* When SVN_FS_X__LOG_ACCESS has been defined, write a line to console
* showing where REVISION, ITEM_INDEX is located in FS and use ITEM to
* show details on it's contents if not NULL. To support format 6 and
- * earlier repos, ITEM_TYPE (SVN_FS_FS__ITEM_TYPE_*) must match ITEM.
+ * earlier repos, ITEM_TYPE (SVN_FS_X__ITEM_TYPE_*) must match ITEM.
* Use SCRATCH_POOL for temporary allocations.
*
* For pre-format7 repos, the display will be restricted.
@@ -74,7 +74,7 @@ dgb__log_access(svn_fs_t *fs,
apr_pool_t *scratch_pool)
{
/* no-op if this macro is not defined */
-#ifdef SVN_FS_FS__LOG_ACCESS
+#ifdef SVN_FS_X__LOG_ACCESS
fs_x_data_t *ffd = fs->fsap_data;
apr_off_t offset = -1;
apr_off_t end_offset = 0;
@@ -98,7 +98,7 @@ dgb__log_access(svn_fs_t *fs,
revision / ffd->max_files_per_dir);
/* construct description if possible */
- if (item_type == SVN_FS_FS__ITEM_TYPE_NODEREV && item != NULL)
+ if (item_type == SVN_FS_X__ITEM_TYPE_NODEREV && item != NULL)
{
node_revision_t *node = item;
const char *data_rep
@@ -119,7 +119,7 @@ dgb__log_access(svn_fs_t *fs,
data_rep,
prop_rep);
}
- else if (item_type == SVN_FS_FS__ITEM_TYPE_ANY_REP)
+ else if (item_type == SVN_FS_X__ITEM_TYPE_ANY_REP)
{
svn_fs_x__rep_header_t *header = item;
if (header == NULL)
@@ -134,7 +134,7 @@ dgb__log_access(svn_fs_t *fs,
header->base_revision,
header->base_item_index);
}
- else if (item_type == SVN_FS_FS__ITEM_TYPE_CHANGES && item != NULL)
+ else if (item_type == SVN_FS_X__ITEM_TYPE_CHANGES && item != NULL)
{
apr_array_header_t *changes = item;
switch (changes->nelts)
@@ -149,7 +149,7 @@ dgb__log_access(svn_fs_t *fs,
}
/* some info is only available in format7 repos */
- if (ffd->format >= SVN_FS_FS__MIN_LOG_ADDRESSING_FORMAT)
+ if (ffd->format >= SVN_FS_X__MIN_LOG_ADDRESSING_FORMAT)
{
/* reverse index lookup: get item description in ENTRY */
SVN_ERR(svn_fs_x__p2l_entry_lookup(&entry, fs, revision, offset,
@@ -161,9 +161,9 @@ dgb__log_access(svn_fs_t *fs,
type = types[entry->type];
/* merge the sub-item number with the container type */
- if ( entry->type == SVN_FS_FS__ITEM_TYPE_CHANGES_CONT
- || entry->type == SVN_FS_FS__ITEM_TYPE_NODEREVS_CONT
- || entry->type == SVN_FS_FS__ITEM_TYPE_REPS_CONT)
+ if ( entry->type == SVN_FS_X__ITEM_TYPE_CHANGES_CONT
+ || entry->type == SVN_FS_X__ITEM_TYPE_NODEREVS_CONT
+ || entry->type == SVN_FS_X__ITEM_TYPE_REPS_CONT)
type = apr_psprintf(scratch_pool, "%s%-3d", type, sub_item);
}
@@ -407,7 +407,7 @@ svn_fs_x__get_node_revision(node_revisio
rev_item->revision,
rev_item->number,
*noderev_p,
- SVN_FS_FS__ITEM_TYPE_NODEREV,
+ SVN_FS_X__ITEM_TYPE_NODEREV,
pool));
return svn_error_trace(err);
@@ -564,7 +564,7 @@ create_rep_state_body(rep_state_t **rep_
svn_fs_x__p2l_entry_t *entry;
SVN_ERR(svn_fs_x__p2l_entry_lookup(&entry, fs, rep->revision,
offset, pool));
- in_container = entry->type == SVN_FS_FS__ITEM_TYPE_REPS_CONT;
+ in_container = entry->type == SVN_FS_X__ITEM_TYPE_REPS_CONT;
}
if (in_container)
@@ -626,7 +626,7 @@ create_rep_state_body(rep_state_t **rep_
}
SVN_ERR(dgb__log_access(fs, rep->revision, rep->item_index, rh,
- SVN_FS_FS__ITEM_TYPE_ANY_REP, pool));
+ SVN_FS_X__ITEM_TYPE_ANY_REP, pool));
rs->header_size = rh->header_size;
*rep_state = rs;
@@ -1234,7 +1234,7 @@ read_delta_window(svn_txdelta_window_t *
SVN_ERR_ASSERT(rs->chunk_index <= this_chunk);
SVN_ERR(dgb__log_access(rs->file->fs, rs->revision, rs->item_index,
- NULL, SVN_FS_FS__ITEM_TYPE_ANY_REP, pool));
+ NULL, SVN_FS_X__ITEM_TYPE_ANY_REP, pool));
/* Read the next window. But first, try to find it in the cache. */
SVN_ERR(get_cached_window(nwin, rs, this_chunk, &is_cached, pool));
@@ -1507,8 +1507,8 @@ init_rep_state(rep_state_t *rs,
shared_file_t *shared_file = apr_pcalloc(pool, sizeof(*shared_file));
/* this function does not apply to representation containers */
- SVN_ERR_ASSERT(entry->type >= SVN_FS_FS__ITEM_TYPE_FILE_REP
- && entry->type <= SVN_FS_FS__ITEM_TYPE_DIR_PROPS);
+ SVN_ERR_ASSERT(entry->type >= SVN_FS_X__ITEM_TYPE_FILE_REP
+ && entry->type <= SVN_FS_X__ITEM_TYPE_DIR_PROPS);
SVN_ERR_ASSERT(entry->item_count == 1);
shared_file->file = file;
@@ -1640,8 +1640,8 @@ svn_fs_x__get_representation_length(svn_
svn_fs_x__rep_header_t *rep_header;
/* this function does not apply to representation containers */
- SVN_ERR_ASSERT(entry->type >= SVN_FS_FS__ITEM_TYPE_FILE_REP
- && entry->type <= SVN_FS_FS__ITEM_TYPE_DIR_PROPS);
+ SVN_ERR_ASSERT(entry->type >= SVN_FS_X__ITEM_TYPE_FILE_REP
+ && entry->type <= SVN_FS_X__ITEM_TYPE_DIR_PROPS);
SVN_ERR_ASSERT(entry->item_count == 1);
/* get / read the representation header */
@@ -2115,11 +2115,11 @@ parse_dir_entries(apr_hash_t **entries_p
_("Directory entry corrupt in '%s'"),
svn_fs_x__id_unparse(id, pool)->data);
- if (strcmp(str, SVN_FS_FS__KIND_FILE) == 0)
+ if (strcmp(str, SVN_FS_X__KIND_FILE) == 0)
{
dirent->kind = svn_node_file;
}
- else if (strcmp(str, SVN_FS_FS__KIND_DIR) == 0)
+ else if (strcmp(str, SVN_FS_X__KIND_DIR) == 0)
{
dirent->kind = svn_node_dir;
}
@@ -2352,7 +2352,7 @@ svn_fs_x__get_changes(apr_array_header_t
pair_cache_key_t key;
SVN_ERR(svn_fs_x__item_offset(&offset, &sub_item, fs, rev, NULL,
- SVN_FS_FS__ITEM_INDEX_CHANGES, pool));
+ SVN_FS_X__ITEM_INDEX_CHANGES, pool));
key.revision = svn_fs_x__packed_base_rev(fs, rev);
key.second = offset;
@@ -2377,14 +2377,14 @@ svn_fs_x__get_changes(apr_array_header_t
/* 'block-read' will also provide us with the desired data */
SVN_ERR(block_read((void **)changes, fs,
- rev, SVN_FS_FS__ITEM_INDEX_CHANGES,
+ rev, SVN_FS_X__ITEM_INDEX_CHANGES,
revision_file, pool, pool));
SVN_ERR(svn_io_file_close(revision_file, pool));
}
- SVN_ERR(dgb__log_access(fs, rev, SVN_FS_FS__ITEM_INDEX_CHANGES, *changes,
- SVN_FS_FS__ITEM_TYPE_CHANGES, pool));
+ SVN_ERR(dgb__log_access(fs, rev, SVN_FS_X__ITEM_INDEX_CHANGES, *changes,
+ SVN_FS_X__ITEM_TYPE_CHANGES, pool));
return SVN_NO_ERROR;
}
@@ -2764,7 +2764,7 @@ block_read(void **result,
= &APR_ARRAY_IDX(entries, i, svn_fs_x__p2l_entry_t);
/* skip empty sections */
- if (entry->type == SVN_FS_FS__ITEM_TYPE_UNUSED)
+ if (entry->type == SVN_FS_X__ITEM_TYPE_UNUSED)
continue;
/* the item / container we were looking for? */
@@ -2792,16 +2792,16 @@ block_read(void **result,
&entry->offset, iterpool));
switch (entry->type)
{
- case SVN_FS_FS__ITEM_TYPE_FILE_REP:
- case SVN_FS_FS__ITEM_TYPE_DIR_REP:
- case SVN_FS_FS__ITEM_TYPE_FILE_PROPS:
- case SVN_FS_FS__ITEM_TYPE_DIR_PROPS:
+ case SVN_FS_X__ITEM_TYPE_FILE_REP:
+ case SVN_FS_X__ITEM_TYPE_DIR_REP:
+ case SVN_FS_X__ITEM_TYPE_FILE_PROPS:
+ case SVN_FS_X__ITEM_TYPE_DIR_PROPS:
SVN_ERR(block_read_contents((svn_stringbuf_t **)&item,
fs, revision_file, stream,
entry, &key, pool));
break;
- case SVN_FS_FS__ITEM_TYPE_NODEREV:
+ case SVN_FS_X__ITEM_TYPE_NODEREV:
if (ffd->node_revision_cache || is_result)
SVN_ERR(block_read_noderev((node_revision_t **)&item,
fs, revision_file, stream,
@@ -2809,13 +2809,13 @@ block_read(void **result,
pool));
break;
- case SVN_FS_FS__ITEM_TYPE_CHANGES:
+ case SVN_FS_X__ITEM_TYPE_CHANGES:
SVN_ERR(block_read_changes((apr_array_header_t **)&item,
fs, revision_file, stream,
entry, is_result, pool));
break;
- case SVN_FS_FS__ITEM_TYPE_CHANGES_CONT:
+ case SVN_FS_X__ITEM_TYPE_CHANGES_CONT:
SVN_ERR(block_read_changes_container
((apr_array_header_t **)&item,
fs, revision_file, stream,
@@ -2823,7 +2823,7 @@ block_read(void **result,
is_result, pool));
break;
- case SVN_FS_FS__ITEM_TYPE_NODEREVS_CONT:
+ case SVN_FS_X__ITEM_TYPE_NODEREVS_CONT:
SVN_ERR(block_read_noderevs_container
((node_revision_t **)&item,
fs, revision_file, stream,
@@ -2831,7 +2831,7 @@ block_read(void **result,
is_result, pool));
break;
- case SVN_FS_FS__ITEM_TYPE_REPS_CONT:
+ case SVN_FS_X__ITEM_TYPE_REPS_CONT:
SVN_ERR(block_read_reps_container
((svn_fs_x__rep_extractor_t **)&item,
fs, revision_file, stream,
Modified: subversion/branches/fsfs-format7/subversion/libsvn_fs_x/fs.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_fs_x/fs.c?rev=1498660&r1=1498659&r2=1498660&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_fs_x/fs.c (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_fs_x/fs.c Mon Jul 1 20:12:33 2013
@@ -97,14 +97,14 @@ x_serialized_init(svn_fs_t *fs, apr_pool
intra-process synchronization when grabbing the repository write
lock. */
SVN_ERR(svn_mutex__init(&ffsd->fs_write_lock,
- SVN_FS_FS__USE_LOCK_MUTEX, common_pool));
+ SVN_FS_X__USE_LOCK_MUTEX, common_pool));
/* ... not to mention locking the txn-current file. */
SVN_ERR(svn_mutex__init(&ffsd->txn_current_lock,
- SVN_FS_FS__USE_LOCK_MUTEX, common_pool));
+ SVN_FS_X__USE_LOCK_MUTEX, common_pool));
SVN_ERR(svn_mutex__init(&ffsd->txn_list_lock,
- SVN_FS_FS__USE_LOCK_MUTEX, common_pool));
+ SVN_FS_X__USE_LOCK_MUTEX, common_pool));
key = apr_pstrdup(common_pool, key);
status = apr_pool_userdata_set(ffsd, key, NULL, common_pool);
Modified: subversion/branches/fsfs-format7/subversion/libsvn_fs_x/fs.h
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_fs_x/fs.h?rev=1498660&r1=1498659&r2=1498660&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_fs_x/fs.h (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_fs_x/fs.h Mon Jul 1 20:12:33 2013
@@ -149,9 +149,9 @@ typedef struct fs_x_shared_txn_data_t
synchronization. */
/* Compare ../libsvn_subr/named_atomic.c:USE_THREAD_MUTEX */
#if APR_HAS_THREADS && !defined(WIN32)
-#define SVN_FS_FS__USE_LOCK_MUTEX 1
+#define SVN_FS_X__USE_LOCK_MUTEX 1
#else
-#define SVN_FS_FS__USE_LOCK_MUTEX 0
+#define SVN_FS_X__USE_LOCK_MUTEX 0
#endif
/* Private FSFS-specific data shared between all svn_fs_t objects that
@@ -542,4 +542,4 @@ typedef struct change_t
}
#endif /* __cplusplus */
-#endif /* SVN_LIBSVN_FS_FS_H */
+#endif /* SVN_LIBSVN_FS_X_H */
Modified: subversion/branches/fsfs-format7/subversion/libsvn_fs_x/fs_x.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_fs_x/fs_x.c?rev=1498660&r1=1498659&r2=1498660&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_fs_x/fs_x.c (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_fs_x/fs_x.c Mon Jul 1 20:12:33 2013
@@ -50,8 +50,8 @@
and can be overridden by defining the macro while compiling; the
figure of 1000 is reasonable for VFAT filesystems, which are by far
the worst performers in this area. */
-#ifndef SVN_FS_FS_DEFAULT_MAX_FILES_PER_DIR
-#define SVN_FS_FS_DEFAULT_MAX_FILES_PER_DIR 1000
+#ifndef SVN_FS_X_DEFAULT_MAX_FILES_PER_DIR
+#define SVN_FS_X_DEFAULT_MAX_FILES_PER_DIR 1000
#endif
/* Begin deltification after a node history exceeded this this limit.
@@ -59,14 +59,14 @@
computational overhead and repository size savings.
Should be a power of 2.
Values < 2 will result in standard skip-delta behavior. */
-#define SVN_FS_FS_MAX_LINEAR_DELTIFICATION 16
+#define SVN_FS_X_MAX_LINEAR_DELTIFICATION 16
/* Finding a deltification base takes operations proportional to the
number of changes being skipped. To prevent exploding runtime
during commits, limit the deltification range to this value.
Should be a power of 2 minus one.
Values < 1 disable deltification. */
-#define SVN_FS_FS_MAX_DELTIFICATION_WALK 1023
+#define SVN_FS_X_MAX_DELTIFICATION_WALK 1023
@@ -224,11 +224,11 @@ read_config(fs_x_data_t *ffd,
SVN_ERR(svn_config_get_int64(ffd->config, &ffd->max_deltification_walk,
CONFIG_SECTION_DELTIFICATION,
CONFIG_OPTION_MAX_DELTIFICATION_WALK,
- SVN_FS_FS_MAX_DELTIFICATION_WALK));
+ SVN_FS_X_MAX_DELTIFICATION_WALK));
SVN_ERR(svn_config_get_int64(ffd->config, &ffd->max_linear_deltification,
CONFIG_SECTION_DELTIFICATION,
CONFIG_OPTION_MAX_LINEAR_DELTIFICATION,
- SVN_FS_FS_MAX_LINEAR_DELTIFICATION));
+ SVN_FS_X_MAX_LINEAR_DELTIFICATION));
/* Initialize revprop packing settings in ffd. */
SVN_ERR(svn_config_get_bool(ffd->config, &ffd->compress_packed_revprops,
@@ -814,7 +814,7 @@ svn_fs_x__create(svn_fs_t *fs,
format = 6;
}
ffd->format = format;
- ffd->max_files_per_dir = SVN_FS_FS_DEFAULT_MAX_FILES_PER_DIR;
+ ffd->max_files_per_dir = SVN_FS_X_DEFAULT_MAX_FILES_PER_DIR;
/* Create the revision data directories. */
SVN_ERR(svn_io_make_dir_recursively(svn_fs_x__path_rev_shard(fs, 0, pool),
Modified: subversion/branches/fsfs-format7/subversion/libsvn_fs_x/id.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_fs_x/id.c?rev=1498660&r1=1498659&r2=1498660&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_fs_x/id.c (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_fs_x/id.c Mon Jul 1 20:12:33 2013
@@ -367,7 +367,7 @@ svn_fs_id_t *svn_fs_x__id_create_root(co
id->txn_id.revision = SVN_INVALID_REVNUM;
id->rev_item.revision = revision;
- id->rev_item.number = SVN_FS_FS__ITEM_INDEX_ROOT_NODE;
+ id->rev_item.number = SVN_FS_X__ITEM_INDEX_ROOT_NODE;
id->generic_id.vtable = &id_vtable;
id->generic_id.fsap_data = &id;
Modified: subversion/branches/fsfs-format7/subversion/libsvn_fs_x/index.h
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_fs_x/index.h?rev=1498660&r1=1498659&r2=1498660&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_fs_x/index.h (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_fs_x/index.h Mon Jul 1 20:12:33 2013
@@ -28,28 +28,28 @@
/* Per-defined item index values. They are used to identify empty or
* mandatory items.
*/
-#define SVN_FS_FS__ITEM_INDEX_UNUSED 0 /* invalid / reserved value */
-#define SVN_FS_FS__ITEM_INDEX_CHANGES 1 /* list of changed paths */
-#define SVN_FS_FS__ITEM_INDEX_ROOT_NODE 2 /* the root noderev */
-#define SVN_FS_FS__ITEM_INDEX_FIRST_USER 3 /* first noderev to be freely
+#define SVN_FS_X__ITEM_INDEX_UNUSED 0 /* invalid / reserved value */
+#define SVN_FS_X__ITEM_INDEX_CHANGES 1 /* list of changed paths */
+#define SVN_FS_X__ITEM_INDEX_ROOT_NODE 2 /* the root noderev */
+#define SVN_FS_X__ITEM_INDEX_FIRST_USER 3 /* first noderev to be freely
assigned */
/* Data / item types as stored in the phys-to-log index.
*/
-#define SVN_FS_FS__ITEM_TYPE_UNUSED 0 /* file section not used */
-#define SVN_FS_FS__ITEM_TYPE_FILE_REP 1 /* item is a file representation */
-#define SVN_FS_FS__ITEM_TYPE_DIR_REP 2 /* item is a directory rep. */
-#define SVN_FS_FS__ITEM_TYPE_FILE_PROPS 3 /* item is a file property rep. */
-#define SVN_FS_FS__ITEM_TYPE_DIR_PROPS 4 /* item is a directory prop rep */
-#define SVN_FS_FS__ITEM_TYPE_NODEREV 5 /* item is a noderev */
-#define SVN_FS_FS__ITEM_TYPE_CHANGES 6 /* item is a changed paths list */
+#define SVN_FS_X__ITEM_TYPE_UNUSED 0 /* file section not used */
+#define SVN_FS_X__ITEM_TYPE_FILE_REP 1 /* item is a file representation */
+#define SVN_FS_X__ITEM_TYPE_DIR_REP 2 /* item is a directory rep. */
+#define SVN_FS_X__ITEM_TYPE_FILE_PROPS 3 /* item is a file property rep. */
+#define SVN_FS_X__ITEM_TYPE_DIR_PROPS 4 /* item is a directory prop rep */
+#define SVN_FS_X__ITEM_TYPE_NODEREV 5 /* item is a noderev */
+#define SVN_FS_X__ITEM_TYPE_CHANGES 6 /* item is a changed paths list */
-#define SVN_FS_FS__ITEM_TYPE_ANY_REP 7 /* item is any representation.
+#define SVN_FS_X__ITEM_TYPE_ANY_REP 7 /* item is any representation.
Only used in pre-format7. */
-#define SVN_FS_FS__ITEM_TYPE_CHANGES_CONT 8 /* item is a changes container */
-#define SVN_FS_FS__ITEM_TYPE_NODEREVS_CONT 9 /* item is a noderevs container */
-#define SVN_FS_FS__ITEM_TYPE_REPS_CONT 10 /* item is a representations
+#define SVN_FS_X__ITEM_TYPE_CHANGES_CONT 8 /* item is a changes container */
+#define SVN_FS_X__ITEM_TYPE_NODEREVS_CONT 9 /* item is a noderevs container */
+#define SVN_FS_X__ITEM_TYPE_REPS_CONT 10 /* item is a representations
container */
/* (user visible) entry in the phys-to-log index. It describes a section
@@ -64,7 +64,7 @@ typedef struct svn_fs_x__p2l_entry_t
/* length of the item in bytes */
apr_off_t size;
- /* type of the item (see SVN_FS_FS__ITEM_TYPE_*) defines */
+ /* type of the item (see SVN_FS_X__ITEM_TYPE_*) defines */
unsigned type;
/* Number of items in this block / container. Their list can be found
Modified: subversion/branches/fsfs-format7/subversion/libsvn_fs_x/low_level.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_fs_x/low_level.c?rev=1498660&r1=1498659&r2=1498660&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_fs_x/low_level.c (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_fs_x/low_level.c Mon Jul 1 20:12:33 2013
@@ -377,14 +377,14 @@ svn_fs_x__read_noderev(node_revision_t *
value = svn_hash_gets(headers, HEADER_TYPE);
if ((value == NULL) ||
- ( strcmp(value, SVN_FS_FS__KIND_FILE)
- && strcmp(value, SVN_FS_FS__KIND_DIR)))
+ ( strcmp(value, SVN_FS_X__KIND_FILE)
+ && strcmp(value, SVN_FS_X__KIND_DIR)))
/* ### s/kind/type/ */
return svn_error_createf(SVN_ERR_FS_CORRUPT, NULL,
_("Missing kind field in node-rev '%s'"),
noderev_id);
- noderev->kind = (strcmp(value, SVN_FS_FS__KIND_FILE) == 0)
+ noderev->kind = (strcmp(value, SVN_FS_X__KIND_FILE) == 0)
? svn_node_file
: svn_node_dir;
@@ -565,7 +565,7 @@ svn_fs_x__write_noderev(svn_stream_t *ou
SVN_ERR(svn_stream_printf(outfile, pool, HEADER_TYPE ": %s\n",
(noderev->kind == svn_node_file) ?
- SVN_FS_FS__KIND_FILE : SVN_FS_FS__KIND_DIR));
+ SVN_FS_X__KIND_FILE : SVN_FS_X__KIND_DIR));
if (noderev->predecessor_id)
SVN_ERR(svn_stream_printf(outfile, pool, HEADER_PRED ": %s\n",
@@ -758,9 +758,9 @@ read_change(change_t **change_p,
/* Cap off the end of "str" (the action). */
*kind_str = '\0';
kind_str++;
- if (strcmp(kind_str, SVN_FS_FS__KIND_FILE) == 0)
+ if (strcmp(kind_str, SVN_FS_X__KIND_FILE) == 0)
info->node_kind = svn_node_file;
- else if (strcmp(kind_str, SVN_FS_FS__KIND_DIR) == 0)
+ else if (strcmp(kind_str, SVN_FS_X__KIND_DIR) == 0)
info->node_kind = svn_node_dir;
else
return svn_error_create(SVN_ERR_FS_CORRUPT, NULL,
@@ -933,8 +933,8 @@ write_change_entry(svn_stream_t *stream,
|| change->node_kind == svn_node_file);
kind_string = apr_psprintf(pool, "-%s",
change->node_kind == svn_node_dir
- ? SVN_FS_FS__KIND_DIR
- : SVN_FS_FS__KIND_FILE);
+ ? SVN_FS_X__KIND_DIR
+ : SVN_FS_X__KIND_FILE);
buf = apr_psprintf(pool, "%s %s%s %s %s %s\n",
idstr, change_string, kind_string,
change->text_mod ? FLAG_TRUE : FLAG_FALSE,
Modified: subversion/branches/fsfs-format7/subversion/libsvn_fs_x/low_level.h
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_fs_x/low_level.h?rev=1498660&r1=1498659&r2=1498660&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_fs_x/low_level.h (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_fs_x/low_level.h Mon Jul 1 20:12:33 2013
@@ -26,8 +26,8 @@
#include "id.h"
/* Kinds that a node-rev can be. */
-#define SVN_FS_FS__KIND_FILE "file"
-#define SVN_FS_FS__KIND_DIR "dir"
+#define SVN_FS_X__KIND_FILE "file"
+#define SVN_FS_X__KIND_DIR "dir"
/* Given the last "few" bytes (should be at least 40) of revision REV in
* TRAILER, parse the last line and return the offset of the root noderev
Modified: subversion/branches/fsfs-format7/subversion/libsvn_fs_x/pack.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_fs_x/pack.c?rev=1498660&r1=1498659&r2=1498660&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_fs_x/pack.c (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_fs_x/pack.c Mon Jul 1 20:12:33 2013
@@ -851,7 +851,7 @@ auto_pad_block(pack_context_t *context,
null_entry.offset = context->pack_offset;
null_entry.size = padding;
- null_entry.type = SVN_FS_FS__ITEM_TYPE_UNUSED;
+ null_entry.type = SVN_FS_X__ITEM_TYPE_UNUSED;
null_entry.item_count = 0;
null_entry.items = NULL;
@@ -972,7 +972,7 @@ select_reps(pack_context_t *context,
if (!depending)
continue;
- if (depending->type == SVN_FS_FS__ITEM_TYPE_NODEREV)
+ if (depending->type == SVN_FS_X__ITEM_TYPE_NODEREV)
APR_ARRAY_PUSH(node_parts, svn_fs_x__p2l_entry_t *) = depending;
else
APR_ARRAY_PUSH(rep_parts, svn_fs_x__p2l_entry_t *) = depending;
@@ -1033,7 +1033,7 @@ write_nodes_container(pack_context_t *co
container_entry = apr_palloc(context->info_pool, sizeof(*container_entry));
container_entry->offset = context->pack_offset;
container_entry->size = offset - container_entry->offset;
- container_entry->type = SVN_FS_FS__ITEM_TYPE_NODEREVS_CONT;
+ container_entry->type = SVN_FS_X__ITEM_TYPE_NODEREVS_CONT;
container_entry->item_count = items->nelts;
container_entry->items = apr_palloc(context->info_pool,
sizeof(svn_fs_x__id_part_t) * container_entry->item_count);
@@ -1178,7 +1178,7 @@ write_reps_container(pack_context_t *con
container_entry.offset = context->pack_offset;
container_entry.size = offset - container_entry.offset;
- container_entry.type = SVN_FS_FS__ITEM_TYPE_REPS_CONT;
+ container_entry.type = SVN_FS_X__ITEM_TYPE_REPS_CONT;
container_entry.item_count = sub_items->nelts;
container_entry.items = (svn_fs_x__id_part_t *)sub_items->elts;
@@ -1339,7 +1339,7 @@ store_items(pack_context_t *context,
svn_fs_x__p2l_entry_t *entry
= APR_ARRAY_IDX(items, i, svn_fs_x__p2l_entry_t *);
if (!entry
- || entry->type == SVN_FS_FS__ITEM_TYPE_UNUSED
+ || entry->type == SVN_FS_X__ITEM_TYPE_UNUSED
|| entry->item_count == 0)
continue;
@@ -1488,7 +1488,7 @@ write_changes_container(pack_context_t *
container_entry.offset = context->pack_offset;
container_entry.size = offset - container_entry.offset;
- container_entry.type = SVN_FS_FS__ITEM_TYPE_CHANGES_CONT;
+ container_entry.type = SVN_FS_X__ITEM_TYPE_CHANGES_CONT;
container_entry.item_count = sub_items->nelts;
container_entry.items = (svn_fs_x__id_part_t *)sub_items->elts;
@@ -1806,30 +1806,30 @@ pack_range(pack_context_t *context,
SVN_ERR(svn_io_file_seek(rev_file, SEEK_SET, &offset,
iterpool));
- if (entry->type == SVN_FS_FS__ITEM_TYPE_CHANGES)
+ if (entry->type == SVN_FS_X__ITEM_TYPE_CHANGES)
SVN_ERR(copy_item_to_temp(context,
context->changes,
context->changes_file,
rev_file, entry, iterpool));
- else if (entry->type == SVN_FS_FS__ITEM_TYPE_FILE_PROPS)
+ else if (entry->type == SVN_FS_X__ITEM_TYPE_FILE_PROPS)
SVN_ERR(copy_item_to_temp(context,
context->file_props,
context->file_props_file,
rev_file, entry, iterpool));
- else if (entry->type == SVN_FS_FS__ITEM_TYPE_DIR_PROPS)
+ else if (entry->type == SVN_FS_X__ITEM_TYPE_DIR_PROPS)
SVN_ERR(copy_item_to_temp(context,
context->dir_props,
context->dir_props_file,
rev_file, entry, iterpool));
- else if ( entry->type == SVN_FS_FS__ITEM_TYPE_FILE_REP
- || entry->type == SVN_FS_FS__ITEM_TYPE_DIR_REP)
+ else if ( entry->type == SVN_FS_X__ITEM_TYPE_FILE_REP
+ || entry->type == SVN_FS_X__ITEM_TYPE_DIR_REP)
SVN_ERR(copy_rep_to_temp(context, rev_file, entry,
iterpool));
- else if (entry->type == SVN_FS_FS__ITEM_TYPE_NODEREV)
+ else if (entry->type == SVN_FS_X__ITEM_TYPE_NODEREV)
SVN_ERR(copy_node_to_temp(context, rev_file, entry,
iterpool));
else
- SVN_ERR_ASSERT(entry->type == SVN_FS_FS__ITEM_TYPE_UNUSED);
+ SVN_ERR_ASSERT(entry->type == SVN_FS_X__ITEM_TYPE_UNUSED);
offset += entry->size;
}
Modified: subversion/branches/fsfs-format7/subversion/libsvn_fs_x/rep-cache.h
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_fs_x/rep-cache.h?rev=1498660&r1=1498659&r2=1498660&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_fs_x/rep-cache.h (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_fs_x/rep-cache.h Mon Jul 1 20:12:33 2013
@@ -20,8 +20,8 @@
* ====================================================================
*/
-#ifndef SVN_LIBSVN_FS_FS_REP_CACHE_H
-#define SVN_LIBSVN_FS_FS_REP_CACHE_H
+#ifndef SVN_LIBSVN_FS_X_REP_CACHE_H
+#define SVN_LIBSVN_FS_X_REP_CACHE_H
#include "svn_error.h"
@@ -99,4 +99,4 @@ svn_fs_x__lock_rep_cache(svn_fs_t *fs,
}
#endif /* __cplusplus */
-#endif /* SVN_LIBSVN_FS_FS_REP_CACHE_H */
+#endif /* SVN_LIBSVN_FS_X_REP_CACHE_H */
Modified: subversion/branches/fsfs-format7/subversion/libsvn_fs_x/string_table.h
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_fs_x/string_table.h?rev=1498660&r1=1498659&r2=1498660&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_fs_x/string_table.h (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_fs_x/string_table.h Mon Jul 1 20:12:33 2013
@@ -20,8 +20,8 @@
* ====================================================================
*/
-#ifndef SVN_LIBSVN_FS_FS_STRING_TABLE_H
-#define SVN_LIBSVN_FS_FS_STRING_TABLE_H
+#ifndef SVN_LIBSVN_FS_X_STRING_TABLE_H
+#define SVN_LIBSVN_FS_X_STRING_TABLE_H
#include "svn_io.h"
#include "private/svn_temp_serializer.h"
@@ -130,4 +130,4 @@ svn_fs_x__string_table_get_func(const st
}
#endif /* __cplusplus */
-#endif /* SVN_LIBSVN_FS_FS_STRING_TABLE_H */
+#endif /* SVN_LIBSVN_FS_X_STRING_TABLE_H */
Modified: subversion/branches/fsfs-format7/subversion/libsvn_fs_x/transaction.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsfs-format7/subversion/libsvn_fs_x/transaction.c?rev=1498660&r1=1498659&r2=1498660&view=diff
==============================================================================
--- subversion/branches/fsfs-format7/subversion/libsvn_fs_x/transaction.c (original)
+++ subversion/branches/fsfs-format7/subversion/libsvn_fs_x/transaction.c Mon Jul 1 20:12:33 2013
@@ -605,8 +605,8 @@ unparse_dir_entry(svn_node_kind_t kind,
apr_pool_t *pool)
{
return apr_psprintf(pool, "%s %s",
- (kind == svn_node_file) ? SVN_FS_FS__KIND_FILE
- : SVN_FS_FS__KIND_DIR,
+ (kind == svn_node_file) ? SVN_FS_X__KIND_FILE
+ : SVN_FS_X__KIND_DIR,
svn_fs_x__id_unparse(id, pool)->data);
}
@@ -1588,7 +1588,7 @@ allocate_item_index(apr_uint64_t *item_i
if (read)
SVN_ERR(svn_cstring_atoui64(item_index, buffer));
else
- *item_index = SVN_FS_FS__ITEM_INDEX_FIRST_USER;
+ *item_index = SVN_FS_X__ITEM_INDEX_FIRST_USER;
to_write = svn__ui64toa(buffer, *item_index + 1);
SVN_ERR(svn_io_file_seek(file, SEEK_SET, &offset, pool));
@@ -2076,7 +2076,7 @@ rep_write_contents_close(void *baton)
entry.offset = b->rep_offset;
SVN_ERR(svn_fs_x__get_file_offset(&offset, b->file, b->pool));
entry.size = offset - b->rep_offset;
- entry.type = SVN_FS_FS__ITEM_TYPE_FILE_REP;
+ entry.type = SVN_FS_X__ITEM_TYPE_FILE_REP;
entry.item_count = 1;
entry.items = &rev_item;
@@ -2344,8 +2344,8 @@ write_hash_delta_rep(representation_t *r
struct write_hash_baton *whb;
int diff_version = 1;
- svn_boolean_t is_props = (item_type == SVN_FS_FS__ITEM_TYPE_FILE_PROPS)
- || (item_type == SVN_FS_FS__ITEM_TYPE_DIR_PROPS);
+ svn_boolean_t is_props = (item_type == SVN_FS_X__ITEM_TYPE_FILE_PROPS)
+ || (item_type == SVN_FS_X__ITEM_TYPE_DIR_PROPS);
/* Get the base for this delta. */
SVN_ERR(choose_delta_base(&base_rep, fs, noderev, is_props, pool));
@@ -2612,12 +2612,12 @@ write_final_rev(const svn_fs_id_t **new_
if (ffd->deltify_directories)
SVN_ERR(write_hash_delta_rep(noderev->data_rep, file,
str_entries, fs, txn_id, noderev,
- NULL, SVN_FS_FS__ITEM_TYPE_DIR_REP,
+ NULL, SVN_FS_X__ITEM_TYPE_DIR_REP,
pool));
else
SVN_ERR(write_hash_rep(noderev->data_rep, file, str_entries,
fs, txn_id, NULL,
- SVN_FS_FS__ITEM_TYPE_DIR_REP, pool));
+ SVN_FS_X__ITEM_TYPE_DIR_REP, pool));
svn_fs_x__id_txn_reset(&noderev->data_rep->txn_id);
}
@@ -2642,8 +2642,8 @@ write_final_rev(const svn_fs_id_t **new_
{
apr_hash_t *proplist;
int item_type = noderev->kind == svn_node_dir
- ? SVN_FS_FS__ITEM_TYPE_DIR_PROPS
- : SVN_FS_FS__ITEM_TYPE_FILE_PROPS;
+ ? SVN_FS_X__ITEM_TYPE_DIR_PROPS
+ : SVN_FS_X__ITEM_TYPE_FILE_PROPS;
SVN_ERR(svn_fs_x__get_proplist(&proplist, fs, noderev, pool));
svn_fs_x__id_txn_reset(&noderev->prop_rep->txn_id);
@@ -2670,7 +2670,7 @@ write_final_rev(const svn_fs_id_t **new_
SVN_ERR(svn_fs_x__get_file_offset(&my_offset, file, pool));
/* reference the root noderev from the log-to-phys index */
- rev_item.number = SVN_FS_FS__ITEM_INDEX_ROOT_NODE;
+ rev_item.number = SVN_FS_X__ITEM_INDEX_ROOT_NODE;
SVN_ERR(store_l2p_index_entry(fs, txn_id, my_offset, rev_item.number,
pool));
@@ -2730,7 +2730,7 @@ write_final_rev(const svn_fs_id_t **new_
entry.offset = my_offset;
SVN_ERR(svn_fs_x__get_file_offset(&my_offset, file, pool));
entry.size = my_offset - entry.offset;
- entry.type = SVN_FS_FS__ITEM_TYPE_NODEREV;
+ entry.type = SVN_FS_X__ITEM_TYPE_NODEREV;
entry.item_count = 1;
entry.items = &rev_item;
@@ -2757,7 +2757,7 @@ write_final_changed_path_info(apr_off_t
apr_off_t offset;
svn_fs_x__p2l_entry_t entry;
svn_fs_x__id_part_t rev_item
- = {SVN_INVALID_REVNUM, SVN_FS_FS__ITEM_INDEX_CHANGES};
+ = {SVN_INVALID_REVNUM, SVN_FS_X__ITEM_INDEX_CHANGES};
SVN_ERR(svn_fs_x__get_file_offset(&offset, file, pool));
SVN_ERR(svn_fs_x__txn_changes_fetch(&changed_paths, fs, txn_id, pool));
@@ -2770,13 +2770,13 @@ write_final_changed_path_info(apr_off_t
entry.offset = offset;
SVN_ERR(svn_fs_x__get_file_offset(&offset, file, pool));
entry.size = offset - entry.offset;
- entry.type = SVN_FS_FS__ITEM_TYPE_CHANGES;
+ entry.type = SVN_FS_X__ITEM_TYPE_CHANGES;
entry.item_count = 1;
entry.items = &rev_item;
SVN_ERR(store_p2l_index_entry(fs, txn_id, &entry, pool));
SVN_ERR(store_l2p_index_entry(fs, txn_id, entry.offset,
- SVN_FS_FS__ITEM_INDEX_CHANGES, pool));
+ SVN_FS_X__ITEM_INDEX_CHANGES, pool));
return SVN_NO_ERROR;
}