2018-07-12 21:39:21 +02:00
|
|
|
#!/bin/sh
|
|
|
|
|
|
|
|
|
|
test_description='multi-pack-indexes'
|
|
|
|
|
. ./test-lib.sh
|
|
|
|
|
|
2018-07-12 21:39:33 +02:00
|
|
|
objdir=.git/objects
|
|
|
|
|
|
2018-07-12 21:39:23 +02:00
|
|
|
midx_read_expect () {
|
2018-07-12 21:39:26 +02:00
|
|
|
NUM_PACKS=$1
|
2018-07-12 21:39:31 +02:00
|
|
|
NUM_OBJECTS=$2
|
2018-07-12 21:39:32 +02:00
|
|
|
NUM_CHUNKS=$3
|
|
|
|
|
OBJECT_DIR=$4
|
|
|
|
|
EXTRA_CHUNKS="$5"
|
2018-07-12 21:39:28 +02:00
|
|
|
{
|
|
|
|
|
cat <<-EOF &&
|
2018-07-12 21:39:32 +02:00
|
|
|
header: 4d494458 1 $NUM_CHUNKS $NUM_PACKS
|
|
|
|
|
chunks: pack-names oid-fanout oid-lookup object-offsets$EXTRA_CHUNKS
|
2018-07-12 21:39:31 +02:00
|
|
|
num_objects: $NUM_OBJECTS
|
2018-07-12 21:39:28 +02:00
|
|
|
packs:
|
|
|
|
|
EOF
|
|
|
|
|
if test $NUM_PACKS -ge 1
|
|
|
|
|
then
|
2018-07-12 21:39:32 +02:00
|
|
|
ls $OBJECT_DIR/pack/ | grep idx | sort
|
2018-07-12 21:39:28 +02:00
|
|
|
fi &&
|
2018-07-12 21:39:32 +02:00
|
|
|
printf "object-dir: $OBJECT_DIR\n"
|
2018-07-12 21:39:28 +02:00
|
|
|
} >expect &&
|
2018-07-12 21:39:32 +02:00
|
|
|
test-tool read-midx $OBJECT_DIR >actual &&
|
2018-07-12 21:39:23 +02:00
|
|
|
test_cmp expect actual
|
|
|
|
|
}
|
|
|
|
|
|
2018-07-12 21:39:21 +02:00
|
|
|
test_expect_success 'write midx with no packs' '
|
2018-07-12 21:39:22 +02:00
|
|
|
test_when_finished rm -f pack/multi-pack-index &&
|
|
|
|
|
git multi-pack-index --object-dir=. write &&
|
2018-07-12 21:39:32 +02:00
|
|
|
midx_read_expect 0 0 4 .
|
2018-07-12 21:39:21 +02:00
|
|
|
'
|
|
|
|
|
|
2018-07-12 21:39:24 +02:00
|
|
|
generate_objects () {
|
|
|
|
|
i=$1
|
|
|
|
|
iii=$(printf '%03i' $i)
|
|
|
|
|
{
|
|
|
|
|
test-tool genrandom "bar" 200 &&
|
|
|
|
|
test-tool genrandom "baz $iii" 50
|
|
|
|
|
} >wide_delta_$iii &&
|
|
|
|
|
{
|
|
|
|
|
test-tool genrandom "foo"$i 100 &&
|
|
|
|
|
test-tool genrandom "foo"$(( $i + 1 )) 100 &&
|
|
|
|
|
test-tool genrandom "foo"$(( $i + 2 )) 100
|
|
|
|
|
} >deep_delta_$iii &&
|
|
|
|
|
{
|
|
|
|
|
echo $iii &&
|
|
|
|
|
test-tool genrandom "$iii" 8192
|
|
|
|
|
} >file_$iii &&
|
|
|
|
|
git update-index --add file_$iii deep_delta_$iii wide_delta_$iii
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
commit_and_list_objects () {
|
|
|
|
|
{
|
|
|
|
|
echo 101 &&
|
|
|
|
|
test-tool genrandom 100 8192;
|
|
|
|
|
} >file_101 &&
|
|
|
|
|
git update-index --add file_101 &&
|
|
|
|
|
tree=$(git write-tree) &&
|
|
|
|
|
commit=$(git commit-tree $tree -p HEAD</dev/null) &&
|
|
|
|
|
{
|
|
|
|
|
echo $tree &&
|
|
|
|
|
git ls-tree $tree | sed -e "s/.* \\([0-9a-f]*\\) .*/\\1/"
|
|
|
|
|
} >obj-list &&
|
|
|
|
|
git reset --hard $commit
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
test_expect_success 'create objects' '
|
|
|
|
|
test_commit initial &&
|
|
|
|
|
for i in $(test_seq 1 5)
|
|
|
|
|
do
|
|
|
|
|
generate_objects $i
|
|
|
|
|
done &&
|
|
|
|
|
commit_and_list_objects
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'write midx with one v1 pack' '
|
2018-07-12 21:39:33 +02:00
|
|
|
pack=$(git pack-objects --index-version=1 $objdir/pack/test <obj-list) &&
|
|
|
|
|
test_when_finished rm $objdir/pack/test-$pack.pack \
|
|
|
|
|
$objdir/pack/test-$pack.idx $objdir/pack/multi-pack-index &&
|
|
|
|
|
git multi-pack-index --object-dir=$objdir write &&
|
|
|
|
|
midx_read_expect 1 18 4 $objdir
|
2018-07-12 21:39:24 +02:00
|
|
|
'
|
|
|
|
|
|
2018-07-12 21:39:33 +02:00
|
|
|
midx_git_two_modes () {
|
2019-04-05 20:04:56 +02:00
|
|
|
git -c core.multiPackIndex=false $1 >expect &&
|
|
|
|
|
git -c core.multiPackIndex=true $1 >actual &&
|
2018-08-20 18:52:06 +02:00
|
|
|
if [ "$2" = "sorted" ]
|
|
|
|
|
then
|
2019-04-05 20:04:56 +02:00
|
|
|
sort <expect >expect.sorted &&
|
|
|
|
|
mv expect.sorted expect &&
|
|
|
|
|
sort <actual >actual.sorted &&
|
|
|
|
|
mv actual.sorted actual
|
2018-08-20 18:52:06 +02:00
|
|
|
fi &&
|
2018-07-12 21:39:33 +02:00
|
|
|
test_cmp expect actual
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
compare_results_with_midx () {
|
|
|
|
|
MSG=$1
|
|
|
|
|
test_expect_success "check normal git operations: $MSG" '
|
|
|
|
|
midx_git_two_modes "rev-list --objects --all" &&
|
2018-08-20 18:52:06 +02:00
|
|
|
midx_git_two_modes "log --raw" &&
|
|
|
|
|
midx_git_two_modes "count-objects --verbose" &&
|
2019-04-05 20:05:03 +02:00
|
|
|
midx_git_two_modes "cat-file --batch-all-objects --batch-check" &&
|
|
|
|
|
midx_git_two_modes "cat-file --batch-all-objects --batch-check --unordered" sorted
|
2018-07-12 21:39:33 +02:00
|
|
|
'
|
|
|
|
|
}
|
|
|
|
|
|
2018-07-12 21:39:24 +02:00
|
|
|
test_expect_success 'write midx with one v2 pack' '
|
2018-07-12 21:39:33 +02:00
|
|
|
git pack-objects --index-version=2,0x40 $objdir/pack/test <obj-list &&
|
|
|
|
|
git multi-pack-index --object-dir=$objdir write &&
|
|
|
|
|
midx_read_expect 1 18 4 $objdir
|
2018-07-12 21:39:24 +02:00
|
|
|
'
|
|
|
|
|
|
2018-07-12 21:39:33 +02:00
|
|
|
compare_results_with_midx "one v2 pack"
|
|
|
|
|
|
2019-04-05 20:06:22 +02:00
|
|
|
test_expect_success 'corrupt idx not opened' '
|
|
|
|
|
idx=$(test-tool read-midx $objdir | grep "\.idx\$") &&
|
|
|
|
|
mv $objdir/pack/$idx backup-$idx &&
|
|
|
|
|
test_when_finished "mv backup-\$idx \$objdir/pack/\$idx" &&
|
|
|
|
|
|
|
|
|
|
# This is the minimum size for a sha-1 based .idx; this lets
|
|
|
|
|
# us pass perfunctory tests, but anything that actually opens and reads
|
|
|
|
|
# the idx file will complain.
|
|
|
|
|
test_copy_bytes 1064 <backup-$idx >$objdir/pack/$idx &&
|
|
|
|
|
|
|
|
|
|
git -c core.multiPackIndex=true rev-list --objects --all 2>err &&
|
|
|
|
|
test_must_be_empty err
|
|
|
|
|
'
|
|
|
|
|
|
2018-07-12 21:39:24 +02:00
|
|
|
test_expect_success 'add more objects' '
|
|
|
|
|
for i in $(test_seq 6 10)
|
|
|
|
|
do
|
|
|
|
|
generate_objects $i
|
|
|
|
|
done &&
|
|
|
|
|
commit_and_list_objects
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'write midx with two packs' '
|
2018-07-12 21:39:33 +02:00
|
|
|
git pack-objects --index-version=1 $objdir/pack/test-2 <obj-list &&
|
|
|
|
|
git multi-pack-index --object-dir=$objdir write &&
|
|
|
|
|
midx_read_expect 2 34 4 $objdir
|
2018-07-12 21:39:24 +02:00
|
|
|
'
|
|
|
|
|
|
2018-07-12 21:39:33 +02:00
|
|
|
compare_results_with_midx "two packs"
|
|
|
|
|
|
2018-07-12 21:39:24 +02:00
|
|
|
test_expect_success 'add more packs' '
|
|
|
|
|
for j in $(test_seq 11 20)
|
|
|
|
|
do
|
|
|
|
|
generate_objects $j &&
|
|
|
|
|
commit_and_list_objects &&
|
2018-07-12 21:39:33 +02:00
|
|
|
git pack-objects --index-version=2 $objdir/pack/test-pack <obj-list
|
2018-07-12 21:39:24 +02:00
|
|
|
done
|
|
|
|
|
'
|
|
|
|
|
|
2018-07-12 21:39:33 +02:00
|
|
|
compare_results_with_midx "mixed mode (two packs + extra)"
|
|
|
|
|
|
2018-07-12 21:39:24 +02:00
|
|
|
test_expect_success 'write midx with twelve packs' '
|
2018-07-12 21:39:33 +02:00
|
|
|
git multi-pack-index --object-dir=$objdir write &&
|
|
|
|
|
midx_read_expect 12 74 4 $objdir
|
2018-07-12 21:39:32 +02:00
|
|
|
'
|
|
|
|
|
|
2018-07-12 21:39:33 +02:00
|
|
|
compare_results_with_midx "twelve packs"
|
|
|
|
|
|
2018-09-13 20:02:13 +02:00
|
|
|
test_expect_success 'verify multi-pack-index success' '
|
|
|
|
|
git multi-pack-index verify --object-dir=$objdir
|
|
|
|
|
'
|
|
|
|
|
|
2018-09-13 20:02:15 +02:00
|
|
|
# usage: corrupt_midx_and_verify <pos> <data> <objdir> <string>
|
|
|
|
|
corrupt_midx_and_verify() {
|
|
|
|
|
POS=$1 &&
|
|
|
|
|
DATA="${2:-\0}" &&
|
|
|
|
|
OBJDIR=$3 &&
|
|
|
|
|
GREPSTR="$4" &&
|
2018-09-13 20:02:27 +02:00
|
|
|
COMMAND="$5" &&
|
|
|
|
|
if test -z "$COMMAND"
|
|
|
|
|
then
|
|
|
|
|
COMMAND="git multi-pack-index verify --object-dir=$OBJDIR"
|
|
|
|
|
fi &&
|
2018-09-13 20:02:15 +02:00
|
|
|
FILE=$OBJDIR/pack/multi-pack-index &&
|
|
|
|
|
chmod a+w $FILE &&
|
|
|
|
|
test_when_finished mv midx-backup $FILE &&
|
|
|
|
|
cp $FILE midx-backup &&
|
|
|
|
|
printf "$DATA" | dd of="$FILE" bs=1 seek="$POS" conv=notrunc &&
|
2018-09-13 20:02:27 +02:00
|
|
|
test_must_fail $COMMAND 2>test_err &&
|
2018-09-13 20:02:15 +02:00
|
|
|
grep -v "^+" test_err >err &&
|
|
|
|
|
test_i18ngrep "$GREPSTR" err
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
test_expect_success 'verify bad signature' '
|
|
|
|
|
corrupt_midx_and_verify 0 "\00" $objdir \
|
|
|
|
|
"multi-pack-index signature"
|
|
|
|
|
'
|
|
|
|
|
|
2018-09-13 20:02:22 +02:00
|
|
|
HASH_LEN=20
|
2018-09-13 20:02:25 +02:00
|
|
|
NUM_OBJECTS=74
|
2018-09-13 20:02:15 +02:00
|
|
|
MIDX_BYTE_VERSION=4
|
|
|
|
|
MIDX_BYTE_OID_VERSION=5
|
|
|
|
|
MIDX_BYTE_CHUNK_COUNT=6
|
2018-09-13 20:02:16 +02:00
|
|
|
MIDX_HEADER_SIZE=12
|
|
|
|
|
MIDX_BYTE_CHUNK_ID=$MIDX_HEADER_SIZE
|
|
|
|
|
MIDX_BYTE_CHUNK_OFFSET=$(($MIDX_HEADER_SIZE + 4))
|
2018-09-13 20:02:18 +02:00
|
|
|
MIDX_NUM_CHUNKS=5
|
|
|
|
|
MIDX_CHUNK_LOOKUP_WIDTH=12
|
|
|
|
|
MIDX_OFFSET_PACKNAMES=$(($MIDX_HEADER_SIZE + \
|
|
|
|
|
$MIDX_NUM_CHUNKS * $MIDX_CHUNK_LOOKUP_WIDTH))
|
|
|
|
|
MIDX_BYTE_PACKNAME_ORDER=$(($MIDX_OFFSET_PACKNAMES + 2))
|
2018-09-13 20:02:20 +02:00
|
|
|
MIDX_OFFSET_OID_FANOUT=$(($MIDX_OFFSET_PACKNAMES + 652))
|
|
|
|
|
MIDX_OID_FANOUT_WIDTH=4
|
|
|
|
|
MIDX_BYTE_OID_FANOUT_ORDER=$((MIDX_OFFSET_OID_FANOUT + 250 * $MIDX_OID_FANOUT_WIDTH + 1))
|
2018-09-13 20:02:22 +02:00
|
|
|
MIDX_OFFSET_OID_LOOKUP=$(($MIDX_OFFSET_OID_FANOUT + 256 * $MIDX_OID_FANOUT_WIDTH))
|
|
|
|
|
MIDX_BYTE_OID_LOOKUP=$(($MIDX_OFFSET_OID_LOOKUP + 16 * $HASH_LEN))
|
2018-09-13 20:02:25 +02:00
|
|
|
MIDX_OFFSET_OBJECT_OFFSETS=$(($MIDX_OFFSET_OID_LOOKUP + $NUM_OBJECTS * $HASH_LEN))
|
|
|
|
|
MIDX_OFFSET_WIDTH=8
|
|
|
|
|
MIDX_BYTE_PACK_INT_ID=$(($MIDX_OFFSET_OBJECT_OFFSETS + 16 * $MIDX_OFFSET_WIDTH + 2))
|
|
|
|
|
MIDX_BYTE_OFFSET=$(($MIDX_OFFSET_OBJECT_OFFSETS + 16 * $MIDX_OFFSET_WIDTH + 6))
|
2018-09-13 20:02:15 +02:00
|
|
|
|
|
|
|
|
test_expect_success 'verify bad version' '
|
|
|
|
|
corrupt_midx_and_verify $MIDX_BYTE_VERSION "\00" $objdir \
|
|
|
|
|
"multi-pack-index version"
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'verify bad OID version' '
|
|
|
|
|
corrupt_midx_and_verify $MIDX_BYTE_OID_VERSION "\02" $objdir \
|
|
|
|
|
"hash version"
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'verify truncated chunk count' '
|
|
|
|
|
corrupt_midx_and_verify $MIDX_BYTE_CHUNK_COUNT "\01" $objdir \
|
|
|
|
|
"missing required"
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'verify extended chunk count' '
|
|
|
|
|
corrupt_midx_and_verify $MIDX_BYTE_CHUNK_COUNT "\07" $objdir \
|
|
|
|
|
"terminating multi-pack-index chunk id appears earlier than expected"
|
|
|
|
|
'
|
|
|
|
|
|
2018-09-13 20:02:16 +02:00
|
|
|
test_expect_success 'verify missing required chunk' '
|
|
|
|
|
corrupt_midx_and_verify $MIDX_BYTE_CHUNK_ID "\01" $objdir \
|
|
|
|
|
"missing required"
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'verify invalid chunk offset' '
|
|
|
|
|
corrupt_midx_and_verify $MIDX_BYTE_CHUNK_OFFSET "\01" $objdir \
|
|
|
|
|
"invalid chunk offset (too large)"
|
|
|
|
|
'
|
|
|
|
|
|
2018-09-13 20:02:18 +02:00
|
|
|
test_expect_success 'verify packnames out of order' '
|
|
|
|
|
corrupt_midx_and_verify $MIDX_BYTE_PACKNAME_ORDER "z" $objdir \
|
|
|
|
|
"pack names out of order"
|
|
|
|
|
'
|
|
|
|
|
|
2018-09-13 20:02:19 +02:00
|
|
|
test_expect_success 'verify packnames out of order' '
|
|
|
|
|
corrupt_midx_and_verify $MIDX_BYTE_PACKNAME_ORDER "a" $objdir \
|
|
|
|
|
"failed to load pack"
|
|
|
|
|
'
|
|
|
|
|
|
2018-09-13 20:02:20 +02:00
|
|
|
test_expect_success 'verify oid fanout out of order' '
|
|
|
|
|
corrupt_midx_and_verify $MIDX_BYTE_OID_FANOUT_ORDER "\01" $objdir \
|
|
|
|
|
"oid fanout out of order"
|
|
|
|
|
'
|
|
|
|
|
|
2018-09-13 20:02:22 +02:00
|
|
|
test_expect_success 'verify oid lookup out of order' '
|
|
|
|
|
corrupt_midx_and_verify $MIDX_BYTE_OID_LOOKUP "\00" $objdir \
|
|
|
|
|
"oid lookup out of order"
|
|
|
|
|
'
|
|
|
|
|
|
2018-09-13 20:02:25 +02:00
|
|
|
test_expect_success 'verify incorrect pack-int-id' '
|
|
|
|
|
corrupt_midx_and_verify $MIDX_BYTE_PACK_INT_ID "\07" $objdir \
|
|
|
|
|
"bad pack-int-id"
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'verify incorrect offset' '
|
|
|
|
|
corrupt_midx_and_verify $MIDX_BYTE_OFFSET "\07" $objdir \
|
|
|
|
|
"incorrect object offset"
|
|
|
|
|
'
|
|
|
|
|
|
2018-09-13 20:02:27 +02:00
|
|
|
test_expect_success 'git-fsck incorrect offset' '
|
|
|
|
|
corrupt_midx_and_verify $MIDX_BYTE_OFFSET "\07" $objdir \
|
|
|
|
|
"incorrect object offset" \
|
|
|
|
|
"git -c core.multipackindex=true fsck"
|
|
|
|
|
'
|
|
|
|
|
|
2018-07-12 21:39:40 +02:00
|
|
|
test_expect_success 'repack removes multi-pack-index' '
|
|
|
|
|
test_path_is_file $objdir/pack/multi-pack-index &&
|
2018-10-12 19:34:20 +02:00
|
|
|
GIT_TEST_MULTI_PACK_INDEX=0 git repack -adf &&
|
2018-07-12 21:39:40 +02:00
|
|
|
test_path_is_missing $objdir/pack/multi-pack-index
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
compare_results_with_midx "after repack"
|
|
|
|
|
|
2018-08-20 18:52:06 +02:00
|
|
|
test_expect_success 'multi-pack-index and pack-bitmap' '
|
|
|
|
|
git -c repack.writeBitmaps=true repack -ad &&
|
|
|
|
|
git multi-pack-index write &&
|
|
|
|
|
git rev-list --test-bitmap HEAD
|
|
|
|
|
'
|
|
|
|
|
|
2018-08-20 18:52:00 +02:00
|
|
|
test_expect_success 'multi-pack-index and alternates' '
|
|
|
|
|
git init --bare alt.git &&
|
|
|
|
|
echo $(pwd)/alt.git/objects >.git/objects/info/alternates &&
|
|
|
|
|
echo content1 >file1 &&
|
|
|
|
|
altblob=$(GIT_DIR=alt.git git hash-object -w file1) &&
|
|
|
|
|
git cat-file blob $altblob &&
|
|
|
|
|
git rev-list --all
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
compare_results_with_midx "with alternate (local midx)"
|
|
|
|
|
|
|
|
|
|
test_expect_success 'multi-pack-index in an alternate' '
|
2018-08-20 18:52:08 +02:00
|
|
|
mv .git/objects/pack/* alt.git/objects/pack &&
|
|
|
|
|
test_commit add_local_objects &&
|
|
|
|
|
git repack --local &&
|
|
|
|
|
git multi-pack-index write &&
|
|
|
|
|
midx_read_expect 1 3 4 $objdir &&
|
|
|
|
|
git reset --hard HEAD~1 &&
|
|
|
|
|
rm -f .git/objects/pack/*
|
2018-08-20 18:52:00 +02:00
|
|
|
'
|
|
|
|
|
|
|
|
|
|
compare_results_with_midx "with alternate (remote midx)"
|
|
|
|
|
|
2018-07-12 21:39:32 +02:00
|
|
|
# usage: corrupt_data <file> <pos> [<data>]
|
|
|
|
|
corrupt_data () {
|
|
|
|
|
file=$1
|
|
|
|
|
pos=$2
|
|
|
|
|
data="${3:-\0}"
|
|
|
|
|
printf "$data" | dd of="$file" bs=1 seek="$pos" conv=notrunc
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
# Force 64-bit offsets by manipulating the idx file.
|
|
|
|
|
# This makes the IDX file _incorrect_ so be careful to clean up after!
|
|
|
|
|
test_expect_success 'force some 64-bit offsets with pack-objects' '
|
|
|
|
|
mkdir objects64 &&
|
|
|
|
|
mkdir objects64/pack &&
|
|
|
|
|
for i in $(test_seq 1 11)
|
|
|
|
|
do
|
|
|
|
|
generate_objects 11
|
|
|
|
|
done &&
|
|
|
|
|
commit_and_list_objects &&
|
|
|
|
|
pack64=$(git pack-objects --index-version=2,0x40 objects64/pack/test-64 <obj-list) &&
|
|
|
|
|
idx64=objects64/pack/test-64-$pack64.idx &&
|
|
|
|
|
chmod u+w $idx64 &&
|
|
|
|
|
corrupt_data $idx64 2999 "\02" &&
|
|
|
|
|
midx64=$(git multi-pack-index --object-dir=objects64 write) &&
|
|
|
|
|
midx_read_expect 1 63 5 objects64 " large-offsets"
|
2018-07-12 21:39:24 +02:00
|
|
|
'
|
|
|
|
|
|
2018-09-13 20:02:13 +02:00
|
|
|
test_expect_success 'verify multi-pack-index with 64-bit offsets' '
|
|
|
|
|
git multi-pack-index verify --object-dir=objects64
|
|
|
|
|
'
|
|
|
|
|
|
2018-09-13 20:02:25 +02:00
|
|
|
NUM_OBJECTS=63
|
|
|
|
|
MIDX_OFFSET_OID_FANOUT=$((MIDX_OFFSET_PACKNAMES + 54))
|
|
|
|
|
MIDX_OFFSET_OID_LOOKUP=$((MIDX_OFFSET_OID_FANOUT + 256 * $MIDX_OID_FANOUT_WIDTH))
|
|
|
|
|
MIDX_OFFSET_OBJECT_OFFSETS=$(($MIDX_OFFSET_OID_LOOKUP + $NUM_OBJECTS * $HASH_LEN))
|
|
|
|
|
MIDX_OFFSET_LARGE_OFFSETS=$(($MIDX_OFFSET_OBJECT_OFFSETS + $NUM_OBJECTS * $MIDX_OFFSET_WIDTH))
|
|
|
|
|
MIDX_BYTE_LARGE_OFFSET=$(($MIDX_OFFSET_LARGE_OFFSETS + 3))
|
|
|
|
|
|
|
|
|
|
test_expect_success 'verify incorrect 64-bit offset' '
|
|
|
|
|
corrupt_midx_and_verify $MIDX_BYTE_LARGE_OFFSET "\07" objects64 \
|
|
|
|
|
"incorrect object offset"
|
|
|
|
|
'
|
|
|
|
|
|
2019-06-11 01:35:23 +02:00
|
|
|
test_expect_success 'setup expire tests' '
|
|
|
|
|
mkdir dup &&
|
|
|
|
|
(
|
|
|
|
|
cd dup &&
|
|
|
|
|
git init &&
|
|
|
|
|
test-tool genrandom "data" 4096 >large_file.txt &&
|
|
|
|
|
git update-index --add large_file.txt &&
|
|
|
|
|
for i in $(test_seq 1 20)
|
|
|
|
|
do
|
|
|
|
|
test_commit $i
|
|
|
|
|
done &&
|
|
|
|
|
git branch A HEAD &&
|
|
|
|
|
git branch B HEAD~8 &&
|
|
|
|
|
git branch C HEAD~13 &&
|
|
|
|
|
git branch D HEAD~16 &&
|
|
|
|
|
git branch E HEAD~18 &&
|
|
|
|
|
git pack-objects --revs .git/objects/pack/pack-A <<-EOF &&
|
|
|
|
|
refs/heads/A
|
|
|
|
|
^refs/heads/B
|
|
|
|
|
EOF
|
|
|
|
|
git pack-objects --revs .git/objects/pack/pack-B <<-EOF &&
|
|
|
|
|
refs/heads/B
|
|
|
|
|
^refs/heads/C
|
|
|
|
|
EOF
|
|
|
|
|
git pack-objects --revs .git/objects/pack/pack-C <<-EOF &&
|
|
|
|
|
refs/heads/C
|
|
|
|
|
^refs/heads/D
|
|
|
|
|
EOF
|
|
|
|
|
git pack-objects --revs .git/objects/pack/pack-D <<-EOF &&
|
|
|
|
|
refs/heads/D
|
|
|
|
|
^refs/heads/E
|
|
|
|
|
EOF
|
|
|
|
|
git pack-objects --revs .git/objects/pack/pack-E <<-EOF &&
|
|
|
|
|
refs/heads/E
|
|
|
|
|
EOF
|
2019-06-11 01:35:26 +02:00
|
|
|
git multi-pack-index write &&
|
|
|
|
|
cp -r .git/objects/pack .git/objects/pack-backup
|
2019-06-11 01:35:23 +02:00
|
|
|
)
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'expire does not remove any packs' '
|
|
|
|
|
(
|
|
|
|
|
cd dup &&
|
|
|
|
|
ls .git/objects/pack >expect &&
|
|
|
|
|
git multi-pack-index expire &&
|
|
|
|
|
ls .git/objects/pack >actual &&
|
|
|
|
|
test_cmp expect actual
|
|
|
|
|
)
|
|
|
|
|
'
|
|
|
|
|
|
2019-06-11 01:35:25 +02:00
|
|
|
test_expect_success 'expire removes unreferenced packs' '
|
|
|
|
|
(
|
|
|
|
|
cd dup &&
|
|
|
|
|
git pack-objects --revs .git/objects/pack/pack-combined <<-EOF &&
|
|
|
|
|
refs/heads/A
|
|
|
|
|
^refs/heads/C
|
|
|
|
|
EOF
|
|
|
|
|
git multi-pack-index write &&
|
|
|
|
|
ls .git/objects/pack | grep -v -e pack-[AB] >expect &&
|
|
|
|
|
git multi-pack-index expire &&
|
|
|
|
|
ls .git/objects/pack >actual &&
|
|
|
|
|
test_cmp expect actual &&
|
|
|
|
|
ls .git/objects/pack/ | grep idx >expect-idx &&
|
|
|
|
|
test-tool read-midx .git/objects | grep idx >actual-midx &&
|
|
|
|
|
test_cmp expect-idx actual-midx &&
|
|
|
|
|
git multi-pack-index verify &&
|
|
|
|
|
git fsck
|
|
|
|
|
)
|
|
|
|
|
'
|
|
|
|
|
|
2019-06-11 01:35:26 +02:00
|
|
|
test_expect_success 'repack with minimum size does not alter existing packs' '
|
|
|
|
|
(
|
|
|
|
|
cd dup &&
|
|
|
|
|
rm -rf .git/objects/pack &&
|
|
|
|
|
mv .git/objects/pack-backup .git/objects/pack &&
|
|
|
|
|
touch -m -t 201901010000 .git/objects/pack/pack-D* &&
|
|
|
|
|
touch -m -t 201901010001 .git/objects/pack/pack-C* &&
|
|
|
|
|
touch -m -t 201901010002 .git/objects/pack/pack-B* &&
|
|
|
|
|
touch -m -t 201901010003 .git/objects/pack/pack-A* &&
|
|
|
|
|
ls .git/objects/pack >expect &&
|
2019-07-01 15:16:19 +02:00
|
|
|
MINSIZE=$(test-tool path-utils file-size .git/objects/pack/*pack | sort -n | head -n 1) &&
|
2019-06-11 01:35:26 +02:00
|
|
|
git multi-pack-index repack --batch-size=$MINSIZE &&
|
|
|
|
|
ls .git/objects/pack >actual &&
|
|
|
|
|
test_cmp expect actual
|
|
|
|
|
)
|
|
|
|
|
'
|
|
|
|
|
|
midx: implement midx_repack()
To repack with a non-zero batch-size, first sort all pack-files by
their modified time. Second, walk those pack-files from oldest
to newest, compute their expected size, and add the packs to a list
if they are smaller than the given batch-size. Stop when the total
expected size is at least the batch size.
If the batch size is zero, select all packs in the multi-pack-index.
Finally, collect the objects from the multi-pack-index that are in
the selected packs and send them to 'git pack-objects'. Write a new
multi-pack-index that includes the new pack.
Using a batch size of zero is very similar to a standard 'git repack'
command, except that we do not delete the old packs and instead rely
on the new multi-pack-index to prevent new processes from reading the
old packs. This does not disrupt other Git processes that are currently
reading the old packs based on the old multi-pack-index.
While first designing a 'git multi-pack-index repack' operation, I
started by collecting the batches based on the actual size of the
objects instead of the size of the pack-files. This allows repacking
a large pack-file that has very few referencd objects. However, this
came at a significant cost of parsing pack-files instead of simply
reading the multi-pack-index and getting the file information for
the pack-files. The "expected size" version provides similar
behavior, but could skip a pack-file if the average object size is
much larger than the actual size of the referenced objects, or
can create a large pack if the actual size of the referenced objects
is larger than the expected size.
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2019-06-11 01:35:27 +02:00
|
|
|
test_expect_success 'repack creates a new pack' '
|
|
|
|
|
(
|
|
|
|
|
cd dup &&
|
|
|
|
|
ls .git/objects/pack/*idx >idx-list &&
|
|
|
|
|
test_line_count = 5 idx-list &&
|
2019-07-01 15:16:19 +02:00
|
|
|
THIRD_SMALLEST_SIZE=$(test-tool path-utils file-size .git/objects/pack/*pack | sort -n | head -n 3 | tail -n 1) &&
|
midx: implement midx_repack()
To repack with a non-zero batch-size, first sort all pack-files by
their modified time. Second, walk those pack-files from oldest
to newest, compute their expected size, and add the packs to a list
if they are smaller than the given batch-size. Stop when the total
expected size is at least the batch size.
If the batch size is zero, select all packs in the multi-pack-index.
Finally, collect the objects from the multi-pack-index that are in
the selected packs and send them to 'git pack-objects'. Write a new
multi-pack-index that includes the new pack.
Using a batch size of zero is very similar to a standard 'git repack'
command, except that we do not delete the old packs and instead rely
on the new multi-pack-index to prevent new processes from reading the
old packs. This does not disrupt other Git processes that are currently
reading the old packs based on the old multi-pack-index.
While first designing a 'git multi-pack-index repack' operation, I
started by collecting the batches based on the actual size of the
objects instead of the size of the pack-files. This allows repacking
a large pack-file that has very few referencd objects. However, this
came at a significant cost of parsing pack-files instead of simply
reading the multi-pack-index and getting the file information for
the pack-files. The "expected size" version provides similar
behavior, but could skip a pack-file if the average object size is
much larger than the actual size of the referenced objects, or
can create a large pack if the actual size of the referenced objects
is larger than the expected size.
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2019-06-11 01:35:27 +02:00
|
|
|
BATCH_SIZE=$(($THIRD_SMALLEST_SIZE + 1)) &&
|
|
|
|
|
git multi-pack-index repack --batch-size=$BATCH_SIZE &&
|
|
|
|
|
ls .git/objects/pack/*idx >idx-list &&
|
|
|
|
|
test_line_count = 6 idx-list &&
|
|
|
|
|
test-tool read-midx .git/objects | grep idx >midx-list &&
|
|
|
|
|
test_line_count = 6 midx-list
|
|
|
|
|
)
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'expire removes repacked packs' '
|
|
|
|
|
(
|
|
|
|
|
cd dup &&
|
|
|
|
|
ls -al .git/objects/pack/*pack &&
|
|
|
|
|
ls -S .git/objects/pack/*pack | head -n 4 >expect &&
|
|
|
|
|
git multi-pack-index expire &&
|
|
|
|
|
ls -S .git/objects/pack/*pack >actual &&
|
|
|
|
|
test_cmp expect actual &&
|
|
|
|
|
test-tool read-midx .git/objects | grep idx >midx-list &&
|
|
|
|
|
test_line_count = 4 midx-list
|
|
|
|
|
)
|
|
|
|
|
'
|
|
|
|
|
|
2019-06-11 01:35:27 +02:00
|
|
|
test_expect_success 'expire works when adding new packs' '
|
|
|
|
|
(
|
|
|
|
|
cd dup &&
|
|
|
|
|
git pack-objects --revs .git/objects/pack/pack-combined <<-EOF &&
|
|
|
|
|
refs/heads/A
|
|
|
|
|
^refs/heads/B
|
|
|
|
|
EOF
|
|
|
|
|
git pack-objects --revs .git/objects/pack/pack-combined <<-EOF &&
|
|
|
|
|
refs/heads/B
|
|
|
|
|
^refs/heads/C
|
|
|
|
|
EOF
|
|
|
|
|
git pack-objects --revs .git/objects/pack/pack-combined <<-EOF &&
|
|
|
|
|
refs/heads/C
|
|
|
|
|
^refs/heads/D
|
|
|
|
|
EOF
|
|
|
|
|
git multi-pack-index write &&
|
|
|
|
|
git pack-objects --revs .git/objects/pack/a-pack <<-EOF &&
|
|
|
|
|
refs/heads/D
|
|
|
|
|
^refs/heads/E
|
|
|
|
|
EOF
|
|
|
|
|
git multi-pack-index write &&
|
|
|
|
|
git pack-objects --revs .git/objects/pack/z-pack <<-EOF &&
|
|
|
|
|
refs/heads/E
|
|
|
|
|
EOF
|
|
|
|
|
git multi-pack-index expire &&
|
|
|
|
|
ls .git/objects/pack/ | grep idx >expect &&
|
|
|
|
|
test-tool read-midx .git/objects | grep idx >actual &&
|
|
|
|
|
test_cmp expect actual &&
|
|
|
|
|
git multi-pack-index verify
|
|
|
|
|
)
|
|
|
|
|
'
|
|
|
|
|
|
2019-06-11 01:35:28 +02:00
|
|
|
test_expect_success 'expire respects .keep files' '
|
|
|
|
|
(
|
|
|
|
|
cd dup &&
|
|
|
|
|
git pack-objects --revs .git/objects/pack/pack-all <<-EOF &&
|
|
|
|
|
refs/heads/A
|
|
|
|
|
EOF
|
|
|
|
|
git multi-pack-index write &&
|
|
|
|
|
PACKA=$(ls .git/objects/pack/a-pack*\.pack | sed s/\.pack\$//) &&
|
|
|
|
|
touch $PACKA.keep &&
|
|
|
|
|
git multi-pack-index expire &&
|
|
|
|
|
ls -S .git/objects/pack/a-pack* | grep $PACKA >a-pack-files &&
|
|
|
|
|
test_line_count = 3 a-pack-files &&
|
|
|
|
|
test-tool read-midx .git/objects | grep idx >midx-list &&
|
|
|
|
|
test_line_count = 2 midx-list
|
|
|
|
|
)
|
|
|
|
|
'
|
|
|
|
|
|
2019-06-11 01:35:29 +02:00
|
|
|
test_expect_success 'repack --batch-size=0 repacks everything' '
|
|
|
|
|
(
|
|
|
|
|
cd dup &&
|
|
|
|
|
rm .git/objects/pack/*.keep &&
|
|
|
|
|
ls .git/objects/pack/*idx >idx-list &&
|
|
|
|
|
test_line_count = 2 idx-list &&
|
|
|
|
|
git multi-pack-index repack --batch-size=0 &&
|
|
|
|
|
ls .git/objects/pack/*idx >idx-list &&
|
|
|
|
|
test_line_count = 3 idx-list &&
|
|
|
|
|
test-tool read-midx .git/objects | grep idx >midx-list &&
|
|
|
|
|
test_line_count = 3 midx-list &&
|
|
|
|
|
git multi-pack-index expire &&
|
|
|
|
|
ls -al .git/objects/pack/*idx >idx-list &&
|
|
|
|
|
test_line_count = 1 idx-list &&
|
|
|
|
|
git multi-pack-index repack --batch-size=0 &&
|
|
|
|
|
ls -al .git/objects/pack/*idx >new-idx-list &&
|
|
|
|
|
test_cmp idx-list new-idx-list
|
|
|
|
|
)
|
|
|
|
|
'
|
2019-06-11 01:35:28 +02:00
|
|
|
|
2018-07-12 21:39:21 +02:00
|
|
|
test_done
|