aboutsummaryrefslogtreecommitdiff
path: root/subversion/libsvn_fs_x/changes.c
diff options
context:
space:
mode:
Diffstat (limited to 'subversion/libsvn_fs_x/changes.c')
-rw-r--r--subversion/libsvn_fs_x/changes.c81
1 files changed, 40 insertions, 41 deletions
diff --git a/subversion/libsvn_fs_x/changes.c b/subversion/libsvn_fs_x/changes.c
index a7d5ee2fbe52..c385e59da7f6 100644
--- a/subversion/libsvn_fs_x/changes.c
+++ b/subversion/libsvn_fs_x/changes.c
@@ -21,6 +21,7 @@
*/
#include "svn_private_config.h"
+#include "svn_sorts.h"
#include "private/svn_packed_data.h"
@@ -37,8 +38,8 @@
/* the change contains a property modification */
#define CHANGE_PROP_MOD 0x00002
-/* the last part (rev_id) of node revision ID is a transaction ID */
-#define CHANGE_TXN_NODE 0x00004
+/* the change contains a mergeinfo modification */
+#define CHANGE_MERGEINFO_MOD 0x00004
/* (flags & CHANGE_NODE_MASK) >> CHANGE_NODE_SHIFT extracts the node type */
#define CHANGE_NODE_SHIFT 0x00003
@@ -52,16 +53,13 @@
/* (flags & CHANGE_KIND_MASK) >> CHANGE_KIND_SHIFT extracts the change type */
#define CHANGE_KIND_SHIFT 0x00005
-#define CHANGE_KIND_MASK 0x000E0
+#define CHANGE_KIND_MASK 0x00060
/* node types according to svn_fs_path_change_kind_t */
#define CHANGE_KIND_MODIFY 0x00000
#define CHANGE_KIND_ADD 0x00020
#define CHANGE_KIND_DELETE 0x00040
#define CHANGE_KIND_REPLACE 0x00060
-#define CHANGE_KIND_RESET 0x00080
-#define CHANGE_KIND_MOVE 0x000A0
-#define CHANGE_KIND_MOVEREPLACE 0x000C0
/* Our internal representation of a change */
typedef struct binary_change_t
@@ -77,10 +75,6 @@ typedef struct binary_change_t
svn_revnum_t copyfrom_rev;
apr_size_t copyfrom_path;
- /* Relevant parts of the node revision ID of the change.
- * Empty, if REV_ID is not "used". */
- svn_fs_x__id_t noderev_id;
-
} binary_change_t;
/* The actual container object. Change lists are concatenated into CHANGES
@@ -138,20 +132,16 @@ append_change(svn_fs_x__changes_t *changes,
svn_fs_x__change_t *change)
{
binary_change_t binary_change = { 0 };
- svn_boolean_t is_txn_id;
/* CHANGE must be sufficiently complete */
SVN_ERR_ASSERT(change);
SVN_ERR_ASSERT(change->path.data);
- /* Relevant parts of the revision ID of the change. */
- binary_change.noderev_id = change->noderev_id;
-
/* define the kind of change and what specific information is present */
- is_txn_id = svn_fs_x__is_txn(binary_change.noderev_id.change_set);
binary_change.flags = (change->text_mod ? CHANGE_TEXT_MOD : 0)
| (change->prop_mod ? CHANGE_PROP_MOD : 0)
- | (is_txn_id ? CHANGE_TXN_NODE : 0)
+ | (change->mergeinfo_mod == svn_tristate_true
+ ? CHANGE_MERGEINFO_MOD : 0)
| ((int)change->change_kind << CHANGE_KIND_SHIFT)
| ((int)change->node_kind << CHANGE_NODE_SHIFT);
@@ -222,8 +212,11 @@ svn_error_t *
svn_fs_x__changes_get_list(apr_array_header_t **list,
const svn_fs_x__changes_t *changes,
apr_size_t idx,
- apr_pool_t *pool)
+ svn_fs_x__changes_context_t *context,
+ apr_pool_t *result_pool)
{
+ int list_first;
+ int list_last;
int first;
int last;
int i;
@@ -235,37 +228,46 @@ svn_fs_x__changes_get_list(apr_array_header_t **list,
/* validate index */
if (idx + 1 >= (apr_size_t)changes->offsets->nelts)
return svn_error_createf(SVN_ERR_FS_CONTAINER_INDEX, NULL,
- apr_psprintf(pool,
+ apr_psprintf(result_pool,
_("Changes list index %%%s"
" exceeds container size %%d"),
APR_SIZE_T_FMT),
idx, changes->offsets->nelts - 1);
/* range of changes to return */
- first = APR_ARRAY_IDX(changes->offsets, (int)idx, int);
- last = APR_ARRAY_IDX(changes->offsets, (int)idx + 1, int);
+ list_first = APR_ARRAY_IDX(changes->offsets, (int)idx, int);
+ list_last = APR_ARRAY_IDX(changes->offsets, (int)idx + 1, int);
+
+ /* Restrict it to the sub-range requested by the caller.
+ * Clip the range to never exceed the list's content. */
+ first = MIN(context->next + list_first, list_last);
+ last = MIN(first + SVN_FS_X__CHANGES_BLOCK_SIZE, list_last);
+
+ /* Indicate to the caller whether the end of the list has been reached. */
+ context->eol = last == list_last;
/* construct result */
- *list = apr_array_make(pool, last - first, sizeof(svn_fs_x__change_t*));
+ *list = apr_array_make(result_pool, last - first,
+ sizeof(svn_fs_x__change_t*));
for (i = first; i < last; ++i)
{
const binary_change_t *binary_change
= &APR_ARRAY_IDX(changes->changes, i, binary_change_t);
/* convert BINARY_CHANGE into a standard FSX svn_fs_x__change_t */
- svn_fs_x__change_t *change = apr_pcalloc(pool, sizeof(*change));
+ svn_fs_x__change_t *change = apr_pcalloc(result_pool, sizeof(*change));
change->path.data = svn_fs_x__string_table_get(changes->paths,
binary_change->path,
&change->path.len,
- pool);
-
- if (binary_change->noderev_id.change_set != SVN_FS_X__INVALID_CHANGE_SET)
- change->noderev_id = binary_change->noderev_id;
+ result_pool);
change->change_kind = (svn_fs_path_change_kind_t)
((binary_change->flags & CHANGE_KIND_MASK) >> CHANGE_KIND_SHIFT);
change->text_mod = (binary_change->flags & CHANGE_TEXT_MOD) != 0;
change->prop_mod = (binary_change->flags & CHANGE_PROP_MOD) != 0;
+ change->mergeinfo_mod = (binary_change->flags & CHANGE_MERGEINFO_MOD)
+ ? svn_tristate_true
+ : svn_tristate_false;
change->node_kind = (svn_node_kind_t)
((binary_change->flags & CHANGE_NODE_MASK) >> CHANGE_NODE_SHIFT);
@@ -276,7 +278,7 @@ svn_fs_x__changes_get_list(apr_array_header_t **list,
= svn_fs_x__string_table_get(changes->paths,
binary_change->copyfrom_path,
NULL,
- pool);
+ result_pool);
/* add it to the result */
APR_ARRAY_PUSH(*list, svn_fs_x__change_t*) = change;
@@ -311,8 +313,6 @@ svn_fs_x__write_changes_container(svn_stream_t *stream,
svn_packed__create_int_substream(changes_stream, TRUE, FALSE);
svn_packed__create_int_substream(changes_stream, TRUE, TRUE);
svn_packed__create_int_substream(changes_stream, TRUE, FALSE);
- svn_packed__create_int_substream(changes_stream, TRUE, TRUE);
- svn_packed__create_int_substream(changes_stream, TRUE, FALSE);
/* serialize offsets array */
for (i = 0; i < changes->offsets->nelts; ++i)
@@ -330,9 +330,6 @@ svn_fs_x__write_changes_container(svn_stream_t *stream,
svn_packed__add_int(changes_stream, change->copyfrom_rev);
svn_packed__add_uint(changes_stream, change->copyfrom_path);
-
- svn_packed__add_int(changes_stream, change->noderev_id.change_set);
- svn_packed__add_uint(changes_stream, change->noderev_id.number);
}
/* write to disk */
@@ -387,9 +384,6 @@ svn_fs_x__read_changes_container(svn_fs_x__changes_t **changes_p,
change.copyfrom_rev = (svn_revnum_t)svn_packed__get_int(changes_stream);
change.copyfrom_path = (apr_size_t)svn_packed__get_uint(changes_stream);
- change.noderev_id.change_set = svn_packed__get_int(changes_stream);
- change.noderev_id.number = svn_packed__get_uint(changes_stream);
-
APR_ARRAY_PUSH(changes->changes, binary_change_t) = change;
}
@@ -437,14 +431,14 @@ svn_error_t *
svn_fs_x__deserialize_changes_container(void **out,
void *data,
apr_size_t data_len,
- apr_pool_t *pool)
+ apr_pool_t *result_pool)
{
svn_fs_x__changes_t *changes = (svn_fs_x__changes_t *)data;
/* de-serialize sub-structures */
svn_fs_x__deserialize_string_table(changes, &changes->paths);
- svn_fs_x__deserialize_apr_array(changes, &changes->changes, pool);
- svn_fs_x__deserialize_apr_array(changes, &changes->offsets, pool);
+ svn_fs_x__deserialize_apr_array(changes, &changes->changes, result_pool);
+ svn_fs_x__deserialize_apr_array(changes, &changes->offsets, result_pool);
/* done */
*out = changes;
@@ -464,7 +458,8 @@ svn_fs_x__changes_get_list_func(void **out,
int i;
apr_array_header_t *list;
- apr_uint32_t idx = *(apr_uint32_t *)baton;
+ svn_fs_x__changes_get_list_baton_t *b = baton;
+ apr_uint32_t idx = b->sub_item;
const svn_fs_x__changes_t *container = data;
/* resolve all the sub-container pointers we need */
@@ -495,6 +490,12 @@ svn_fs_x__changes_get_list_func(void **out,
first = offsets[idx];
last = offsets[idx+1];
+ /* Restrict range to the block requested by the BATON.
+ * Tell the caller whether we reached the end of the list. */
+ first = MIN(first + b->start, last);
+ last = MIN(first + SVN_FS_X__CHANGES_BLOCK_SIZE, last);
+ *b->eol = last == offsets[idx+1];
+
/* construct result */
list = apr_array_make(pool, last - first, sizeof(svn_fs_x__change_t*));
@@ -508,8 +509,6 @@ svn_fs_x__changes_get_list_func(void **out,
= svn_fs_x__string_table_get_func(paths, binary_change->path,
&change->path.len, pool);
- change->noderev_id = binary_change->noderev_id;
-
change->change_kind = (svn_fs_path_change_kind_t)
((binary_change->flags & CHANGE_KIND_MASK) >> CHANGE_KIND_SHIFT);
change->text_mod = (binary_change->flags & CHANGE_TEXT_MOD) != 0;
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-12 03:42:14 +0000