You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by vm...@apache.org on 2012/12/23 07:03:17 UTC
svn commit: r1425415 [3/13] - in /subversion/branches/javahl-ra: ./
build/generator/templates/ notes/ notes/directory-index/
subversion/bindings/swig/python/svn/ subversion/bindings/swig/ruby/test/
subversion/include/ subversion/include/private/ subver...
Modified: subversion/branches/javahl-ra/subversion/libsvn_fs_base/bdb/copies-table.c
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/libsvn_fs_base/bdb/copies-table.c?rev=1425415&r1=1425414&r2=1425415&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/libsvn_fs_base/bdb/copies-table.c (original)
+++ subversion/branches/javahl-ra/subversion/libsvn_fs_base/bdb/copies-table.c Sun Dec 23 06:03:14 2012
@@ -89,7 +89,7 @@ put_copy(svn_fs_t *fs,
svn_fs_base__str_to_dbt(&key, copy_id);
svn_fs_base__skel_to_dbt(&value, copy_skel, pool);
svn_fs_base__trail_debug(trail, "copies", "put");
- return BDB_WRAP(fs, _("storing copy record"),
+ return BDB_WRAP(fs, N_("storing copy record"),
bfd->copies->put(bfd->copies, trail->db_txn,
&key, &value, 0));
}
@@ -112,7 +112,7 @@ svn_fs_bdb__reserve_copy_id(const char *
/* Get the current value associated with the `next-key' key in the
copies table. */
svn_fs_base__trail_debug(trail, "copies", "get");
- SVN_ERR(BDB_WRAP(fs, _("allocating new copy ID (getting 'next-key')"),
+ SVN_ERR(BDB_WRAP(fs, N_("allocating new copy ID (getting 'next-key')"),
bfd->copies->get(bfd->copies, trail->db_txn, &query,
svn_fs_base__result_dbt(&result),
0)));
@@ -130,7 +130,7 @@ svn_fs_bdb__reserve_copy_id(const char *
svn_fs_base__str_to_dbt(&result, next_key),
0);
- return BDB_WRAP(fs, _("bumping next copy key"), db_err);
+ return BDB_WRAP(fs, N_("bumping next copy key"), db_err);
}
@@ -168,7 +168,7 @@ svn_fs_bdb__delete_copy(svn_fs_t *fs,
db_err = bfd->copies->del(bfd->copies, trail->db_txn, &key, 0);
if (db_err == DB_NOTFOUND)
return svn_fs_base__err_no_such_copy(fs, copy_id);
- return BDB_WRAP(fs, _("deleting entry from 'copies' table"), db_err);
+ return BDB_WRAP(fs, N_("deleting entry from 'copies' table"), db_err);
}
@@ -196,7 +196,7 @@ svn_fs_bdb__get_copy(copy_t **copy_p,
if (db_err == DB_NOTFOUND)
return svn_fs_base__err_no_such_copy(fs, copy_id);
- SVN_ERR(BDB_WRAP(fs, _("reading copy"), db_err));
+ SVN_ERR(BDB_WRAP(fs, N_("reading copy"), db_err));
/* Unparse COPY skel */
skel = svn_skel__parse(value.data, value.size, pool);
Modified: subversion/branches/javahl-ra/subversion/libsvn_fs_base/bdb/lock-tokens-table.c
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/libsvn_fs_base/bdb/lock-tokens-table.c?rev=1425415&r1=1425414&r2=1425415&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/libsvn_fs_base/bdb/lock-tokens-table.c (original)
+++ subversion/branches/javahl-ra/subversion/libsvn_fs_base/bdb/lock-tokens-table.c Sun Dec 23 06:03:14 2012
@@ -84,7 +84,7 @@ svn_fs_bdb__lock_token_add(svn_fs_t *fs,
svn_fs_base__str_to_dbt(&key, path);
svn_fs_base__str_to_dbt(&value, lock_token);
svn_fs_base__trail_debug(trail, "lock-tokens", "add");
- return BDB_WRAP(fs, "storing lock token record",
+ return BDB_WRAP(fs, N_("storing lock token record"),
bfd->lock_tokens->put(bfd->lock_tokens, trail->db_txn,
&key, &value, 0));
}
@@ -105,7 +105,7 @@ svn_fs_bdb__lock_token_delete(svn_fs_t *
db_err = bfd->lock_tokens->del(bfd->lock_tokens, trail->db_txn, &key, 0);
if (db_err == DB_NOTFOUND)
return SVN_FS__ERR_NO_SUCH_LOCK(fs, path);
- return BDB_WRAP(fs, "deleting entry from 'lock-tokens' table", db_err);
+ return BDB_WRAP(fs, N_("deleting entry from 'lock-tokens' table"), db_err);
}
@@ -132,7 +132,7 @@ svn_fs_bdb__lock_token_get(const char **
if (db_err == DB_NOTFOUND)
return SVN_FS__ERR_NO_SUCH_LOCK(fs, path);
- SVN_ERR(BDB_WRAP(fs, "reading lock token", db_err));
+ SVN_ERR(BDB_WRAP(fs, N_("reading lock token"), db_err));
lock_token = apr_pstrmemdup(pool, value.data, value.size);
Modified: subversion/branches/javahl-ra/subversion/libsvn_fs_base/bdb/locks-table.c
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/libsvn_fs_base/bdb/locks-table.c?rev=1425415&r1=1425414&r2=1425415&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/libsvn_fs_base/bdb/locks-table.c (original)
+++ subversion/branches/javahl-ra/subversion/libsvn_fs_base/bdb/locks-table.c Sun Dec 23 06:03:14 2012
@@ -89,7 +89,7 @@ svn_fs_bdb__lock_add(svn_fs_t *fs,
svn_fs_base__str_to_dbt(&key, lock_token);
svn_fs_base__skel_to_dbt(&value, lock_skel, pool);
svn_fs_base__trail_debug(trail, "lock", "add");
- return BDB_WRAP(fs, "storing lock record",
+ return BDB_WRAP(fs, N_("storing lock record"),
bfd->locks->put(bfd->locks, trail->db_txn,
&key, &value, 0));
}
@@ -112,7 +112,7 @@ svn_fs_bdb__lock_delete(svn_fs_t *fs,
if (db_err == DB_NOTFOUND)
return svn_fs_base__err_bad_lock_token(fs, lock_token);
- return BDB_WRAP(fs, "deleting lock from 'locks' table", db_err);
+ return BDB_WRAP(fs, N_("deleting lock from 'locks' table"), db_err);
}
@@ -139,7 +139,7 @@ svn_fs_bdb__lock_get(svn_lock_t **lock_p
if (db_err == DB_NOTFOUND)
return svn_fs_base__err_bad_lock_token(fs, lock_token);
- SVN_ERR(BDB_WRAP(fs, "reading lock", db_err));
+ SVN_ERR(BDB_WRAP(fs, N_("reading lock"), db_err));
/* Parse TRANSACTION skel */
skel = svn_skel__parse(value.data, value.size, pool);
@@ -242,7 +242,8 @@ svn_fs_bdb__locks_get(svn_fs_t *fs,
svn_fs_base__trail_debug(trail, "lock-tokens", "cursor");
db_err = bfd->lock_tokens->cursor(bfd->lock_tokens, trail->db_txn,
&cursor, 0);
- SVN_ERR(BDB_WRAP(fs, "creating cursor for reading lock tokens", db_err));
+ SVN_ERR(BDB_WRAP(fs, N_("creating cursor for reading lock tokens"),
+ db_err));
/* Since the key is going to be returned as well as the value make
sure BDB malloc's the returned key. */
@@ -316,9 +317,10 @@ svn_fs_bdb__locks_get(svn_fs_t *fs,
db_c_err = svn_bdb_dbc_close(cursor);
if (db_err && (db_err != DB_NOTFOUND))
- SVN_ERR(BDB_WRAP(fs, "fetching lock tokens", db_err));
+ SVN_ERR(BDB_WRAP(fs, N_("fetching lock tokens"), db_err));
if (db_c_err)
- SVN_ERR(BDB_WRAP(fs, "fetching lock tokens (closing cursor)", db_c_err));
+ SVN_ERR(BDB_WRAP(fs, N_("fetching lock tokens (closing cursor)"),
+ db_c_err));
return SVN_NO_ERROR;
}
Modified: subversion/branches/javahl-ra/subversion/libsvn_fs_base/bdb/miscellaneous-table.c
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/libsvn_fs_base/bdb/miscellaneous-table.c?rev=1425415&r1=1425414&r2=1425415&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/libsvn_fs_base/bdb/miscellaneous-table.c (original)
+++ subversion/branches/javahl-ra/subversion/libsvn_fs_base/bdb/miscellaneous-table.c Sun Dec 23 06:03:14 2012
@@ -92,7 +92,7 @@ svn_fs_bdb__miscellaneous_set(svn_fs_t *
if (val == NULL)
{
svn_fs_base__trail_debug(trail, "miscellaneous", "del");
- return BDB_WRAP(fs, "deleting record from 'miscellaneous' table",
+ return BDB_WRAP(fs, N_("deleting record from 'miscellaneous' table"),
bfd->miscellaneous->del(bfd->miscellaneous,
trail->db_txn, &key, 0));
}
@@ -100,7 +100,7 @@ svn_fs_bdb__miscellaneous_set(svn_fs_t *
{
svn_fs_base__str_to_dbt(&value, val);
svn_fs_base__trail_debug(trail, "miscellaneous", "add");
- return BDB_WRAP(fs, "storing miscellaneous record",
+ return BDB_WRAP(fs, N_("storing miscellaneous record"),
bfd->miscellaneous->put(bfd->miscellaneous,
trail->db_txn,
&key, &value, 0));
@@ -128,7 +128,7 @@ svn_fs_bdb__miscellaneous_get(const char
if (db_err != DB_NOTFOUND)
{
- SVN_ERR(BDB_WRAP(fs, "fetching miscellaneous record", db_err));
+ SVN_ERR(BDB_WRAP(fs, N_("fetching miscellaneous record"), db_err));
*val = apr_pstrmemdup(pool, value.data, value.size);
}
return SVN_NO_ERROR;
Modified: subversion/branches/javahl-ra/subversion/libsvn_fs_base/bdb/node-origins-table.c
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/libsvn_fs_base/bdb/node-origins-table.c?rev=1425415&r1=1425414&r2=1425415&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/libsvn_fs_base/bdb/node-origins-table.c (original)
+++ subversion/branches/javahl-ra/subversion/libsvn_fs_base/bdb/node-origins-table.c Sun Dec 23 06:03:14 2012
@@ -124,7 +124,7 @@ svn_error_t *svn_fs_bdb__set_node_origin
/* Create a value from our ORIGIN_ID, and add this record to the table. */
svn_fs_base__id_to_dbt(&value, origin_id, pool);
svn_fs_base__trail_debug(trail, "node-origins", "put");
- return BDB_WRAP(fs, _("storing node-origins record"),
+ return BDB_WRAP(fs, N_("storing node-origins record"),
bfd->node_origins->put(bfd->node_origins, trail->db_txn,
&key, &value, 0));
}
@@ -139,7 +139,7 @@ svn_error_t *svn_fs_bdb__delete_node_ori
svn_fs_base__str_to_dbt(&key, node_id);
svn_fs_base__trail_debug(trail, "node-origins", "del");
- return BDB_WRAP(fs, "deleting entry from 'node-origins' table",
+ return BDB_WRAP(fs, N_("deleting entry from 'node-origins' table"),
bfd->node_origins->del(bfd->node_origins,
trail->db_txn, &key, 0));
}
Modified: subversion/branches/javahl-ra/subversion/libsvn_fs_base/bdb/nodes-table.c
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/libsvn_fs_base/bdb/nodes-table.c?rev=1425415&r1=1425414&r2=1425415&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/libsvn_fs_base/bdb/nodes-table.c (original)
+++ subversion/branches/javahl-ra/subversion/libsvn_fs_base/bdb/nodes-table.c Sun Dec 23 06:03:14 2012
@@ -99,7 +99,7 @@ svn_fs_bdb__new_node_id(svn_fs_id_t **id
/* Get the current value associated with the `next-key' key in the table. */
svn_fs_base__str_to_dbt(&query, NEXT_KEY_KEY);
svn_fs_base__trail_debug(trail, "nodes", "get");
- SVN_ERR(BDB_WRAP(fs, _("allocating new node ID (getting 'next-key')"),
+ SVN_ERR(BDB_WRAP(fs, N_("allocating new node ID (getting 'next-key')"),
bfd->nodes->get(bfd->nodes, trail->db_txn,
&query,
svn_fs_base__result_dbt(&result),
@@ -117,7 +117,7 @@ svn_fs_bdb__new_node_id(svn_fs_id_t **id
svn_fs_base__str_to_dbt(&query, NEXT_KEY_KEY),
svn_fs_base__str_to_dbt(&result, next_key),
0);
- SVN_ERR(BDB_WRAP(fs, _("bumping next node ID key"), db_err));
+ SVN_ERR(BDB_WRAP(fs, N_("bumping next node ID key"), db_err));
/* Create and return the new node id. */
*id_p = svn_fs_base__id_create(next_node_id, copy_id, txn_id, pool);
@@ -179,7 +179,7 @@ svn_fs_bdb__delete_nodes_entry(svn_fs_t
DBT key;
svn_fs_base__trail_debug(trail, "nodes", "del");
- return BDB_WRAP(fs, _("deleting entry from 'nodes' table"),
+ return BDB_WRAP(fs, N_("deleting entry from 'nodes' table"),
bfd->nodes->del(bfd->nodes,
trail->db_txn,
svn_fs_base__id_to_dbt(&key, id, pool),
@@ -217,7 +217,7 @@ svn_fs_bdb__get_node_revision(node_revis
return svn_fs_base__err_dangling_id(fs, id);
/* Handle any other error conditions. */
- SVN_ERR(BDB_WRAP(fs, _("reading node revision"), db_err));
+ SVN_ERR(BDB_WRAP(fs, N_("reading node revision"), db_err));
/* If our caller doesn't really care about the return value here,
just return successfully. */
@@ -250,7 +250,7 @@ svn_fs_bdb__put_node_revision(svn_fs_t *
SVN_ERR(svn_fs_base__unparse_node_revision_skel(&skel, noderev,
bfd->format, pool));
svn_fs_base__trail_debug(trail, "nodes", "put");
- return BDB_WRAP(fs, _("storing node revision"),
+ return BDB_WRAP(fs, N_("storing node revision"),
bfd->nodes->put(bfd->nodes, db_txn,
svn_fs_base__id_to_dbt(&key, id, pool),
svn_fs_base__skel_to_dbt(&value, skel,
Modified: subversion/branches/javahl-ra/subversion/libsvn_fs_base/bdb/reps-table.c
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/libsvn_fs_base/bdb/reps-table.c?rev=1425415&r1=1425414&r2=1425415&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/libsvn_fs_base/bdb/reps-table.c (original)
+++ subversion/branches/javahl-ra/subversion/libsvn_fs_base/bdb/reps-table.c Sun Dec 23 06:03:14 2012
@@ -98,7 +98,7 @@ svn_fs_bdb__read_rep(representation_t **
_("No such representation '%s'"), key);
/* Handle any other error conditions. */
- SVN_ERR(BDB_WRAP(fs, _("reading representation"), db_err));
+ SVN_ERR(BDB_WRAP(fs, N_("reading representation"), db_err));
/* Parse the REPRESENTATION skel. */
skel = svn_skel__parse(result.data, result.size, pool);
@@ -125,7 +125,7 @@ svn_fs_bdb__write_rep(svn_fs_t *fs,
/* Now write the record. */
svn_fs_base__trail_debug(trail, "representations", "put");
- return BDB_WRAP(fs, _("storing representation"),
+ return BDB_WRAP(fs, N_("storing representation"),
bfd->representations->put
(bfd->representations, trail->db_txn,
svn_fs_base__str_to_dbt(&query, key),
@@ -153,7 +153,7 @@ svn_fs_bdb__write_new_rep(const char **k
/* Get the current value associated with `next-key'. */
svn_fs_base__str_to_dbt(&query, NEXT_KEY_KEY);
svn_fs_base__trail_debug(trail, "representations", "get");
- SVN_ERR(BDB_WRAP(fs, _("allocating new representation (getting next-key)"),
+ SVN_ERR(BDB_WRAP(fs, N_("allocating new representation (getting next-key)"),
bfd->representations->get
(bfd->representations, trail->db_txn, &query,
svn_fs_base__result_dbt(&result), 0)));
@@ -174,7 +174,7 @@ svn_fs_bdb__write_new_rep(const char **k
svn_fs_base__str_to_dbt(&result, next_key),
0);
- return BDB_WRAP(fs, _("bumping next representation key"), db_err);
+ return BDB_WRAP(fs, N_("bumping next representation key"), db_err);
}
@@ -200,5 +200,5 @@ svn_fs_bdb__delete_rep(svn_fs_t *fs,
_("No such representation '%s'"), key);
/* Handle any other error conditions. */
- return BDB_WRAP(fs, _("deleting representation"), db_err);
+ return BDB_WRAP(fs, N_("deleting representation"), db_err);
}
Modified: subversion/branches/javahl-ra/subversion/libsvn_fs_base/bdb/rev-table.c
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/libsvn_fs_base/bdb/rev-table.c?rev=1425415&r1=1425414&r2=1425415&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/libsvn_fs_base/bdb/rev-table.c (original)
+++ subversion/branches/javahl-ra/subversion/libsvn_fs_base/bdb/rev-table.c Sun Dec 23 06:03:14 2012
@@ -92,7 +92,7 @@ svn_fs_bdb__get_rev(revision_t **revisio
return svn_fs_base__err_dangling_rev(fs, rev);
/* Handle any other error conditions. */
- SVN_ERR(BDB_WRAP(fs, _("reading filesystem revision"), db_err));
+ SVN_ERR(BDB_WRAP(fs, N_("reading filesystem revision"), db_err));
/* Parse REVISION skel. */
skel = svn_skel__parse(value.data, value.size, pool);
@@ -138,7 +138,7 @@ svn_fs_bdb__put_rev(svn_revnum_t *rev,
(bfd->revisions, trail->db_txn,
svn_fs_base__set_dbt(&query, &recno, sizeof(recno)),
svn_fs_base__skel_to_dbt(&result, skel, pool), 0);
- return BDB_WRAP(fs, "updating filesystem revision", db_err);
+ return BDB_WRAP(fs, N_("updating filesystem revision"), db_err);
}
svn_fs_base__trail_debug(trail, "revisions", "put");
@@ -146,7 +146,7 @@ svn_fs_bdb__put_rev(svn_revnum_t *rev,
svn_fs_base__recno_dbt(&key, &recno),
svn_fs_base__skel_to_dbt(&value, skel, pool),
DB_APPEND);
- SVN_ERR(BDB_WRAP(fs, "storing filesystem revision", db_err));
+ SVN_ERR(BDB_WRAP(fs, N_("storing filesystem revision"), db_err));
/* Turn the record number into a Subversion revision number.
Revisions are numbered starting with zero; Berkeley DB record
@@ -176,7 +176,7 @@ svn_fs_bdb__youngest_rev(svn_revnum_t *y
/* Create a database cursor. */
svn_fs_base__trail_debug(trail, "revisions", "cursor");
- SVN_ERR(BDB_WRAP(fs, "getting youngest revision (creating cursor)",
+ SVN_ERR(BDB_WRAP(fs, N_("getting youngest revision (creating cursor)"),
bfd->revisions->cursor(bfd->revisions, trail->db_txn,
&cursor, 0)));
@@ -200,7 +200,7 @@ svn_fs_bdb__youngest_rev(svn_revnum_t *y
"Corrupt DB: revision 0 missing from 'revisions' table, in "
"filesystem '%s'", fs->path);
- SVN_ERR(BDB_WRAP(fs, "getting youngest revision (finding last entry)",
+ SVN_ERR(BDB_WRAP(fs, N_("getting youngest revision (finding last entry)"),
db_err));
}
@@ -210,7 +210,7 @@ svn_fs_bdb__youngest_rev(svn_revnum_t *y
reasons, and txn_commit shouldn't fail that way, and
2) using a cursor after committing its transaction can cause
undetectable database corruption. */
- SVN_ERR(BDB_WRAP(fs, "getting youngest revision (closing cursor)",
+ SVN_ERR(BDB_WRAP(fs, N_("getting youngest revision (closing cursor)"),
svn_bdb_dbc_close(cursor)));
/* Turn the record number into a Subversion revision number.
Modified: subversion/branches/javahl-ra/subversion/libsvn_fs_base/bdb/strings-table.c
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/libsvn_fs_base/bdb/strings-table.c?rev=1425415&r1=1425414&r2=1425415&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/libsvn_fs_base/bdb/strings-table.c (original)
+++ subversion/branches/javahl-ra/subversion/libsvn_fs_base/bdb/strings-table.c Sun Dec 23 06:03:14 2012
@@ -91,7 +91,7 @@ locate_key(apr_size_t *length,
DBT result;
svn_fs_base__trail_debug(trail, "strings", "cursor");
- SVN_ERR(BDB_WRAP(fs, _("creating cursor for reading a string"),
+ SVN_ERR(BDB_WRAP(fs, N_("creating cursor for reading a string"),
bfd->strings->cursor(bfd->strings, trail->db_txn,
cursor, 0)));
@@ -121,7 +121,7 @@ locate_key(apr_size_t *length,
if (db_err != SVN_BDB_DB_BUFFER_SMALL)
{
svn_bdb_dbc_close(*cursor);
- return BDB_WRAP(fs, "moving cursor", db_err);
+ return BDB_WRAP(fs, N_("moving cursor"), db_err);
}
/* We got an SVN_BDB_DB_BUFFER_SMALL (typical since we have a
@@ -133,7 +133,7 @@ locate_key(apr_size_t *length,
if (db_err)
{
svn_bdb_dbc_close(*cursor);
- return BDB_WRAP(fs, "rerunning cursor move", db_err);
+ return BDB_WRAP(fs, N_("rerunning cursor move"), db_err);
}
}
@@ -225,7 +225,7 @@ svn_fs_bdb__string_read(svn_fs_t *fs,
return SVN_NO_ERROR;
}
if (db_err)
- return BDB_WRAP(fs, "reading string", db_err);
+ return BDB_WRAP(fs, N_("reading string"), db_err);
}
/* The current record contains OFFSET. Fetch the contents now. Note that
@@ -244,14 +244,14 @@ svn_fs_bdb__string_read(svn_fs_t *fs,
if (db_err)
{
svn_bdb_dbc_close(cursor);
- return BDB_WRAP(fs, "reading string", db_err);
+ return BDB_WRAP(fs, N_("reading string"), db_err);
}
bytes_read += result.size;
if (bytes_read == *len)
{
/* Done with the cursor. */
- SVN_ERR(BDB_WRAP(fs, "closing string-reading cursor",
+ SVN_ERR(BDB_WRAP(fs, N_("closing string-reading cursor"),
svn_bdb_dbc_close(cursor)));
break;
}
@@ -262,7 +262,7 @@ svn_fs_bdb__string_read(svn_fs_t *fs,
if (db_err == DB_NOTFOUND)
break;
if (db_err)
- return BDB_WRAP(fs, "reading string", db_err);
+ return BDB_WRAP(fs, N_("reading string"), db_err);
/* We'll be reading from the beginning of the next record */
offset = 0;
@@ -297,7 +297,7 @@ get_key_and_bump(svn_fs_t *fs,
write the new value -- that would append, not overwrite. */
svn_fs_base__trail_debug(trail, "strings", "cursor");
- SVN_ERR(BDB_WRAP(fs, "creating cursor for reading a string",
+ SVN_ERR(BDB_WRAP(fs, N_("creating cursor for reading a string"),
bfd->strings->cursor(bfd->strings, trail->db_txn,
&cursor, 0)));
@@ -310,7 +310,7 @@ get_key_and_bump(svn_fs_t *fs,
if (db_err)
{
svn_bdb_dbc_close(cursor);
- return BDB_WRAP(fs, "getting next-key value", db_err);
+ return BDB_WRAP(fs, N_("getting next-key value"), db_err);
}
svn_fs_base__track_dbt(&result, pool);
@@ -328,10 +328,10 @@ get_key_and_bump(svn_fs_t *fs,
{
svn_bdb_dbc_close(cursor); /* ignore the error, the original is
more important. */
- return BDB_WRAP(fs, "bumping next string key", db_err);
+ return BDB_WRAP(fs, N_("bumping next string key"), db_err);
}
- return BDB_WRAP(fs, "closing string-reading cursor",
+ return BDB_WRAP(fs, N_("closing string-reading cursor"),
svn_bdb_dbc_close(cursor));
}
@@ -355,7 +355,7 @@ svn_fs_bdb__string_append(svn_fs_t *fs,
/* Store a new record into the database. */
svn_fs_base__trail_debug(trail, "strings", "put");
- return BDB_WRAP(fs, "appending string",
+ return BDB_WRAP(fs, N_("appending string"),
bfd->strings->put
(bfd->strings, trail->db_txn,
svn_fs_base__str_to_dbt(&query, *key),
@@ -387,7 +387,7 @@ svn_fs_bdb__string_clear(svn_fs_t *fs,
"No such string '%s'", key);
/* Handle any other error conditions. */
- SVN_ERR(BDB_WRAP(fs, "clearing string", db_err));
+ SVN_ERR(BDB_WRAP(fs, N_("clearing string"), db_err));
/* Shove empty data back in for this key. */
svn_fs_base__clear_dbt(&result);
@@ -396,7 +396,7 @@ svn_fs_bdb__string_clear(svn_fs_t *fs,
result.flags |= DB_DBT_USERMEM;
svn_fs_base__trail_debug(trail, "strings", "put");
- return BDB_WRAP(fs, "storing empty contents",
+ return BDB_WRAP(fs, N_("storing empty contents"),
bfd->strings->put(bfd->strings, trail->db_txn,
&query, &result, 0));
}
@@ -433,7 +433,7 @@ svn_fs_bdb__string_size(svn_filesize_t *
return SVN_NO_ERROR;
}
if (db_err)
- return BDB_WRAP(fs, "fetching string length", db_err);
+ return BDB_WRAP(fs, N_("fetching string length"), db_err);
total += length;
}
@@ -463,7 +463,7 @@ svn_fs_bdb__string_delete(svn_fs_t *fs,
"No such string '%s'", key);
/* Handle any other error conditions. */
- return BDB_WRAP(fs, "deleting string", db_err);
+ return BDB_WRAP(fs, N_("deleting string"), db_err);
}
@@ -488,7 +488,7 @@ svn_fs_bdb__string_copy(svn_fs_t *fs,
SVN_ERR(get_key_and_bump(fs, new_key, trail, pool));
svn_fs_base__trail_debug(trail, "strings", "cursor");
- SVN_ERR(BDB_WRAP(fs, "creating cursor for reading a string",
+ SVN_ERR(BDB_WRAP(fs, N_("creating cursor for reading a string"),
bfd->strings->cursor(bfd->strings, trail->db_txn,
&cursor, 0)));
@@ -502,7 +502,7 @@ svn_fs_bdb__string_copy(svn_fs_t *fs,
if (db_err)
{
svn_bdb_dbc_close(cursor);
- return BDB_WRAP(fs, "getting next-key value", db_err);
+ return BDB_WRAP(fs, N_("getting next-key value"), db_err);
}
while (1)
@@ -521,7 +521,7 @@ svn_fs_bdb__string_copy(svn_fs_t *fs,
if (db_err)
{
svn_bdb_dbc_close(cursor);
- return BDB_WRAP(fs, "writing copied data", db_err);
+ return BDB_WRAP(fs, N_("writing copied data"), db_err);
}
/* Read the next chunk. Terminate loop if we're done. */
@@ -532,10 +532,10 @@ svn_fs_bdb__string_copy(svn_fs_t *fs,
if (db_err)
{
svn_bdb_dbc_close(cursor);
- return BDB_WRAP(fs, "fetching string data for a copy", db_err);
+ return BDB_WRAP(fs, N_("fetching string data for a copy"), db_err);
}
}
- return BDB_WRAP(fs, "closing string-reading cursor",
+ return BDB_WRAP(fs, N_("closing string-reading cursor"),
svn_bdb_dbc_close(cursor));
}
Modified: subversion/branches/javahl-ra/subversion/libsvn_fs_base/bdb/txn-table.c
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/libsvn_fs_base/bdb/txn-table.c?rev=1425415&r1=1425414&r2=1425415&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/libsvn_fs_base/bdb/txn-table.c (original)
+++ subversion/branches/javahl-ra/subversion/libsvn_fs_base/bdb/txn-table.c Sun Dec 23 06:03:14 2012
@@ -96,7 +96,7 @@ svn_fs_bdb__put_txn(svn_fs_t *fs,
svn_fs_base__str_to_dbt(&key, txn_name);
svn_fs_base__skel_to_dbt(&value, txn_skel, pool);
svn_fs_base__trail_debug(trail, "transactions", "put");
- return BDB_WRAP(fs, _("storing transaction record"),
+ return BDB_WRAP(fs, N_("storing transaction record"),
bfd->transactions->put(bfd->transactions, trail->db_txn,
&key, &value, 0));
}
@@ -120,7 +120,7 @@ allocate_txn_id(const char **id_p,
/* Get the current value associated with the `next-key' key in the table. */
svn_fs_base__trail_debug(trail, "transactions", "get");
- SVN_ERR(BDB_WRAP(fs, "allocating new transaction ID (getting 'next-key')",
+ SVN_ERR(BDB_WRAP(fs, N_("allocating new transaction ID (getting 'next-key')"),
bfd->transactions->get(bfd->transactions, trail->db_txn,
&query,
svn_fs_base__result_dbt(&result),
@@ -139,7 +139,7 @@ allocate_txn_id(const char **id_p,
db_err = bfd->transactions->put(bfd->transactions, trail->db_txn,
&query, &result, 0);
- return BDB_WRAP(fs, "bumping next transaction key", db_err);
+ return BDB_WRAP(fs, N_("bumping next transaction key"), db_err);
}
@@ -185,7 +185,7 @@ svn_fs_bdb__delete_txn(svn_fs_t *fs,
/* Delete the transaction from the `transactions' table. */
svn_fs_base__str_to_dbt(&key, txn_name);
svn_fs_base__trail_debug(trail, "transactions", "del");
- return BDB_WRAP(fs, "deleting entry from 'transactions' table",
+ return BDB_WRAP(fs, N_("deleting entry from 'transactions' table"),
bfd->transactions->del(bfd->transactions,
trail->db_txn, &key, 0));
}
@@ -215,7 +215,7 @@ svn_fs_bdb__get_txn(transaction_t **txn_
if (db_err == DB_NOTFOUND)
return svn_fs_base__err_no_such_txn(fs, txn_name);
- SVN_ERR(BDB_WRAP(fs, "reading transaction", db_err));
+ SVN_ERR(BDB_WRAP(fs, N_("reading transaction"), db_err));
/* Parse TRANSACTION skel */
skel = svn_skel__parse(value.data, value.size, pool);
@@ -248,7 +248,7 @@ svn_fs_bdb__get_txn_list(apr_array_heade
/* Create a database cursor to list the transaction names. */
svn_fs_base__trail_debug(trail, "transactions", "cursor");
- SVN_ERR(BDB_WRAP(fs, "reading transaction list (opening cursor)",
+ SVN_ERR(BDB_WRAP(fs, N_("reading transaction list (opening cursor)"),
bfd->transactions->cursor(bfd->transactions,
trail->db_txn, &cursor, 0)));
@@ -311,10 +311,10 @@ svn_fs_bdb__get_txn_list(apr_array_heade
db_c_err = svn_bdb_dbc_close(cursor);
if (db_err != DB_NOTFOUND)
{
- SVN_ERR(BDB_WRAP(fs, "reading transaction list (listing keys)",
+ SVN_ERR(BDB_WRAP(fs, N_("reading transaction list (listing keys)"),
db_err));
}
- SVN_ERR(BDB_WRAP(fs, "reading transaction list (closing cursor)",
+ SVN_ERR(BDB_WRAP(fs, N_("reading transaction list (closing cursor)"),
db_c_err));
/* Destroy the per-iteration subpool */
Modified: subversion/branches/javahl-ra/subversion/libsvn_fs_base/bdb/uuids-table.c
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/libsvn_fs_base/bdb/uuids-table.c?rev=1425415&r1=1425414&r2=1425415&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/libsvn_fs_base/bdb/uuids-table.c (original)
+++ subversion/branches/javahl-ra/subversion/libsvn_fs_base/bdb/uuids-table.c Sun Dec 23 06:03:14 2012
@@ -116,7 +116,7 @@ svn_error_t *svn_fs_bdb__get_uuid(svn_fs
value.flags |= DB_DBT_USERMEM;
svn_fs_base__trail_debug(trail, "uuids", "get");
- SVN_ERR(BDB_WRAP(fs, _("get repository uuid"),
+ SVN_ERR(BDB_WRAP(fs, N_("get repository uuid"),
uuids->get(uuids, trail->db_txn, &key, &value, 0)));
*uuid = apr_pstrmemdup(pool, value.data, value.size);
@@ -144,6 +144,6 @@ svn_error_t *svn_fs_bdb__set_uuid(svn_fs
value.data = apr_pstrmemdup(pool, uuid, value.size + 1);
svn_fs_base__trail_debug(trail, "uuids", "put");
- return BDB_WRAP(fs, _("set repository uuid"),
+ return BDB_WRAP(fs, N_("set repository uuid"),
uuids->put(uuids, trail->db_txn, &key, &value, 0));
}
Modified: subversion/branches/javahl-ra/subversion/libsvn_fs_base/fs.c
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/libsvn_fs_base/fs.c?rev=1425415&r1=1425414&r2=1425415&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/libsvn_fs_base/fs.c (original)
+++ subversion/branches/javahl-ra/subversion/libsvn_fs_base/fs.c Sun Dec 23 06:03:14 2012
@@ -552,62 +552,62 @@ open_databases(svn_fs_t *fs,
/* Create the databases in the environment. */
SVN_ERR(BDB_WRAP(fs, (create
- ? "creating 'nodes' table"
- : "opening 'nodes' table"),
+ ? N_("creating 'nodes' table")
+ : N_("opening 'nodes' table")),
svn_fs_bdb__open_nodes_table(&bfd->nodes,
bfd->bdb->env,
create)));
SVN_ERR(BDB_WRAP(fs, (create
- ? "creating 'revisions' table"
- : "opening 'revisions' table"),
+ ? N_("creating 'revisions' table")
+ : N_("opening 'revisions' table")),
svn_fs_bdb__open_revisions_table(&bfd->revisions,
bfd->bdb->env,
create)));
SVN_ERR(BDB_WRAP(fs, (create
- ? "creating 'transactions' table"
- : "opening 'transactions' table"),
+ ? N_("creating 'transactions' table")
+ : N_("opening 'transactions' table")),
svn_fs_bdb__open_transactions_table(&bfd->transactions,
bfd->bdb->env,
create)));
SVN_ERR(BDB_WRAP(fs, (create
- ? "creating 'copies' table"
- : "opening 'copies' table"),
+ ? N_("creating 'copies' table")
+ : N_("opening 'copies' table")),
svn_fs_bdb__open_copies_table(&bfd->copies,
bfd->bdb->env,
create)));
SVN_ERR(BDB_WRAP(fs, (create
- ? "creating 'changes' table"
- : "opening 'changes' table"),
+ ? N_("creating 'changes' table")
+ : N_("opening 'changes' table")),
svn_fs_bdb__open_changes_table(&bfd->changes,
bfd->bdb->env,
create)));
SVN_ERR(BDB_WRAP(fs, (create
- ? "creating 'representations' table"
- : "opening 'representations' table"),
+ ? N_("creating 'representations' table")
+ : N_("opening 'representations' table")),
svn_fs_bdb__open_reps_table(&bfd->representations,
bfd->bdb->env,
create)));
SVN_ERR(BDB_WRAP(fs, (create
- ? "creating 'strings' table"
- : "opening 'strings' table"),
+ ? N_("creating 'strings' table")
+ : N_("opening 'strings' table")),
svn_fs_bdb__open_strings_table(&bfd->strings,
bfd->bdb->env,
create)));
SVN_ERR(BDB_WRAP(fs, (create
- ? "creating 'uuids' table"
- : "opening 'uuids' table"),
+ ? N_("creating 'uuids' table")
+ : N_("opening 'uuids' table")),
svn_fs_bdb__open_uuids_table(&bfd->uuids,
bfd->bdb->env,
create)));
SVN_ERR(BDB_WRAP(fs, (create
- ? "creating 'locks' table"
- : "opening 'locks' table"),
+ ? N_("creating 'locks' table")
+ : N_("opening 'locks' table")),
svn_fs_bdb__open_locks_table(&bfd->locks,
bfd->bdb->env,
create)));
SVN_ERR(BDB_WRAP(fs, (create
- ? "creating 'lock-tokens' table"
- : "opening 'lock-tokens' table"),
+ ? N_("creating 'lock-tokens' table")
+ : N_("opening 'lock-tokens' table")),
svn_fs_bdb__open_lock_tokens_table(&bfd->lock_tokens,
bfd->bdb->env,
create)));
@@ -615,8 +615,8 @@ open_databases(svn_fs_t *fs,
if (format >= SVN_FS_BASE__MIN_NODE_ORIGINS_FORMAT)
{
SVN_ERR(BDB_WRAP(fs, (create
- ? "creating 'node-origins' table"
- : "opening 'node-origins' table"),
+ ? N_("creating 'node-origins' table")
+ : N_("opening 'node-origins' table")),
svn_fs_bdb__open_node_origins_table(&bfd->node_origins,
bfd->bdb->env,
create)));
@@ -625,8 +625,8 @@ open_databases(svn_fs_t *fs,
if (format >= SVN_FS_BASE__MIN_MISCELLANY_FORMAT)
{
SVN_ERR(BDB_WRAP(fs, (create
- ? "creating 'miscellaneous' table"
- : "opening 'miscellaneous' table"),
+ ? N_("creating 'miscellaneous' table")
+ : N_("opening 'miscellaneous' table")),
svn_fs_bdb__open_miscellaneous_table(&bfd->miscellaneous,
bfd->bdb->env,
create)));
@@ -635,8 +635,8 @@ open_databases(svn_fs_t *fs,
if (format >= SVN_FS_BASE__MIN_REP_SHARING_FORMAT)
{
SVN_ERR(BDB_WRAP(fs, (create
- ? "creating 'checksum-reps' table"
- : "opening 'checksum-reps' table"),
+ ? N_("creating 'checksum-reps' table")
+ : N_("opening 'checksum-reps' table")),
svn_fs_bdb__open_checksum_reps_table(&bfd->checksum_reps,
bfd->bdb->env,
create)));
Modified: subversion/branches/javahl-ra/subversion/libsvn_fs_base/lock.c
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/libsvn_fs_base/lock.c?rev=1425415&r1=1425414&r2=1425415&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/libsvn_fs_base/lock.c (original)
+++ subversion/branches/javahl-ra/subversion/libsvn_fs_base/lock.c Sun Dec 23 06:03:14 2012
@@ -36,6 +36,7 @@
#include "util/fs_skels.h"
#include "../libsvn_fs/fs-loader.h"
#include "private/svn_fs_util.h"
+#include "private/svn_subr_private.h"
/* Add LOCK and its associated LOCK_TOKEN (associated with PATH) as
@@ -394,9 +395,9 @@ svn_fs_base__get_lock(svn_lock_t **lock,
}
/* Implements `svn_fs_get_locks_callback_t', spooling lock information
- to disk as the filesystem provides it. BATON is an 'apr_file_t *'
- object pointing to open, writable spool file. We'll write the
- spool file with a format like so:
+ to a stream as the filesystem provides it. BATON is an 'svn_stream_t *'
+ object pointing to the stream. We'll write the spool stream with a
+ format like so:
SKEL1_LEN "\n" SKEL1 "\n" SKEL2_LEN "\n" SKEL2 "\n" ...
@@ -408,18 +409,20 @@ spool_locks_info(void *baton,
apr_pool_t *pool)
{
svn_skel_t *lock_skel;
- apr_file_t *spool_file = (apr_file_t *)baton;
+ svn_stream_t *stream = baton;
const char *skel_len;
svn_stringbuf_t *skel_buf;
+ apr_size_t len;
SVN_ERR(svn_fs_base__unparse_lock_skel(&lock_skel, lock, pool));
skel_buf = svn_skel__unparse(lock_skel, pool);
skel_len = apr_psprintf(pool, "%" APR_SIZE_T_FMT "\n", skel_buf->len);
- SVN_ERR(svn_io_file_write_full(spool_file, skel_len, strlen(skel_len),
- NULL, pool));
- SVN_ERR(svn_io_file_write_full(spool_file, skel_buf->data,
- skel_buf->len, NULL, pool));
- return svn_io_file_write_full(spool_file, "\n", 1, NULL, pool);
+ len = strlen(skel_len);
+ SVN_ERR(svn_stream_write(stream, skel_len, &len));
+ len = skel_buf->len;
+ SVN_ERR(svn_stream_write(stream, skel_buf->data, &len));
+ len = 1;
+ return svn_stream_write(stream, "\n", &len);
}
@@ -427,7 +430,7 @@ struct locks_get_args
{
const char *path;
svn_depth_t depth;
- apr_file_t *spool_file;
+ svn_stream_t *stream;
};
@@ -436,7 +439,7 @@ txn_body_get_locks(void *baton, trail_t
{
struct locks_get_args *args = baton;
return svn_fs_bdb__locks_get(trail->fs, args->path, args->depth,
- spool_locks_info, args->spool_file,
+ spool_locks_info, args->stream,
trail, trail->pool);
}
@@ -450,7 +453,6 @@ svn_fs_base__get_locks(svn_fs_t *fs,
apr_pool_t *pool)
{
struct locks_get_args args;
- apr_off_t offset = 0;
svn_stream_t *stream;
svn_stringbuf_t *buf;
svn_boolean_t eof;
@@ -460,14 +462,14 @@ svn_fs_base__get_locks(svn_fs_t *fs,
args.path = svn_fs__canonicalize_abspath(path, pool);
args.depth = depth;
- SVN_ERR(svn_io_open_uniquely_named(&(args.spool_file), NULL, NULL, NULL,
- NULL, svn_io_file_del_on_close,
- pool, pool));
+ /* Enough for 100+ locks if the comments are small. */
+ args.stream = svn_stream__from_spillbuf(4 * 1024 /* blocksize */,
+ 64 * 1024 /* maxsize */,
+ pool);
SVN_ERR(svn_fs_base__retry_txn(fs, txn_body_get_locks, &args, FALSE, pool));
- /* Rewind the spool file, then re-read it, calling GET_LOCKS_FUNC(). */
- SVN_ERR(svn_io_file_seek(args.spool_file, APR_SET, &offset, pool));
- stream = svn_stream_from_aprfile2(args.spool_file, FALSE, pool);
+ /* Read the stream calling GET_LOCKS_FUNC(). */
+ stream = args.stream;
while (1)
{
Modified: subversion/branches/javahl-ra/subversion/libsvn_fs_base/trail.c
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/libsvn_fs_base/trail.c?rev=1425415&r1=1425414&r2=1425415&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/libsvn_fs_base/trail.c (original)
+++ subversion/branches/javahl-ra/subversion/libsvn_fs_base/trail.c Sun Dec 23 06:03:14 2012
@@ -96,7 +96,7 @@ begin_trail(trail_t **trail_p,
a coding problem (and will likely hang the repository anyway). */
SVN_ERR_ASSERT(! bfd->in_txn_trail);
- SVN_ERR(BDB_WRAP(fs, "beginning Berkeley DB transaction",
+ SVN_ERR(BDB_WRAP(fs, N_("beginning Berkeley DB transaction"),
bfd->bdb->env->txn_begin(bfd->bdb->env, 0,
&trail->db_txn, 0)));
bfd->in_txn_trail = TRUE;
@@ -131,7 +131,7 @@ abort_trail(trail_t *trail)
see the returned error than to abort. An obvious example is
when DB_TXN->abort() returns DB_RUNRECOVERY. */
bfd->in_txn_trail = FALSE;
- SVN_ERR(BDB_WRAP(fs, "aborting Berkeley DB transaction",
+ SVN_ERR(BDB_WRAP(fs, N_("aborting Berkeley DB transaction"),
trail->db_txn->abort(trail->db_txn)));
}
svn_pool_destroy(trail->pool);
@@ -155,7 +155,7 @@ commit_trail(trail_t *trail)
/* See comment [**] in abort_trail() above.
An error during txn commit will abort the transaction anyway. */
bfd->in_txn_trail = FALSE;
- SVN_ERR(BDB_WRAP(fs, "committing Berkeley DB transaction",
+ SVN_ERR(BDB_WRAP(fs, N_("committing Berkeley DB transaction"),
trail->db_txn->commit(trail->db_txn, 0)));
}
Modified: subversion/branches/javahl-ra/subversion/libsvn_fs_fs/fs.h
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/libsvn_fs_fs/fs.h?rev=1425415&r1=1425414&r2=1425415&view=diff
==============================================================================
--- subversion/branches/javahl-ra/subversion/libsvn_fs_fs/fs.h (original)
+++ subversion/branches/javahl-ra/subversion/libsvn_fs_fs/fs.h Sun Dec 23 06:03:14 2012
@@ -63,6 +63,10 @@ extern "C" {
has not been packed. */
#define PATH_REVPROP_GENERATION "revprop-generation"
/* Current revprop generation*/
+#define PATH_MANIFEST "manifest" /* Manifest file name */
+#define PATH_PACKED "pack" /* Packed revision data file */
+#define PATH_EXT_PACKED_SHARD ".pack" /* Extension for packed
+ shards */
/* If you change this, look at tests/svn_test_fs.c(maybe_install_fsfs_conf) */
#define PATH_CONFIG "fsfs.conf" /* Configuration */
@@ -90,11 +94,14 @@ extern "C" {
#define CONFIG_OPTION_ENABLE_PROPS_DELTIFICATION "enable-props-deltification"
#define CONFIG_OPTION_MAX_DELTIFICATION_WALK "max-deltification-walk"
#define CONFIG_OPTION_MAX_LINEAR_DELTIFICATION "max-linear-deltification"
+#define CONFIG_SECTION_PACKED_REVPROPS "packed-revprops"
+#define CONFIG_OPTION_REVPROP_PACK_SIZE "revprop-pack-size"
+#define CONFIG_OPTION_COMPRESS_PACKED_REVPROPS "compress-packed-revprops"
/* The format number of this filesystem.
This is independent of the repository format number, and
independent of any other FS back ends. */
-#define SVN_FS_FS__FORMAT_NUMBER 4
+#define SVN_FS_FS__FORMAT_NUMBER 6
/* The minimum format number that supports svndiff version 1. */
#define SVN_FS_FS__MIN_SVNDIFF1_FORMAT 2
@@ -134,8 +141,8 @@ extern "C" {
revprops.db . */
#define SVN_FS_FS__PACKED_REVPROP_SQLITE_DEV_FORMAT 5
-/* The minimum format number that supports packed revprop shards. */
-#define SVN_FS_FS__MIN_PACKED_REVPROP_FORMAT SVN_FS_FS__PACKED_REVPROP_SQLITE_DEV_FORMAT
+/* The minimum format number that supports packed revprops. */
+#define SVN_FS_FS__MIN_PACKED_REVPROP_FORMAT 6
/* The minimum format number that supports a configuration file (fsfs.conf) */
#define SVN_FS_FS__MIN_CONFIG_FILE 4
@@ -294,13 +301,21 @@ typedef struct fs_fs_data_t
/* Thread-safe boolean */
svn_atomic_t rep_cache_db_opened;
- /* The oldest revision not in a pack file. */
+ /* The oldest revision not in a pack file. It also applies to revprops
+ * if revprop packing has been enabled by the FSFS format version. */
svn_revnum_t min_unpacked_rev;
/* Whether rep-sharing is supported by the filesystem
* and allowed by the configuration. */
svn_boolean_t rep_sharing_allowed;
+ /* File size limit in bytes up to which multiple revprops shall be packed
+ * into a single file. */
+ apr_int64_t revprop_pack_size;
+
+ /* Whether packed revprop files shall be compressed. */
+ svn_boolean_t compress_packed_revprops;
+
/* Whether directory nodes shall be deltified just like file nodes. */
svn_boolean_t deltify_directories;