From patchwork Mon Mar 10 01:50:47 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Derrick Stolee X-Patchwork-Id: 14009163 Received: from mail-ej1-f42.google.com (mail-ej1-f42.google.com [209.85.218.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 47425190072 for ; Mon, 10 Mar 2025 01:51:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741571465; cv=none; b=jBApAuITldpFKnLuym7LeyjYesSzpUJZKyTLkxVHKBowIHSPkbanoNxcNukQmgQPlrsa/Yrub7lH/x04NGlu+bGeoFkA+LMxY0RhvI+GAhIotCjSEJatC94c+J4643tHfAP3Ls6JBi2Ss9LxiIIur1iIEEZFgCRRzmFvcKY9sek= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741571465; c=relaxed/simple; bh=WeMsGrdA+tHyBg+QAW4h7vx2nuFyX4trCZPwPuU2A4w=; h=Message-Id:In-Reply-To:References:From:Date:Subject:Content-Type: MIME-Version:To:Cc; b=d0mFoS4smo1T9tvlT3pWZUk4uDQ1Oq7VV+hVASUFQx+fby5zM0Db+F+zTbxjAXZlkrnSGYEcOpHwq9WBMxkvi29Nrcx9a9ps3312QPB0oLD3E9SlHM3fPvy9No0wYf2fAmqwXC7+m4jYi9UMcEF5APBZsajfwiFRzttZp0JR0tI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Nw6pTRw7; arc=none smtp.client-ip=209.85.218.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Nw6pTRw7" Received: by mail-ej1-f42.google.com with SMTP id a640c23a62f3a-ac28e66c0e1so111537666b.0 for ; Sun, 09 Mar 2025 18:51:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741571461; x=1742176261; darn=vger.kernel.org; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=Y9ZkmjrkmxKR+WQjvcEiVQvRmhlxfu/7JqSPd6aglJg=; b=Nw6pTRw7S/4/PlTJzgFqFDkpXdGxnycndf3UrFe53acyzB2oMFM5V6tJ33OMNFHigf snIRYBPt4jpSZBLBXWeLkTyyxtE7dDTOwXy3EXyfJfZyyiT/ncfHfCwA5WI9yUbco4Dk OWSvR1p6DtFocn71z4i4n393SYVzBKE/M19s4GgDXgfV9LYyXZ6BFqUadDjf6WxQu0SZ lf+9yQn9PnD+2mWihyjnTww0695VmGjgGp9uWf+7StzTyHq/BdZ2ZolYh6E6v3LDOIo8 H7F3z+4joyU0bNjc/EMiVT00MvIlPshajg/++IoGibEycZ9DLnc1pCDsGAtb6ZaqP86k 5D7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741571461; x=1742176261; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Y9ZkmjrkmxKR+WQjvcEiVQvRmhlxfu/7JqSPd6aglJg=; b=tF/Qu3g70GPIu78kAd42hJwVKf8xDuVBnPVea6isA3sTMaoeJnKvn2Q6+k8ypd8FEc v1IulxPI5w0puNQYxtZ1NoDKVNzUz6tdeHhtR/QMLbe4QORp1u2hUuwW6VllJkpov8Vf PdGQpWCNJF7junLCmOdsGauXqaQpZDrssPhTi6V8gR0K2Llxe4UACm/I+VuIh+GuXYZM UNkGcm1Ij4ENczVfZz9WlyT70LD/oJr0PZGiJ0fTL62ILUTj33/ddjjNcznkF6rYTBqB doNGjbN/0yA0xEybvMCuUgrWnrC0ozQmHCr9owg2A5vBnoCGT/eZhvg8wHCSRF9tccvC ab0w== X-Gm-Message-State: AOJu0Yzeejk7I71KE8xd8Y7OS3ZP8Z6zEypUENto4z78ASoP3VypALPM WrS0tjll9a0oyqXPYpKXo2o0UrrPh1yG5VR38iZh3BKHqCvrMrzhys/1JQ== X-Gm-Gg: ASbGncvQhb7Wa6BDg1LtGp7tH3PgT2KnlbFBPRDad2wyjKIt3yoOvWcdzSsoKJ38x2a ctMkcw+dudYtpKm2ncbkHXWDuDcmdgdnUoy29pkHVPQjylhkyTO4BUBDjjsJr8VS6LQ59F6QzkL HY3NhYuwRIS2r0WPUl3JoLjM8FT9hx9gbw5GSC+5bo6RaRwMi1QQPSFowTWXWyPez8IapkAFpFB U56N0nsRqVHQ/TWMCf2uQcVMNRszhN5UjccP20plCuFGUVL1JdmPPKK3mNmrpTm0FjSNwVamIQs z04gV+mzr3Gg1rUHqe/wRqEmYyDOGZExchqa4aUlwEORNxPkzGAtGHxE X-Google-Smtp-Source: AGHT+IEzidmGDLTrDhv0uMGP9o7QcZw/gZTtsoNNenETKiQ1eiASn9npnzNWazoN3dci1/cYCq0ttA== X-Received: by 2002:a17:906:f593:b0:ab7:8d23:1fef with SMTP id a640c23a62f3a-ac252747e39mr1385082366b.9.1741571460479; Sun, 09 Mar 2025 18:51:00 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ac287653c7esm235965966b.84.2025.03.09.18.50.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 Mar 2025 18:51:00 -0700 (PDT) Message-Id: <4bfd438b5fa3c08ae639f8b4d1daf7a5f2d3514d.1741571455.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Mon, 10 Mar 2025 01:50:47 +0000 Subject: [PATCH 05/13] pack-objects: introduce GIT_TEST_PACK_PATH_WALK Fcc: Sent Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 To: git@vger.kernel.org Cc: christian.couder@gmail.com, gitster@pobox.com, johannes.schindelin@gmx.de, johncai86@gmail.com, jonathantanmy@google.com, karthik.188@gmail.com, kristofferhaugsbakk@fastmail.com, me@ttaylorr.com, newren@gmail.com, peff@peff.net, ps@pks.im, Derrick Stolee , Derrick Stolee From: Derrick Stolee From: Derrick Stolee There are many tests that validate whether 'git pack-objects' works as expected. Instead of duplicating these tests, add a new test environment variable, GIT_TEST_PACK_PATH_WALK, that implies --path-walk by default when specified. This was useful in testing the implementation of the --path-walk implementation, especially in conjunction with test such as: - t0411-clone-from-partial.sh : One test fetches from a repo that does not have the boundary objects. This causes the path-based walk to fail. Disable the variable for this test. - t5306-pack-nobase.sh : Similar to t0411, one test fetches from a repo without a boundary object. - t5310-pack-bitmaps.sh : One test compares the case when packing with bitmaps to the case when packing without them. Since we disable the test variable when writing bitmaps, this causes a difference in the object list (the --path-walk option adds an extra object). Specify --no-path-walk in both processes for the comparison. Another test checks for a specific delta base, but when computing dynamically without using bitmaps, the base object it too small to be considered in the delta calculations so no base is used. - t5316-pack-delta-depth.sh : This script cares about certain delta choices and their chain lengths. The --path-walk option changes how these chains are selected, and thus changes the results of this test. - t5322-pack-objects-sparse.sh : This demonstrates the effectiveness of the --sparse option and how it combines with --path-walk. - t5332-multi-pack-reuse.sh : This test verifies that the preferred pack is used for delta reuse when possible. The --path-walk option is not currently aware of the preferred pack at all, so finds a different delta base. - t7406-submodule-update.sh : When using the variable, the --depth option collides with the --path-walk feature, resulting in a warning message. Disable the variable so this warning does not appear. I want to call out one specific test change that is only temporary: - t5530-upload-pack-error.sh : One test cares specifically about an "unable to read" error message. Since the current implementation performs delta calculations within the path-walk API callback, a different "unable to get size" error message appears. When this is changed in a future refactoring, this test change can be reverted. Similar to GIT_TEST_NAME_HASH_VERSION, we do not add this option to the linux-TEST-vars CI build as that's already an overloaded build. Signed-off-by: Derrick Stolee --- builtin/pack-objects.c | 12 ++++++++++-- t/README | 4 ++++ t/t0411-clone-from-partial.sh | 6 ++++++ t/t5306-pack-nobase.sh | 5 +++++ t/t5310-pack-bitmaps.sh | 13 +++++++++++-- t/t5316-pack-delta-depth.sh | 9 ++++++--- t/t5332-multi-pack-reuse.sh | 7 +++++++ t/t5530-upload-pack-error.sh | 6 ++++++ t/t7406-submodule-update.sh | 3 +++ 9 files changed, 58 insertions(+), 7 deletions(-) diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index fe23db3c5d8..120202b05e9 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -226,7 +226,7 @@ static int delta_search_threads; static int pack_to_stdout; static int sparse; static int thin; -static int path_walk; +static int path_walk = -1; static int num_preferred_base; static struct progress *progress_state; @@ -4227,7 +4227,7 @@ static int add_objects_by_path(const char *path, struct object_id *oid = &oids->oid[i]; /* Skip objects that do not exist locally. */ - if (exclude_promisor_objects && + if ((exclude_promisor_objects || arg_missing_action != MA_ERROR) && oid_object_info_extended(the_repository, oid, &oi, OBJECT_INFO_FOR_PREFETCH) < 0) continue; @@ -4645,6 +4645,14 @@ int cmd_pack_objects(int argc, if (pack_to_stdout != !base_name || argc) usage_with_options(pack_usage, pack_objects_options); + if (path_walk < 0) { + if (use_bitmap_index > 0 || + !use_internal_rev_list) + path_walk = 0; + else + path_walk = git_env_bool("GIT_TEST_PACK_PATH_WALK", 0); + } + if (depth < 0) depth = 0; if (depth >= (1 << OE_DEPTH_BITS)) { diff --git a/t/README b/t/README index 53e5b4a7107..ae06e628815 100644 --- a/t/README +++ b/t/README @@ -415,6 +415,10 @@ GIT_TEST_PACK_SPARSE= if disabled will default the pack-objects builtin to use the non-sparse object walk. This can still be overridden by the --sparse command-line argument. +GIT_TEST_PACK_PATH_WALK= if enabled will default the pack-objects +builtin to use the path-walk API for the object walk. This can still be +overridden by the --no-path-walk command-line argument. + GIT_TEST_PRELOAD_INDEX= exercises the preload-index code path by overriding the minimum number of cache entries required per thread. diff --git a/t/t0411-clone-from-partial.sh b/t/t0411-clone-from-partial.sh index 196fc617843..9e6bca56255 100755 --- a/t/t0411-clone-from-partial.sh +++ b/t/t0411-clone-from-partial.sh @@ -59,6 +59,12 @@ test_expect_success 'pack-objects should fetch from promisor remote and execute test_expect_success 'clone from promisor remote does not lazy-fetch by default' ' rm -f script-executed && + + # The --path-walk feature of "git pack-objects" is not + # compatible with this kind of fetch from an incomplete repo. + GIT_TEST_PACK_PATH_WALK=0 && + export GIT_TEST_PACK_PATH_WALK && + test_must_fail git clone evil no-lazy 2>err && test_grep "lazy fetching disabled" err && test_path_is_missing script-executed diff --git a/t/t5306-pack-nobase.sh b/t/t5306-pack-nobase.sh index 805d60ff317..609399d54fb 100755 --- a/t/t5306-pack-nobase.sh +++ b/t/t5306-pack-nobase.sh @@ -59,6 +59,11 @@ test_expect_success 'indirectly clone patch_clone' ' git pull ../.git && test $(git rev-parse HEAD) = $B && + # The --path-walk feature of "git pack-objects" is not + # compatible with this kind of fetch from an incomplete repo. + GIT_TEST_PACK_PATH_WALK=0 && + export GIT_TEST_PACK_PATH_WALK && + git pull ../patch_clone/.git && test $(git rev-parse HEAD) = $C ) diff --git a/t/t5310-pack-bitmaps.sh b/t/t5310-pack-bitmaps.sh index 621bbbdd26e..e01df807a62 100755 --- a/t/t5310-pack-bitmaps.sh +++ b/t/t5310-pack-bitmaps.sh @@ -158,8 +158,9 @@ test_bitmap_cases () { ls .git/objects/pack/ | grep bitmap >output && test_line_count = 1 output && # verify equivalent packs are generated with/without using bitmap index - packasha1=$(git pack-objects --no-use-bitmap-index --all packa packa.objects && list_packed_objects packb-$packbsha1.idx >packb.objects && test_cmp packa.objects packb.objects @@ -388,6 +389,14 @@ test_bitmap_cases () { git init --bare client.git && ( cd client.git && + + # This test relies on reusing a delta, but if the + # path-walk machinery is engaged, the base object + # is considered too small to use during the + # dynamic computation, so is not used. + GIT_TEST_PACK_PATH_WALK=0 && + export GIT_TEST_PACK_PATH_WALK && + git config transfer.unpackLimit 1 && git fetch .. delta-reuse-old:delta-reuse-old && git fetch .. delta-reuse-new:delta-reuse-new && diff --git a/t/t5316-pack-delta-depth.sh b/t/t5316-pack-delta-depth.sh index 32cf4227451..167c3a35234 100755 --- a/t/t5316-pack-delta-depth.sh +++ b/t/t5316-pack-delta-depth.sh @@ -89,15 +89,18 @@ max_chain() { # adjusted (or scrapped if the heuristics have become too unreliable) test_expect_success 'packing produces a long delta' ' # Use --window=0 to make sure we are seeing reused deltas, - # not computing a new long chain. - pack=$(git pack-objects --all --window=0 expect && max_chain pack-$pack.pack >actual && test_cmp expect actual ' test_expect_success '--depth limits depth' ' - pack=$(git pack-objects --all --depth=5 expect && max_chain pack-$pack.pack >actual && test_cmp expect actual diff --git a/t/t5332-multi-pack-reuse.sh b/t/t5332-multi-pack-reuse.sh index 57cad7708f8..395d09444ce 100755 --- a/t/t5332-multi-pack-reuse.sh +++ b/t/t5332-multi-pack-reuse.sh @@ -7,6 +7,13 @@ test_description='pack-objects multi-pack reuse' GIT_TEST_MULTI_PACK_INDEX=0 GIT_TEST_MULTI_PACK_INDEX_WRITE_INCREMENTAL=0 + +# The --path-walk option does not consider the preferred pack +# at all for reusing deltas, so this variable changes the +# behavior of this test, if enabled. +GIT_TEST_PACK_PATH_WALK=0 +export GIT_TEST_PACK_PATH_WALK + objdir=.git/objects packdir=$objdir/pack diff --git a/t/t5530-upload-pack-error.sh b/t/t5530-upload-pack-error.sh index 558eedf25a4..8eb6fea839a 100755 --- a/t/t5530-upload-pack-error.sh +++ b/t/t5530-upload-pack-error.sh @@ -34,6 +34,12 @@ test_expect_success 'upload-pack fails due to error in pack-objects packing' ' hexsz=$(test_oid hexsz) && printf "%04xwant %s\n00000009done\n0000" \ $(($hexsz + 10)) $head >input && + + # The current implementation of path-walk causes a different + # error message. This will be changed by a future refactoring. + GIT_TEST_PACK_PATH_WALK=0 && + export GIT_TEST_PACK_PATH_WALK && + test_must_fail git upload-pack . /dev/null 2>output.err && test_grep "unable to read" output.err && test_grep "pack-objects died" output.err diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh index c562bad042a..ab76d4b6dc4 100755 --- a/t/t7406-submodule-update.sh +++ b/t/t7406-submodule-update.sh @@ -1095,12 +1095,15 @@ test_expect_success 'submodule update --quiet passes quietness to fetch with a s (cd super5 && # This test var can mess with the stderr output checked in this test. GIT_TEST_NAME_HASH_VERSION=1 \ + GIT_TEST_PACK_PATH_WALK=0 \ git submodule update --quiet --init --depth=1 submodule3 >out 2>err && test_must_be_empty out && test_must_be_empty err ) && git clone super4 super6 && (cd super6 && + # This test variable will create a "warning" message to stderr + GIT_TEST_PACK_PATH_WALK=0 \ git submodule update --init --depth=1 submodule3 >out 2>err && test_file_not_empty out && test_file_not_empty err