sha1-lookup: handle duplicate keys with GIT_USE_LOOKUP
The sha1_entry_pos function tries to be smart about
selecting the middle of a range for its binary search by
looking at the value differences between the "lo" and "hi"
constraints. However, it is unable to cope with entries with
duplicate keys in the sorted list.
We may hit a point in the search where both our "lo" and
"hi" point to the same key. In this case, the range of
values between our endpoints is 0, and trying to scale the
difference between our key and the endpoints over that range
is undefined (i.e., divide by zero). The current code
catches this with an "assert(lov < hiv)".
Moreover, after seeing that the first 20 byte of the key are
the same, we will try to establish a value from the 21st
byte. Which is nonsensical.
Instead, we can detect the case that we are in a run of
duplicates, and simply do a final comparison against any one
of them (since they are all the same, it does not matter
which). If the keys match, we have found our entry (or one
of them, anyway). If not, then we know that we do not need
to look further, as we must be in a run of the duplicate
key.
Signed-off-by: Jeff King <peff@peff.net>
Acked-by: Nicolas Pitre <nico@fluxnic.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-08-24 00:02:25 +00:00
|
|
|
#!/bin/sh
|
|
|
|
|
|
|
|
test_description='handling of duplicate objects in incoming packfiles'
|
|
|
|
. ./test-lib.sh
|
|
|
|
. "$TEST_DIRECTORY"/lib-pack.sh
|
|
|
|
|
|
|
|
# The sha1s we have in our pack. It's important that these have the same
|
|
|
|
# starting byte, so that they end up in the same fanout section of the index.
|
|
|
|
# That lets us make sure we are exercising the binary search with both sets.
|
|
|
|
LO_SHA1=e68fe8129b546b101aee9510c5328e7f21ca1d18
|
|
|
|
HI_SHA1=e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
|
|
|
|
|
|
|
|
# And here's a "missing sha1" which will produce failed lookups. It must also
|
|
|
|
# be in the same fanout section, and should be between the two (so that during
|
|
|
|
# our binary search, we are sure to end up looking at one or the other of the
|
|
|
|
# duplicate runs).
|
|
|
|
MISSING_SHA1='e69d000000000000000000000000000000000000'
|
|
|
|
|
|
|
|
# git will never intentionally create packfiles with
|
|
|
|
# duplicate objects, so we have to construct them by hand.
|
|
|
|
#
|
|
|
|
# $1 is the name of the packfile to create
|
|
|
|
#
|
|
|
|
# $2 is the number of times to duplicate each object
|
|
|
|
create_pack () {
|
|
|
|
pack_header "$((2 * $2))" >"$1" &&
|
|
|
|
for i in $(test_seq 1 "$2"); do
|
|
|
|
pack_obj $LO_SHA1 &&
|
|
|
|
pack_obj $HI_SHA1
|
|
|
|
done >>"$1" &&
|
|
|
|
pack_trailer "$1"
|
|
|
|
}
|
|
|
|
|
|
|
|
# double-check that create_pack actually works
|
|
|
|
test_expect_success 'pack with no duplicates' '
|
|
|
|
create_pack no-dups.pack 1 &&
|
|
|
|
git index-pack --stdin <no-dups.pack
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'index-pack will allow duplicate objects by default' '
|
|
|
|
clear_packs &&
|
|
|
|
create_pack dups.pack 100 &&
|
|
|
|
git index-pack --stdin <dups.pack
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'create batch-check test vectors' '
|
|
|
|
cat >input <<-EOF &&
|
|
|
|
$LO_SHA1
|
|
|
|
$HI_SHA1
|
|
|
|
$MISSING_SHA1
|
|
|
|
EOF
|
|
|
|
cat >expect <<-EOF
|
|
|
|
$LO_SHA1 blob 2
|
|
|
|
$HI_SHA1 blob 0
|
|
|
|
$MISSING_SHA1 missing
|
|
|
|
EOF
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'lookup in duplicated pack (binary search)' '
|
|
|
|
git cat-file --batch-check <input >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'lookup in duplicated pack (GIT_USE_LOOKUP)' '
|
|
|
|
(
|
|
|
|
GIT_USE_LOOKUP=1 &&
|
|
|
|
export GIT_USE_LOOKUP &&
|
|
|
|
git cat-file --batch-check <input >actual
|
|
|
|
) &&
|
|
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
|
2013-09-04 09:01:53 +00:00
|
|
|
test_expect_success 'index-pack can reject packs with duplicates' '
|
|
|
|
clear_packs &&
|
|
|
|
create_pack dups.pack 2 &&
|
|
|
|
test_must_fail git index-pack --strict --stdin <dups.pack &&
|
|
|
|
test_expect_code 1 git cat-file -e $LO_SHA1
|
|
|
|
'
|
|
|
|
|
sha1-lookup: handle duplicate keys with GIT_USE_LOOKUP
The sha1_entry_pos function tries to be smart about
selecting the middle of a range for its binary search by
looking at the value differences between the "lo" and "hi"
constraints. However, it is unable to cope with entries with
duplicate keys in the sorted list.
We may hit a point in the search where both our "lo" and
"hi" point to the same key. In this case, the range of
values between our endpoints is 0, and trying to scale the
difference between our key and the endpoints over that range
is undefined (i.e., divide by zero). The current code
catches this with an "assert(lov < hiv)".
Moreover, after seeing that the first 20 byte of the key are
the same, we will try to establish a value from the 21st
byte. Which is nonsensical.
Instead, we can detect the case that we are in a run of
duplicates, and simply do a final comparison against any one
of them (since they are all the same, it does not matter
which). If the keys match, we have found our entry (or one
of them, anyway). If not, then we know that we do not need
to look further, as we must be in a run of the duplicate
key.
Signed-off-by: Jeff King <peff@peff.net>
Acked-by: Nicolas Pitre <nico@fluxnic.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-08-24 00:02:25 +00:00
|
|
|
test_done
|