Author: stefan2
Date: Sun Oct 19 00:19:08 2014
New Revision: 1632868
URL: http://svn.apache.org/r1632868
Log:
Move the FSFS index load logic into FSFS.
* subversion/include/private/svn_fs_fs_private.h
(svn_fs_fs__load_index): Declare new API, taken from load-index-cmd.c.
Extend docstring.
* subversion/libsvn_fs_fs/load-index.c
(): New file. Update #includes.
(svn_fs_fs__load_index): Moved here from load-index-cmd.c.
* subversion/svnfsfs/load-index-cmd.c
(): Update #includes.
(svn_fs_fs__load_index): Remove here.
Added:
subversion/trunk/subversion/libsvn_fs_fs/load-index.c
- copied, changed from r1632866,
subversion/trunk/subversion/svnfsfs/load-index-cmd.c
Modified:
subversion/trunk/subversion/include/private/svn_fs_fs_private.h
subversion/trunk/subversion/svnfsfs/load-index-cmd.c
Modified: subversion/trunk/subversion/include/private/svn_fs_fs_private.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/include/private/svn_fs_fs_private.h?rev=1632868&r1=1632867&r2=1632868&view=diff
==============================================================================
--- subversion/trunk/subversion/include/private/svn_fs_fs_private.h (original)
+++ subversion/trunk/subversion/include/private/svn_fs_fs_private.h Sun Oct 19
00:19:08 2014
@@ -335,6 +335,19 @@ svn_fs_fs__dump_index(svn_fs_t *fs,
apr_pool_t *scratch_pool);
+/* Rewrite the respective index information of the rev / pack file in FS
+ * containing REVISION and use the svn_fs_fs__p2l_entry_t * array ENTRIES
+ * as the new index contents. Allocate temporaries from SCRATCH_POOL.
+ *
+ * Note that this becomes a no-op if ENTRIES is empty. You may use a zero-
+ * sized empty entry instead.
+ */
+svn_error_t *
+svn_fs_fs__load_index(svn_fs_t *fs,
+ svn_revnum_t revision,
+ apr_array_header_t *entries,
+ apr_pool_t *scratch_pool);
+
#ifdef __cplusplus
}
#endif /* __cplusplus */
Copied: subversion/trunk/subversion/libsvn_fs_fs/load-index.c (from r1632866,
subversion/trunk/subversion/svnfsfs/load-index-cmd.c)
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/load-index.c?p2=subversion/trunk/subversion/libsvn_fs_fs/load-index.c&p1=subversion/trunk/subversion/svnfsfs/load-index-cmd.c&r1=1632866&r2=1632868&rev=1632868&view=diff
==============================================================================
--- subversion/trunk/subversion/svnfsfs/load-index-cmd.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/load-index.c Sun Oct 19 00:19:08
2014
@@ -20,113 +20,15 @@
* ====================================================================
*/
-#include "svn_ctype.h"
-#include "svn_dirent_uri.h"
-#include "svn_io.h"
#include "svn_pools.h"
-#include "private/svn_sorts_private.h"
+#include "private/svn_fs_fs_private.h"
-#include "../libsvn_fs_fs/index.h"
-#include "../libsvn_fs_fs/transaction.h"
-#include "../libsvn_fs_fs/util.h"
+#include "index.h"
+#include "util.h"
+#include "transaction.h"
-#include "svn_private_config.h"
-
-#include "svnfsfs.h"
-
-/* Map svn_fs_fs__p2l_entry_t.type to C string. */
-static const char *item_type_str[]
- = {"none", "frep", "drep", "fprop", "dprop", "node", "chgs", "rep"};
-
-/* Reverse lookup in ITEM_TYPE_STR: Set *TYPE to the index that contains STR.
- * Return an error for invalid strings. */
-static svn_error_t *
-str_to_item_type(unsigned *type,
- const char *str)
-{
- unsigned i;
- for (i = 0; i < sizeof(item_type_str) / sizeof(item_type_str[0]); ++i)
- if (strcmp(item_type_str[i], str) == 0)
- {
- *type = i;
- return SVN_NO_ERROR;
- }
-
- return svn_error_createf(SVN_ERR_BAD_TOKEN, NULL,
- _("Unknown item type '%s'"), str);
-}
-
-/* Parse the hex string given as const char * at IDX in TOKENS and return
- * its value in *VALUE_P. Check for index overflows and non-hex chars.
- */
-static svn_error_t *
-token_to_i64(apr_int64_t *value_p,
- apr_array_header_t *tokens,
- int idx)
-{
- const char *hex;
- char *end;
- apr_int64_t value;
-
- /* Tell the user when there is not enough information. */
- SVN_ERR_ASSERT(idx >= 0);
- if (tokens->nelts <= idx)
- return svn_error_createf(SVN_ERR_INVALID_INPUT, NULL,
- _("%i columns needed, %i provided"),
- idx + 1, tokens->nelts);
-
- /* hex -> int conversion */
- hex = APR_ARRAY_IDX(tokens, idx, const char *);
- value = apr_strtoi64(hex, &end, 16);
-
- /* Has the whole token be parsed without error? */
- if (errno || *end != '\0')
- return svn_error_createf(SVN_ERR_INVALID_INPUT, NULL,
- _("%s is not a value HEX string"), hex);
-
- *value_p = value;
- return SVN_NO_ERROR;
-}
-
-/* Parse the P2L entry given as space separated values in LINE and return it
- * in *ENTRY. Ignore extra columns. Allocate the result in RESULT_POOL and
- * use SCRATCH_POOL for temporaries.
- */
-static svn_error_t *
-parse_index_line(svn_fs_fs__p2l_entry_t **entry,
- svn_stringbuf_t *line,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool)
-{
- apr_array_header_t *tokens = svn_cstring_split(line->data, " ", TRUE,
- scratch_pool);
- svn_fs_fs__p2l_entry_t *result = apr_pcalloc(result_pool, sizeof(*result));
- apr_int64_t value;
-
- /* Parse the hex columns. */
- SVN_ERR(token_to_i64(&value, tokens, 0));
- result->offset = (apr_off_t)value;
- SVN_ERR(token_to_i64(&value, tokens, 1));
- result->size = (apr_off_t)value;
- SVN_ERR(token_to_i64(&value, tokens, 4));
- result->item.number = (apr_uint64_t)value;
-
- /* We now know that there were at least 5 columns.
- * Parse the non-hex columns without index check. */
- SVN_ERR(str_to_item_type(&result->type,
- APR_ARRAY_IDX(tokens, 2, const char *)));
- SVN_ERR(svn_revnum_parse(&result->item.revision,
- APR_ARRAY_IDX(tokens, 3, const char *), NULL));
-
- *entry = result;
- return SVN_NO_ERROR;
-}
-
-/* Rewrite the respective index information of the rev / pack file in FS
- * containing REVISION and use the svn_fs_fs__p2l_entry_t * array ENTRIES
- * as the new index contents. Allocate temporaries from SCRATCH_POOL. */
-static svn_error_t *
+svn_error_t *
svn_fs_fs__load_index(svn_fs_t *fs,
svn_revnum_t revision,
apr_array_header_t *entries,
@@ -171,71 +73,3 @@ svn_fs_fs__load_index(svn_fs_t *fs,
return SVN_NO_ERROR;
}
-
-/* Parse the space separated P2L index table from INPUT, one entry per line.
- * Rewrite the respective index files in PATH. Allocate from POOL. */
-static svn_error_t *
-load_index(const char *path,
- svn_stream_t *input,
- apr_pool_t *pool)
-{
- svn_fs_t *fs;
- svn_revnum_t revision = SVN_INVALID_REVNUM;
- apr_array_header_t *entries = apr_array_make(pool, 16, sizeof(void*));
- apr_pool_t *iterpool = svn_pool_create(pool);
-
- /* Check repository type and open it. */
- SVN_ERR(open_fs(&fs, path, pool));
-
- while (TRUE)
- {
- svn_stringbuf_t *line;
- svn_fs_fs__p2l_entry_t *entry;
- svn_boolean_t eol;
-
- /* Get the next line from the input and stop if there is none. */
- svn_pool_clear(iterpool);
- svn_stream_readline(input, &line, "\n", &eol, iterpool);
- if (eol)
- break;
-
- /* Skip header line(s). They contain the sub-string [Ss]tart. */
- if (strstr(line->data, "tart"))
- continue;
-
- /* Ignore empty lines (mostly trailing ones but we don't really care).
- */
- svn_stringbuf_strip_whitespace(line);
- if (line->len == 0)
- continue;
-
- /* Parse the entry and append it to ENTRIES. */
- SVN_ERR(parse_index_line(&entry, line, pool, iterpool));
- APR_ARRAY_PUSH(entries, svn_fs_fs__p2l_entry_t *) = entry;
-
- /* There should be at least one item that is not empty.
- * Get a revision from (probably inside) the respective shard. */
- if ( revision == SVN_INVALID_REVNUM
- && entry->item.revision != SVN_INVALID_REVNUM)
- revision = entry->item.revision;
- }
-
- /* Rewrite the indexes. */
- SVN_ERR(svn_fs_fs__load_index(fs, revision, entries, iterpool));
- svn_pool_destroy(iterpool);
-
- return SVN_NO_ERROR;
-}
-
-/* This implements `svn_opt_subcommand_t'. */
-svn_error_t *
-subcommand__load_index(apr_getopt_t *os, void *baton, apr_pool_t *pool)
-{
- svnfsfs__opt_state *opt_state = baton;
- svn_stream_t *input;
-
- SVN_ERR(svn_stream_for_stdin(&input, pool));
- SVN_ERR(load_index(opt_state->repository_path, input, pool));
-
- return SVN_NO_ERROR;
-}
Modified: subversion/trunk/subversion/svnfsfs/load-index-cmd.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svnfsfs/load-index-cmd.c?rev=1632868&r1=1632867&r2=1632868&view=diff
==============================================================================
--- subversion/trunk/subversion/svnfsfs/load-index-cmd.c (original)
+++ subversion/trunk/subversion/svnfsfs/load-index-cmd.c Sun Oct 19 00:19:08
2014
@@ -25,12 +25,9 @@
#include "svn_io.h"
#include "svn_pools.h"
+#include "private/svn_fs_fs_private.h"
#include "private/svn_sorts_private.h"
-#include "../libsvn_fs_fs/index.h"
-#include "../libsvn_fs_fs/transaction.h"
-#include "../libsvn_fs_fs/util.h"
-
#include "svn_private_config.h"
#include "svnfsfs.h"
@@ -123,55 +120,6 @@ parse_index_line(svn_fs_fs__p2l_entry_t
return SVN_NO_ERROR;
}
-/* Rewrite the respective index information of the rev / pack file in FS
- * containing REVISION and use the svn_fs_fs__p2l_entry_t * array ENTRIES
- * as the new index contents. Allocate temporaries from SCRATCH_POOL. */
-static svn_error_t *
-svn_fs_fs__load_index(svn_fs_t *fs,
- svn_revnum_t revision,
- apr_array_header_t *entries,
- apr_pool_t *scratch_pool)
-{
- apr_pool_t *iterpool = svn_pool_create(scratch_pool);
-
- /* Check the FS format number. */
- if (! svn_fs_fs__use_log_addressing(fs, revision))
- return svn_error_create(SVN_ERR_FS_UNSUPPORTED_FORMAT, NULL, NULL);
-
- /* Treat an empty array as a no-op instead error. */
- if (entries->nelts != 0)
- {
- const char *l2p_proto_index;
- const char *p2l_proto_index;
- svn_fs_fs__revision_file_t *rev_file;
-
- /* Open rev / pack file & trim indexes + footer off it. */
- SVN_ERR(svn_fs_fs__open_pack_or_rev_file_writable(&rev_file, fs,
- revision, iterpool,
- iterpool));
- SVN_ERR(svn_fs_fs__auto_read_footer(rev_file));
- SVN_ERR(svn_io_file_trunc(rev_file->file, rev_file->l2p_offset,
- iterpool));
-
- /* Create proto index files for the new index data
- * (will be cleaned up automatically with iterpool). */
- SVN_ERR(svn_fs_fs__p2l_index_from_p2l_entries(&p2l_proto_index, fs,
- rev_file, entries,
- iterpool, iterpool));
- SVN_ERR(svn_fs_fs__l2p_index_from_p2l_entries(&l2p_proto_index, fs,
- entries, iterpool,
- iterpool));
-
- /* Combine rev data with new index data. */
- SVN_ERR(svn_fs_fs__add_index_data(fs, rev_file->file, l2p_proto_index,
- p2l_proto_index, revision, iterpool));
- }
-
- svn_pool_destroy(iterpool);
-
- return SVN_NO_ERROR;
-}
-
/* Parse the space separated P2L index table from INPUT, one entry per line.
* Rewrite the respective index files in PATH. Allocate from POOL. */
static svn_error_t *
