Author: stefan2
Date: Sat Oct 18 23:19:38 2014
New Revision: 1632857
URL: http://svn.apache.org/r1632857
Log:
Move the FSFS index dump logic into FSFS.
* subversion/include/private/svn_fs_fs_private.h
(svn_fs_fs__dump_index_func_t,
svn_fs_fs__dump_index): Declare new API, taken from dump-index-cmd.c.
* subversion/libsvn_fs_fs/dump-index.c
(): New file. Update #includes.
(svn_fs_fs__dump_index): Moved here from dump-index-cmd.c. Replace
the INDEX_BLOCK_SIZE reference with info
taken from the FS.
* subversion/svnfsfs/dump-index-cmd.c
(): Update #includes.
(svn_fs_fs__dump_index_func_t,
svn_fs_fs__dump_index): Remove here.
Added:
subversion/trunk/subversion/libsvn_fs_fs/dump-index.c
- copied, changed from r1632855,
subversion/trunk/subversion/svnfsfs/dump-index-cmd.c
Modified:
subversion/trunk/subversion/include/private/svn_fs_fs_private.h
subversion/trunk/subversion/svnfsfs/dump-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=1632857&r1=1632856&r2=1632857&view=diff
==============================================================================
--- subversion/trunk/subversion/include/private/svn_fs_fs_private.h (original)
+++ subversion/trunk/subversion/include/private/svn_fs_fs_private.h Sat Oct 18
23:19:38 2014
@@ -34,6 +34,7 @@
#include "svn_types.h"
#include "svn_error.h"
+#include "svn_fs.h"
#include "svn_iter.h"
#include "svn_config.h"
#include "svn_string.h"
@@ -310,6 +311,30 @@ typedef struct svn_fs_fs__p2l_entry_t
} svn_fs_fs__p2l_entry_t;
+/* Callback function type receiving a single P2L index ENTRY, a user
+ * provided BATON and a SCRATCH_POOL for temporary allocations.
+ * ENTRY's lifetime may end when the callback returns.
+ */
+typedef svn_error_t *
+(*svn_fs_fs__dump_index_func_t)(const svn_fs_fs__p2l_entry_t *entry,
+ void *baton,
+ apr_pool_t *scratch_pool);
+
+/* Read the P2L index for the rev / pack file containing REVISION in FS.
+ * For each index entry, invoke CALLBACK_FUNC with CALLBACK_BATON.
+ * If not NULL, call CANCEL_FUNC with CANCEL_BATON from time to time.
+ * Use SCRATCH_POOL for temporary allocations.
+ */
+svn_error_t *
+svn_fs_fs__dump_index(svn_fs_t *fs,
+ svn_revnum_t revision,
+ svn_fs_fs__dump_index_func_t callback_func,
+ void *callback_baton,
+ svn_cancel_func_t cancel_func,
+ void *cancel_baton,
+ apr_pool_t *scratch_pool);
+
+
#ifdef __cplusplus
}
#endif /* __cplusplus */
Copied: subversion/trunk/subversion/libsvn_fs_fs/dump-index.c (from r1632855,
subversion/trunk/subversion/svnfsfs/dump-index-cmd.c)
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/dump-index.c?p2=subversion/trunk/subversion/libsvn_fs_fs/dump-index.c&p1=subversion/trunk/subversion/svnfsfs/dump-index-cmd.c&r1=1632855&r2=1632857&rev=1632857&view=diff
==============================================================================
--- subversion/trunk/subversion/svnfsfs/dump-index-cmd.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/dump-index.c Sat Oct 18 23:19:38
2014
@@ -1,4 +1,4 @@
-/* dump-index-cmd.c -- implements the dump-index sub-command.
+/* dump-index.c -- implements the svn_fs_fs__dump_index private API
*
* ====================================================================
* Licensed to the Apache Software Foundation (ASF) under one
@@ -20,73 +20,16 @@
* ====================================================================
*/
-#include "svn_dirent_uri.h"
#include "svn_pools.h"
+#include "private/svn_fs_fs_private.h"
-#include "../libsvn_fs_fs/fs.h"
-#include "../libsvn_fs_fs/index.h"
-#include "../libsvn_fs_fs/rev_file.h"
-#include "../libsvn_fs_fs/util.h"
-#include "../libsvn_fs/fs-loader.h"
-
-#include "svnfsfs.h"
-
-/* Callback function type receiving a single P2L index ENTRY, a user
- * provided BATON and a SCRATCH_POOL for temporary allocations.
- * ENTRY's lifetime may end when the callback returns.
- */
-typedef svn_error_t *
-(*svn_fs_fs__dump_index_func_t)(const svn_fs_fs__p2l_entry_t *entry,
- void *baton,
- apr_pool_t *scratch_pool);
-
-/* Return the 8 digit hex string for FNVV1, allocated in POOL.
- */
-static const char *
-fnv1_to_string(apr_uint32_t fnv1,
- apr_pool_t *pool)
-{
- /* Construct a checksum object containing FNV1. */
- svn_checksum_t checksum = { NULL, svn_checksum_fnv1a_32 };
- apr_uint32_t digest = htonl(fnv1);
- checksum.digest = (const unsigned char *)&digest;
-
- /* Convert the digest to hex. */
- return svn_checksum_to_cstring_display(&checksum, pool);
-}
+#include "index.h"
+#include "rev_file.h"
+#include "util.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 "};
-
-/* Implements svn_fs_fs__dump_index_func_t as printing one table row
- * containing the fields of ENTRY to the console.
- */
-static svn_error_t *
-dump_index_entry(const svn_fs_fs__p2l_entry_t *entry,
- void *baton,
- apr_pool_t *scratch_pool)
-{
- const char *type_str
- = entry->type < (sizeof(item_type_str) / sizeof(item_type_str[0]))
- ? item_type_str[entry->type]
- : "???";
-
- printf("%12" APR_UINT64_T_HEX_FMT " %12" APR_UINT64_T_HEX_FMT
- " %s %9ld %8" APR_UINT64_T_FMT " %s\n",
- (apr_uint64_t)entry->offset, (apr_uint64_t)entry->size,
- type_str, entry->item.revision, entry->item.number,
- fnv1_to_string(entry->fnv1_checksum, scratch_pool));
-
- return SVN_NO_ERROR;
-}
+#include "../libsvn_fs/fs-loader.h"
-/* Read the P2L index for the rev / pack file containing REVISION in FS.
- * For each index entry, invoke CALLBACK_FUNC with CALLBACK_BATON.
- * If not NULL, call CANCEL_FUNC with CANCEL_BATON from time to time.
- * Use SCRATCH_POOL for temporary allocations.
- */
-static svn_error_t *
+svn_error_t *
svn_fs_fs__dump_index(svn_fs_t *fs,
svn_revnum_t revision,
svn_fs_fs__dump_index_func_t callback_func,
@@ -95,6 +38,7 @@ svn_fs_fs__dump_index(svn_fs_t *fs,
void *cancel_baton,
apr_pool_t *scratch_pool)
{
+ fs_fs_data_t *ffd = fs->fsap_data;
svn_fs_fs__revision_file_t *rev_file;
int i;
apr_off_t offset, max_offset;
@@ -121,7 +65,7 @@ svn_fs_fs__dump_index(svn_fs_t *fs,
* we start at the first offset not covered. */
svn_pool_clear(iterpool);
SVN_ERR(svn_fs_fs__p2l_index_lookup(&entries, fs, rev_file, revision,
- offset, INDEX_BLOCK_SIZE,
+ offset, ffd->p2l_page_size,
iterpool, iterpool));
/* Print entries for this block, one line per entry. */
@@ -144,40 +88,3 @@ svn_fs_fs__dump_index(svn_fs_t *fs,
return SVN_NO_ERROR;
}
-
-
-/* Read the repository at PATH beginning with revision START_REVISION and
- * return the result in *FS. Allocate caches with MEMSIZE bytes total
- * capacity. Use POOL for non-cache allocations.
- */
-static svn_error_t *
-dump_index(const char *path,
- svn_revnum_t revision,
- apr_pool_t *pool)
-{
- svn_fs_t *fs;
-
- /* Check repository type and open it. */
- SVN_ERR(open_fs(&fs, path, pool));
-
- /* Write header line. */
- printf(" Start Length Type Revision Item Checksum\n");
-
- /* Dump the whole index contents */
- SVN_ERR(svn_fs_fs__dump_index(fs, revision, dump_index_entry, NULL,
- check_cancel, NULL, pool));
-
- return SVN_NO_ERROR;
-}
-
-/* This implements `svn_opt_subcommand_t'. */
-svn_error_t *
-subcommand__dump_index(apr_getopt_t *os, void *baton, apr_pool_t *pool)
-{
- svnfsfs__opt_state *opt_state = baton;
-
- SVN_ERR(dump_index(opt_state->repository_path,
- opt_state->start_revision.value.number, pool));
-
- return SVN_NO_ERROR;
-}
Modified: subversion/trunk/subversion/svnfsfs/dump-index-cmd.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svnfsfs/dump-index-cmd.c?rev=1632857&r1=1632856&r2=1632857&view=diff
==============================================================================
--- subversion/trunk/subversion/svnfsfs/dump-index-cmd.c (original)
+++ subversion/trunk/subversion/svnfsfs/dump-index-cmd.c Sat Oct 18 23:19:38
2014
@@ -20,26 +20,14 @@
* ====================================================================
*/
+#define APR_WANT_BYTEFUNC
+
#include "svn_dirent_uri.h"
#include "svn_pools.h"
-
-#include "../libsvn_fs_fs/fs.h"
-#include "../libsvn_fs_fs/index.h"
-#include "../libsvn_fs_fs/rev_file.h"
-#include "../libsvn_fs_fs/util.h"
-#include "../libsvn_fs/fs-loader.h"
+#include "private/svn_fs_fs_private.h"
#include "svnfsfs.h"
-/* Callback function type receiving a single P2L index ENTRY, a user
- * provided BATON and a SCRATCH_POOL for temporary allocations.
- * ENTRY's lifetime may end when the callback returns.
- */
-typedef svn_error_t *
-(*svn_fs_fs__dump_index_func_t)(const svn_fs_fs__p2l_entry_t *entry,
- void *baton,
- apr_pool_t *scratch_pool);
-
/* Return the 8 digit hex string for FNVV1, allocated in POOL.
*/
static const char *
@@ -81,71 +69,6 @@ dump_index_entry(const svn_fs_fs__p2l_en
return SVN_NO_ERROR;
}
-/* Read the P2L index for the rev / pack file containing REVISION in FS.
- * For each index entry, invoke CALLBACK_FUNC with CALLBACK_BATON.
- * If not NULL, call CANCEL_FUNC with CANCEL_BATON from time to time.
- * Use SCRATCH_POOL for temporary allocations.
- */
-static svn_error_t *
-svn_fs_fs__dump_index(svn_fs_t *fs,
- svn_revnum_t revision,
- svn_fs_fs__dump_index_func_t callback_func,
- void *callback_baton,
- svn_cancel_func_t cancel_func,
- void *cancel_baton,
- apr_pool_t *scratch_pool)
-{
- svn_fs_fs__revision_file_t *rev_file;
- int i;
- apr_off_t offset, max_offset;
- apr_pool_t *iterpool = svn_pool_create(scratch_pool);
-
- /* Check the FS format. */
- if (! svn_fs_fs__use_log_addressing(fs, revision))
- return svn_error_create(SVN_ERR_FS_UNSUPPORTED_FORMAT, NULL, NULL);
-
- /* Revision & index file access object. */
- SVN_ERR(svn_fs_fs__open_pack_or_rev_file(&rev_file, fs, revision,
- scratch_pool, iterpool));
-
- /* Offset range to cover. */
- SVN_ERR(svn_fs_fs__p2l_get_max_offset(&max_offset, fs, rev_file, revision,
- scratch_pool));
-
- /* Walk through all P2L index entries in offset order. */
- for (offset = 0; offset < max_offset; )
- {
- apr_array_header_t *entries;
-
- /* Read entries for the next block. There will be no overlaps since
- * we start at the first offset not covered. */
- svn_pool_clear(iterpool);
- SVN_ERR(svn_fs_fs__p2l_index_lookup(&entries, fs, rev_file, revision,
- offset, INDEX_BLOCK_SIZE,
- iterpool, iterpool));
-
- /* Print entries for this block, one line per entry. */
- for (i = 0; i < entries->nelts && offset < max_offset; ++i)
- {
- const svn_fs_fs__p2l_entry_t *entry
- = &APR_ARRAY_IDX(entries, i, const svn_fs_fs__p2l_entry_t);
- offset = entry->offset + entry->size;
-
- /* Cancellation support */
- if (cancel_func)
- SVN_ERR(cancel_func(cancel_baton));
-
- /* Invoke processing callback. */
- SVN_ERR(callback_func(entry, callback_baton, iterpool));
- }
- }
-
- svn_pool_destroy(iterpool);
-
- return SVN_NO_ERROR;
-}
-
-
/* Read the repository at PATH beginning with revision START_REVISION and
* return the result in *FS. Allocate caches with MEMSIZE bytes total
* capacity. Use POOL for non-cache allocations.
