Modified: subversion/branches/remove-log-addressing/subversion/libsvn_fs_fs/util.c URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/libsvn_fs_fs/util.c?rev=1604059&r1=1604058&r2=1604059&view=diff ============================================================================== --- subversion/branches/remove-log-addressing/subversion/libsvn_fs_fs/util.c (original) +++ subversion/branches/remove-log-addressing/subversion/libsvn_fs_fs/util.c Fri Jun 20 00:41:20 2014 @@ -154,26 +154,6 @@ path_rev_absolute_internal(svn_fs_t *fs, } const char * -svn_fs_fs__path_l2p_index(svn_fs_t *fs, - svn_revnum_t rev, - svn_boolean_t packed, - apr_pool_t *pool) -{ - return apr_psprintf(pool, "%s" PATH_EXT_L2P_INDEX, - path_rev_absolute_internal(fs, rev, packed, pool)); -} - -const char * -svn_fs_fs__path_p2l_index(svn_fs_t *fs, - svn_revnum_t rev, - svn_boolean_t packed, - apr_pool_t *pool) -{ - return apr_psprintf(pool, "%s" PATH_EXT_P2L_INDEX, - path_rev_absolute_internal(fs, rev, packed, pool)); -} - -const char * svn_fs_fs__path_rev_absolute(svn_fs_t *fs, svn_revnum_t rev, apr_pool_t *pool) @@ -255,24 +235,6 @@ svn_fs_fs__path_txn_dir(svn_fs_t *fs, SVN_VA_NULL); } -const char* -svn_fs_fs__path_l2p_proto_index(svn_fs_t *fs, - const svn_fs_fs__id_part_t *txn_id, - apr_pool_t *pool) -{ - return svn_dirent_join(svn_fs_fs__path_txn_dir(fs, txn_id, pool), - PATH_INDEX PATH_EXT_L2P_INDEX, pool); -} - -const char* -svn_fs_fs__path_p2l_proto_index(svn_fs_t *fs, - const svn_fs_fs__id_part_t *txn_id, - apr_pool_t *pool) -{ - return svn_dirent_join(svn_fs_fs__path_txn_dir(fs, txn_id, pool), - PATH_INDEX PATH_EXT_P2L_INDEX, pool); -} - const char * svn_fs_fs__path_txn_item_index(svn_fs_t *fs, const svn_fs_fs__id_part_t *txn_id, @@ -681,12 +643,3 @@ svn_fs_fs__move_into_place(const char *o return SVN_NO_ERROR; } - -svn_boolean_t -svn_fs_fs__use_log_addressing(svn_fs_t *fs, - svn_revnum_t rev) -{ - fs_fs_data_t *ffd = fs->fsap_data; - return ffd->min_log_addressing_rev != SVN_INVALID_REVNUM - && ffd->min_log_addressing_rev <= rev; -}
Modified: subversion/branches/remove-log-addressing/subversion/libsvn_fs_fs/util.h URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/libsvn_fs_fs/util.h?rev=1604059&r1=1604058&r2=1604059&view=diff ============================================================================== --- subversion/branches/remove-log-addressing/subversion/libsvn_fs_fs/util.h (original) +++ subversion/branches/remove-log-addressing/subversion/libsvn_fs_fs/util.h Fri Jun 20 00:41:20 2014 @@ -176,24 +176,6 @@ svn_fs_fs__path_revprops(svn_fs_t *fs, svn_revnum_t rev, apr_pool_t *pool); -/* Return the path of the file containing the log-to-phys index for the - * file containing revision REV in FS. The result will be allocated in POOL. - */ -const char * -svn_fs_fs__path_l2p_index(svn_fs_t *fs, - svn_revnum_t rev, - svn_boolean_t packed, - apr_pool_t *pool); - -/* Return the path of the file containing the phys-to-log index for the - * file containing revision REV in FS. The result will be allocated in POOL. - */ -const char * -svn_fs_fs__path_p2l_index(svn_fs_t *fs, - svn_revnum_t rev, - svn_boolean_t packed, - apr_pool_t *pool); - /* Return the path of the file storing the oldest non-packed revision in FS. * The result will be allocated in POOL. */ @@ -250,24 +232,6 @@ svn_fs_fs__path_txn_node_children(svn_fs const svn_fs_id_t *id, apr_pool_t *pool); -/* Return the path of the file containing the log-to-phys index for - * the transaction identified by TXN_ID in FS. - * The result will be allocated in POOL. - */ -const char* -svn_fs_fs__path_l2p_proto_index(svn_fs_t *fs, - const svn_fs_fs__id_part_t *txn_id, - apr_pool_t *pool); - -/* Return the path of the file containing the phys-to-log index for - * the transaction identified by TXN_ID in FS. - * The result will be allocated in POOL. - */ -const char* -svn_fs_fs__path_p2l_proto_index(svn_fs_t *fs, - const svn_fs_fs__id_part_t *txn_id, - apr_pool_t *pool); - /* Return the path of the file containing item_index counter for * the transaction identified by TXN_ID in FS. * The result will be allocated in POOL. @@ -399,9 +363,4 @@ svn_fs_fs__move_into_place(const char *o const char *perms_reference, apr_pool_t *pool); -/* Return TRUE, iff revision REV in FS requires logical addressing. */ -svn_boolean_t -svn_fs_fs__use_log_addressing(svn_fs_t *fs, - svn_revnum_t rev); - #endif Modified: subversion/branches/remove-log-addressing/subversion/libsvn_fs_fs/verify.c URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/libsvn_fs_fs/verify.c?rev=1604059&r1=1604058&r2=1604059&view=diff ============================================================================== --- subversion/branches/remove-log-addressing/subversion/libsvn_fs_fs/verify.c (original) +++ subversion/branches/remove-log-addressing/subversion/libsvn_fs_fs/verify.c Fri Jun 20 00:41:20 2014 @@ -30,7 +30,6 @@ #include "cached_data.h" #include "rep-cache.h" #include "util.h" -#include "index.h" #include "../libsvn_fs/fs-loader.h" @@ -159,435 +158,6 @@ verify_rep_cache(svn_fs_t *fs, return SVN_NO_ERROR; } -/* Verify that for all log-to-phys index entries for revisions START to - * START + COUNT-1 in FS there is a consistent entry in the phys-to-log - * index. If given, invoke CANCEL_FUNC with CANCEL_BATON at regular - * intervals. Use POOL for allocations. - */ -static svn_error_t * -compare_l2p_to_p2l_index(svn_fs_t *fs, - svn_revnum_t start, - svn_revnum_t count, - svn_cancel_func_t cancel_func, - void *cancel_baton, - apr_pool_t *pool) -{ - svn_revnum_t i; - apr_pool_t *iterpool = svn_pool_create(pool); - apr_array_header_t *max_ids; - - /* common file access structure */ - svn_fs_fs__revision_file_t rev_file; - svn_fs_fs__init_revision_file(&rev_file, fs, start, pool); - - /* determine the range of items to check for each revision */ - SVN_ERR(svn_fs_fs__l2p_get_max_ids(&max_ids, fs, start, count, pool)); - - /* check all items in all revisions if the given range */ - for (i = 0; i < max_ids->nelts; ++i) - { - apr_uint64_t k; - apr_uint64_t max_id = APR_ARRAY_IDX(max_ids, i, apr_uint64_t); - svn_revnum_t revision = start + i; - - for (k = 0; k < max_id; ++k) - { - apr_off_t offset; - svn_fs_fs__p2l_entry_t *p2l_entry; - svn_pool_clear(iterpool); - - /* get L2P entry. Ignore unused entries. */ - SVN_ERR(svn_fs_fs__item_offset(&offset, fs, &rev_file, revision, - NULL, k, iterpool)); - if (offset == -1) - continue; - - /* find the corresponding P2L entry */ - SVN_ERR(svn_fs_fs__p2l_entry_lookup(&p2l_entry, fs, &rev_file, - revision, offset, iterpool)); - - if (p2l_entry == NULL) - return svn_error_createf(SVN_ERR_FS_ITEM_INDEX_INCONSISTENT, - NULL, - _("p2l index entry not found for " - "PHYS %s returned by " - "l2p index for LOG r%ld:i%ld"), - apr_off_t_toa(pool, offset), - revision, (long)k); - - if ( p2l_entry->item.number != k - || p2l_entry->item.revision != revision) - return svn_error_createf(SVN_ERR_FS_ITEM_INDEX_INCONSISTENT, - NULL, - _("p2l index info LOG r%ld:i%ld" - " does not match " - "l2p index for LOG r%ld:i%ld"), - p2l_entry->item.revision, - (long)p2l_entry->item.number, - revision, (long)k); - } - - if (cancel_func) - SVN_ERR(cancel_func(cancel_baton)); - } - - svn_pool_destroy(iterpool); - - SVN_ERR(svn_fs_fs__close_revision_file(&rev_file)); - - return SVN_NO_ERROR; -} - -/* Verify that for all phys-to-log index entries for revisions START to - * START + COUNT-1 in FS there is a consistent entry in the log-to-phys - * index. If given, invoke CANCEL_FUNC with CANCEL_BATON at regular - * intervals. Use POOL for allocations. - * - * Please note that we can only check on pack / rev file granularity and - * must only be called for a single rev / pack file. - */ -static svn_error_t * -compare_p2l_to_l2p_index(svn_fs_t *fs, - svn_revnum_t start, - svn_revnum_t count, - svn_cancel_func_t cancel_func, - void *cancel_baton, - apr_pool_t *pool) -{ - fs_fs_data_t *ffd = fs->fsap_data; - apr_pool_t *iterpool = svn_pool_create(pool); - apr_off_t max_offset; - apr_off_t offset = 0; - - /* common file access structure */ - svn_fs_fs__revision_file_t rev_file; - svn_fs_fs__init_revision_file(&rev_file, fs, start, pool); - - /* get the size of the rev / pack file as covered by the P2L index */ - SVN_ERR(svn_fs_fs__p2l_get_max_offset(&max_offset, fs, &rev_file, start, - pool)); - - /* for all offsets in the file, get the P2L index entries and check - them against the L2P index */ - for (offset = 0; offset < max_offset; ) - { - apr_array_header_t *entries; - svn_fs_fs__p2l_entry_t *last_entry; - int i; - - svn_pool_clear(iterpool); - - /* get all entries for the current block */ - SVN_ERR(svn_fs_fs__p2l_index_lookup(&entries, fs, &rev_file, start, - offset, ffd->p2l_page_size, - iterpool)); - if (entries->nelts == 0) - return svn_error_createf(SVN_ERR_FS_ITEM_INDEX_CORRUPTION, - NULL, - _("p2l does not cover offset %s" - " for revision %ld"), - apr_off_t_toa(pool, offset), start); - - /* process all entries (and later continue with the next block) */ - last_entry - = &APR_ARRAY_IDX(entries, entries->nelts-1, svn_fs_fs__p2l_entry_t); - offset = last_entry->offset + last_entry->size; - - for (i = 0; i < entries->nelts; ++i) - { - svn_fs_fs__p2l_entry_t *entry - = &APR_ARRAY_IDX(entries, i, svn_fs_fs__p2l_entry_t); - - /* check all sub-items for consist entries in the L2P index */ - if (entry->type != SVN_FS_FS__ITEM_TYPE_UNUSED) - { - apr_off_t l2p_offset; - SVN_ERR(svn_fs_fs__item_offset(&l2p_offset, fs, &rev_file, - entry->item.revision, NULL, - entry->item.number, iterpool)); - - if (l2p_offset != entry->offset) - return svn_error_createf(SVN_ERR_FS_ITEM_INDEX_INCONSISTENT, - NULL, - _("l2p index entry PHYS %s" - "does not match p2l index value " - "LOG r%ld:i%ld for PHYS %s"), - apr_off_t_toa(pool, l2p_offset), - entry->item.revision, - (long)entry->item.number, - apr_off_t_toa(pool, entry->offset)); - } - } - - if (cancel_func) - SVN_ERR(cancel_func(cancel_baton)); - } - - svn_pool_destroy(iterpool); - - SVN_ERR(svn_fs_fs__close_revision_file(&rev_file)); - - return SVN_NO_ERROR; -} - -/* Items smaller than this can be read at once into a buffer and directly - * be checksummed. Larger items require stream processing. - * Must be a multiple of 8. */ -#define STREAM_THRESHOLD 4096 - -/* Verify that the next SIZE bytes read from FILE are NUL. - * SIZE must not exceed STREAM_THRESHOLD. Use POOL for allocations. - */ -static svn_error_t * -expect_buffer_nul(apr_file_t *file, - apr_off_t size, - apr_pool_t *pool) -{ - union - { - unsigned char buffer[STREAM_THRESHOLD]; - apr_uint64_t chunks[STREAM_THRESHOLD / sizeof(apr_uint64_t)]; - } data; - - apr_size_t i; - SVN_ERR_ASSERT(size <= STREAM_THRESHOLD); - - /* read the whole data block; error out on failure */ - data.chunks[(size - 1)/ sizeof(apr_uint64_t)] = 0; - SVN_ERR(svn_io_file_read_full2(file, data.buffer, size, NULL, NULL, pool)); - - /* chunky check */ - for (i = 0; i < size / sizeof(apr_uint64_t); ++i) - if (data.chunks[i] != 0) - break; - - /* byte-wise check upon mismatch or at the end of the block */ - for (i *= sizeof(apr_uint64_t); i < size; ++i) - if (data.buffer[i] != 0) - { - const char *file_name; - apr_off_t offset; - - SVN_ERR(svn_io_file_name_get(&file_name, file, pool)); - SVN_ERR(svn_fs_fs__get_file_offset(&offset, file, pool)); - offset -= size - i; - - return svn_error_createf(SVN_ERR_FS_CORRUPT, NULL, - _("Empty section in file %s contains " - "non-NUL data at offset %s"), - file_name, apr_off_t_toa(pool, offset)); - } - - return SVN_NO_ERROR; -} - -/* Verify that the next SIZE bytes read from FILE are NUL. - * Use POOL for allocations. - */ -static svn_error_t * -read_all_nul(apr_file_t *file, - apr_off_t size, - apr_pool_t *pool) -{ - for (; size >= STREAM_THRESHOLD; size -= STREAM_THRESHOLD) - SVN_ERR(expect_buffer_nul(file, STREAM_THRESHOLD, pool)); - - if (size) - SVN_ERR(expect_buffer_nul(file, size, pool)); - - return SVN_NO_ERROR; -} - -/* Compare the ACTUAL checksum with the one expected by ENTRY. - * Return an error in case of mismatch. Use the name of FILE - * in error message. Allocate data in POOL. - */ -static svn_error_t * -expected_checksum(apr_file_t *file, - svn_fs_fs__p2l_entry_t *entry, - apr_uint32_t actual, - apr_pool_t *pool) -{ - if (actual != entry->fnv1_checksum) - { - const char *file_name; - - SVN_ERR(svn_io_file_name_get(&file_name, file, pool)); - return svn_error_createf(SVN_ERR_FS_CORRUPT, NULL, - _("Checksum mismatch item at offset %s of " - "length %s bytes in file %s"), - apr_off_t_toa(pool, entry->offset), - apr_off_t_toa(pool, entry->size), file_name); - } - - return SVN_NO_ERROR; -} - -/* Verify that the FNV checksum over the next ENTRY->SIZE bytes read - * from FILE will match ENTRY's expected checksum. SIZE must not - * exceed STREAM_THRESHOLD. Use POOL for allocations. - */ -static svn_error_t * -expected_buffered_checksum(apr_file_t *file, - svn_fs_fs__p2l_entry_t *entry, - apr_pool_t *pool) -{ - unsigned char buffer[STREAM_THRESHOLD]; - SVN_ERR_ASSERT(entry->size <= STREAM_THRESHOLD); - - SVN_ERR(svn_io_file_read_full2(file, buffer, (apr_size_t)entry->size, - NULL, NULL, pool)); - SVN_ERR(expected_checksum(file, entry, - svn__fnv1a_32x4(buffer, (apr_size_t)entry->size), - pool)); - - return SVN_NO_ERROR; -} - -/* Verify that the FNV checksum over the next ENTRY->SIZE bytes read from - * FILE will match ENTRY's expected checksum. Use POOL for allocations. - */ -static svn_error_t * -expected_streamed_checksum(apr_file_t *file, - svn_fs_fs__p2l_entry_t *entry, - apr_pool_t *pool) -{ - unsigned char buffer[STREAM_THRESHOLD]; - svn_checksum_t *checksum; - svn_checksum_ctx_t *context - = svn_checksum_ctx_create(svn_checksum_fnv1a_32x4, pool); - apr_off_t size = entry->size; - - while (size > 0) - { - apr_size_t to_read = size > sizeof(buffer) - ? sizeof(buffer) - : (apr_size_t)size; - SVN_ERR(svn_io_file_read_full2(file, buffer, to_read, NULL, NULL, - pool)); - SVN_ERR(svn_checksum_update(context, buffer, to_read)); - size -= to_read; - } - - SVN_ERR(svn_checksum_final(&checksum, context, pool)); - SVN_ERR(expected_checksum(file, entry, - ntohl(*(const apr_uint32_t *)checksum->digest), - pool)); - - return SVN_NO_ERROR; -} - -/* Verify that for all phys-to-log index entries for revisions START to - * START + COUNT-1 in FS match the actual pack / rev file contents. - * If given, invoke CANCEL_FUNC with CANCEL_BATON at regular intervals. - * Use POOL for allocations. - * - * Please note that we can only check on pack / rev file granularity and - * must only be called for a single rev / pack file. - */ -static svn_error_t * -compare_p2l_to_rev(svn_fs_t *fs, - svn_revnum_t start, - svn_revnum_t count, - svn_cancel_func_t cancel_func, - void *cancel_baton, - apr_pool_t *pool) -{ - fs_fs_data_t *ffd = fs->fsap_data; - apr_pool_t *iterpool = svn_pool_create(pool); - apr_off_t max_offset; - apr_off_t offset = 0; - svn_fs_fs__revision_file_t *rev_file; - - /* open the pack / rev file that is covered by the p2l index */ - SVN_ERR(svn_fs_fs__open_pack_or_rev_file(&rev_file, fs, start, pool)); - - /* check file size vs. range covered by index */ - SVN_ERR(svn_io_file_seek(rev_file->file, APR_END, &offset, pool)); - SVN_ERR(svn_fs_fs__p2l_get_max_offset(&max_offset, fs, rev_file, start, - pool)); - - if (offset != max_offset) - return svn_error_createf(SVN_ERR_FS_ITEM_INDEX_INCONSISTENT, NULL, - _("File size of %s for revision r%ld does " - "not match p2l index size of %s"), - apr_off_t_toa(pool, offset), start, - apr_off_t_toa(pool, max_offset)); - - SVN_ERR(svn_io_file_aligned_seek(rev_file->file, ffd->block_size, NULL, 0, - pool)); - - /* for all offsets in the file, get the P2L index entries and check - them against the L2P index */ - for (offset = 0; offset < max_offset; ) - { - apr_array_header_t *entries; - int i; - - svn_pool_clear(iterpool); - - /* get all entries for the current block */ - SVN_ERR(svn_fs_fs__p2l_index_lookup(&entries, fs, rev_file, start, - offset, ffd->p2l_page_size, - iterpool)); - - /* process all entries (and later continue with the next block) */ - for (i = 0; i < entries->nelts; ++i) - { - svn_fs_fs__p2l_entry_t *entry - = &APR_ARRAY_IDX(entries, i, svn_fs_fs__p2l_entry_t); - - /* skip bits we previously checked */ - if (i == 0 && entry->offset < offset) - continue; - - /* skip zero-sized entries */ - if (entry->size == 0) - continue; - - /* p2l index must cover all rev / pack file offsets exactly once */ - if (entry->offset != offset) - return svn_error_createf(SVN_ERR_FS_ITEM_INDEX_INCONSISTENT, - NULL, - _("p2l index entry for revision r%ld" - " is non-contiguous between offsets " - " %s and %s"), - start, - apr_off_t_toa(pool, offset), - apr_off_t_toa(pool, entry->offset)); - - /* empty sections must contain NUL bytes only */ - if (entry->type == SVN_FS_FS__ITEM_TYPE_UNUSED) - { - /* skip filler entry at the end of the p2l index */ - if (entry->offset != max_offset) - SVN_ERR(read_all_nul(rev_file->file, entry->size, pool)); - } - else if (entry->fnv1_checksum) - { - if (entry->size < STREAM_THRESHOLD) - SVN_ERR(expected_buffered_checksum(rev_file->file, entry, - pool)); - else - SVN_ERR(expected_streamed_checksum(rev_file->file, entry, - pool)); - } - - /* advance offset */ - offset += entry->size; - } - - if (cancel_func) - SVN_ERR(cancel_func(cancel_baton)); - } - - svn_pool_destroy(iterpool); - - SVN_ERR(svn_fs_fs__close_revision_file(rev_file)); - - return SVN_NO_ERROR; -} - static svn_revnum_t packed_base_rev(svn_fs_t *fs, svn_revnum_t rev) { @@ -606,79 +176,6 @@ pack_size(svn_fs_t *fs, svn_revnum_t rev return rev < ffd->min_unpacked_rev ? ffd->max_files_per_dir : 1; } -/* Verify that the log-to-phys indexes and phys-to-log indexes are - * consistent with each other. The function signature is similar to - * svn_fs_fs__verify. - * - * The values of START and END have already been auto-selected and - * verified. You may call this for format7 or higher repos. - */ -static svn_error_t * -verify_index_consistency(svn_fs_t *fs, - svn_revnum_t start, - svn_revnum_t end, - svn_fs_progress_notify_func_t notify_func, - void *notify_baton, - svn_cancel_func_t cancel_func, - void *cancel_baton, - apr_pool_t *pool) -{ - fs_fs_data_t *ffd = fs->fsap_data; - svn_revnum_t revision, next_revision; - apr_pool_t *iterpool = svn_pool_create(pool); - - for (revision = start; revision <= end; revision = next_revision) - { - svn_error_t *err = SVN_NO_ERROR; - - svn_revnum_t count = pack_size(fs, revision); - svn_revnum_t pack_start = packed_base_rev(fs, revision); - svn_revnum_t pack_end = pack_start + count; - - svn_pool_clear(iterpool); - - if (notify_func && (pack_start % ffd->max_files_per_dir == 0)) - notify_func(pack_start, notify_baton, iterpool); - - /* two-way index check */ - err = compare_l2p_to_p2l_index(fs, pack_start, pack_end - pack_start, - cancel_func, cancel_baton, iterpool); - if (!err) - err = compare_p2l_to_l2p_index(fs, pack_start, pack_end - pack_start, - cancel_func, cancel_baton, iterpool); - - /* verify in-index checksums and types vs. actual rev / pack files */ - if (!err) - err = compare_p2l_to_rev(fs, pack_start, pack_end - pack_start, - cancel_func, cancel_baton, iterpool); - - /* concurrent packing is one of the reasons why verification may fail. - Make sure, we operate on up-to-date information. */ - if (err) - SVN_ERR(svn_fs_fs__read_min_unpacked_rev(&ffd->min_unpacked_rev, - fs, pool)); - - /* retry the whole shard if it got packed in the meantime */ - if (err && count != pack_size(fs, revision)) - { - svn_error_clear(err); - - /* We could simply assign revision here but the code below is - more intuitive to maintainers. */ - next_revision = packed_base_rev(fs, revision); - } - else - { - SVN_ERR(err); - next_revision = pack_end; - } - } - - svn_pool_destroy(iterpool); - - return SVN_NO_ERROR; -} - svn_error_t * svn_fs_fs__verify(svn_fs_t *fs, svn_revnum_t start, @@ -700,14 +197,6 @@ svn_fs_fs__verify(svn_fs_t *fs, SVN_ERR(svn_fs_fs__ensure_revision_exists(start, fs, pool)); SVN_ERR(svn_fs_fs__ensure_revision_exists(end, fs, pool)); - /* log/phys index consistency. We need to check them first to make - sure we can access the rev / pack files in format7. */ - if (svn_fs_fs__use_log_addressing(fs, end)) - SVN_ERR(verify_index_consistency(fs, - MAX(start, ffd->min_log_addressing_rev), - end, notify_func, notify_baton, - cancel_func, cancel_baton, pool)); - /* rep cache consistency */ if (ffd->format >= SVN_FS_FS__MIN_REP_SHARING_FORMAT) SVN_ERR(verify_rep_cache(fs, start, end, notify_func, notify_baton, Modified: subversion/branches/remove-log-addressing/subversion/tests/libsvn_fs_fs/fs-fs-pack-test.c URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/tests/libsvn_fs_fs/fs-fs-pack-test.c?rev=1604059&r1=1604058&r2=1604059&view=diff ============================================================================== --- subversion/branches/remove-log-addressing/subversion/tests/libsvn_fs_fs/fs-fs-pack-test.c (original) +++ subversion/branches/remove-log-addressing/subversion/tests/libsvn_fs_fs/fs-fs-pack-test.c Fri Jun 20 00:41:20 2014 @@ -56,35 +56,16 @@ write_format(const char *path, if (format >= SVN_FS_FS__MIN_LAYOUT_FORMAT_OPTION_FORMAT) { - if (format >= SVN_FS_FS__MIN_LOG_ADDRESSING_FORMAT) - { - if (max_files_per_dir) - contents = apr_psprintf(pool, - "%d\n" - "layout sharded %d\n" - "addressing logical 0\n", - format, max_files_per_dir); - else - /* linear layouts never use logical addressing */ - contents = apr_psprintf(pool, - "%d\n" - "layout linear\n" - "addressing physical\n", - format); - } + if (max_files_per_dir) + contents = apr_psprintf(pool, + "%d\n" + "layout sharded %d\n", + format, max_files_per_dir); else - { - if (max_files_per_dir) - contents = apr_psprintf(pool, - "%d\n" - "layout sharded %d\n", - format, max_files_per_dir); - else - contents = apr_psprintf(pool, - "%d\n" - "layout linear\n", - format); - } + contents = apr_psprintf(pool, + "%d\n" + "layout linear\n", + format); } else { @@ -336,37 +317,14 @@ pack_filesystem(const svn_test_opts_t *o return svn_error_createf(SVN_ERR_FS_GENERAL, NULL, "Expected pack file '%s' not found", path); - if (opts->server_minor_version && (opts->server_minor_version < 9)) - { - path = svn_dirent_join_many(pool, REPO_NAME, "revs", - apr_psprintf(pool, "%d.pack", i / SHARD_SIZE), - "manifest", SVN_VA_NULL); - SVN_ERR(svn_io_check_path(path, &kind, pool)); - if (kind != svn_node_file) - return svn_error_createf(SVN_ERR_FS_GENERAL, NULL, - "Expected manifest file '%s' not found", - path); - } - else - { - path = svn_dirent_join_many(pool, REPO_NAME, "revs", - apr_psprintf(pool, "%d.pack", i / SHARD_SIZE), - "pack.l2p", SVN_VA_NULL); - SVN_ERR(svn_io_check_path(path, &kind, pool)); - if (kind != svn_node_file) - return svn_error_createf(SVN_ERR_FS_GENERAL, NULL, - "Expected log-to-phys index file '%s' not found", - path); - - path = svn_dirent_join_many(pool, REPO_NAME, "revs", - apr_psprintf(pool, "%d.pack", i / SHARD_SIZE), - "pack.p2l", NULL); - SVN_ERR(svn_io_check_path(path, &kind, pool)); - if (kind != svn_node_file) - return svn_error_createf(SVN_ERR_FS_GENERAL, NULL, - "Expected phys-to-log index file '%s' not found", - path); - } + path = svn_dirent_join_many(pool, REPO_NAME, "revs", + apr_psprintf(pool, "%d.pack", i / SHARD_SIZE), + "manifest", SVN_VA_NULL); + SVN_ERR(svn_io_check_path(path, &kind, pool)); + if (kind != svn_node_file) + return svn_error_createf(SVN_ERR_FS_GENERAL, NULL, + "Expected manifest file '%s' not found", + path); /* This directory should not exist. */ path = svn_dirent_join_many(pool, REPO_NAME, "revs", Modified: subversion/branches/remove-log-addressing/tools/server-side/svnfsfs/dump-index-cmd.c URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/tools/server-side/svnfsfs/dump-index-cmd.c?rev=1604059&r1=1604058&r2=1604059&view=diff ============================================================================== --- subversion/branches/remove-log-addressing/tools/server-side/svnfsfs/dump-index-cmd.c (original) +++ subversion/branches/remove-log-addressing/tools/server-side/svnfsfs/dump-index-cmd.c Fri Jun 20 00:41:20 2014 @@ -70,55 +70,7 @@ dump_index(const char *path, SVN_ERR(open_fs(&fs, path, pool)); ffd = fs->fsap_data; - /* 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, pool)); - - /* Offset range to cover. */ - SVN_ERR(svn_fs_fs__p2l_get_max_offset(&max_offset, fs, rev_file, revision, - pool)); - - /* Write header line. */ - printf(" Start Length Type Revision Item Checksum\n"); - - /* 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, ffd->p2l_page_size, - 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); - const char *type_str - = entry->type < (sizeof(item_type_str) / sizeof(item_type_str[0])) - ? item_type_str[entry->type] - : "???"; - - offset = entry->offset + entry->size; - - printf("%12" APR_UINT64_T_HEX_FMT " %12" APR_UINT64_T_HEX_FMT - " %s %9ld %8" APR_UINT64_T_HEX_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, iterpool)); - } - } - - svn_pool_destroy(iterpool); - - return SVN_NO_ERROR; + return svn_error_create(SVN_ERR_FS_UNSUPPORTED_FORMAT, NULL, NULL); } /* This implements `svn_opt_subcommand_t'. */
