From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-4.3 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 534BC1F405 for ; Fri, 21 Dec 2018 16:28:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389234AbeLUQ2o (ORCPT ); Fri, 21 Dec 2018 11:28:44 -0500 Received: from mail-ed1-f68.google.com ([209.85.208.68]:42654 "EHLO mail-ed1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389175AbeLUQ2m (ORCPT ); Fri, 21 Dec 2018 11:28:42 -0500 Received: by mail-ed1-f68.google.com with SMTP id y20so5124808edw.9 for ; Fri, 21 Dec 2018 08:28:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:message-id:in-reply-to:references:from:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=iSf21XI43AhzflhPFTBEH9nJsZa3a4RTA6xFfK4DrLE=; b=p51PogmDAocmFEU9c0IU2uUl2cb77nw45hilQ4FgQBFeKjTNdkY+Z7wMfUcvx6blU1 hmvRVRp1GUirOpsLg13FC089TSJ7B2QDefFD/sA2EaVhsWe3dscmJH9L7Xnd7hqn4mnR MONzBBBbEpY7CJOdJ+RdCIkS0IL+CQ6MjnlWPhUk/VvbJuDHPV7Q5mQJJsfjrfi/jeCj Z52aio13kfRZUlSZt0wVfRVFoZyb6qHRbypZ6DeMHwvrt0OvneAihLzEwmFdQ4aG+H0Y XdZDi9RjRmKswPb1dho489Rl6yNI4SApzB9n0JbtqGNgN0VYDx9USjOQoXZtncE36Z3E dVyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:in-reply-to:references:from :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=iSf21XI43AhzflhPFTBEH9nJsZa3a4RTA6xFfK4DrLE=; b=udX3wdYAi78LSaZOKkNOkUa4zOQuG2LGPZXKBEnZGJ++eciU110GMRPiuBEJ0ls2xv P76zptNb52wzSpT9XLF6SJ6tV7OfYrKirMhbEXJL48/f3mFfKaIM8eZSgbGNXM4RCx5I hiopNIXLIw8s9pAAmZXlmccUub3zGr9m+xFPJaBGUkLcGof5jX1mnP+XZdTtsB3x2BI3 WOHi+VdsXC+HjgQ4cXovPaczZbmDdl3vTJEA5gfsTFhryKpj8n7h/rtiIGejBG7BNjwH lwC+uhXIqyxddS+doLtun9SnppUYd6h5SVQl2xBT4qd6x7HKLA4k9kRgf4wVSHhrFra1 TKiw== X-Gm-Message-State: AA+aEWYJAg3mCHZzxaRxvD8VPXev5okkyuD8nTnU4MyP/qSVXM6nfA5i tL35YozUUDRiHZvplesPzcbO3eZPtGNw8g== X-Google-Smtp-Source: AFSGD/Xreuz6sOtMjsYMRrZBqXVHry8QIr7w4l/Sm2CHP09/s99L9+JInu+12PwWFnPX1LOZTQAdEw== X-Received: by 2002:a50:924e:: with SMTP id j14mr2926810eda.142.1545409720021; Fri, 21 Dec 2018 08:28:40 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id o37sm6946057edc.32.2018.12.21.08.28.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 21 Dec 2018 08:28:39 -0800 (PST) Date: Fri, 21 Dec 2018 08:28:39 -0800 (PST) X-Google-Original-Date: Fri, 21 Dec 2018 16:28:32 GMT Message-Id: <2529afe89e7917b54b1d0f51a1a009f64fabaad7.1545409716.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Derrick Stolee via GitGitGadget" Subject: [PATCH v2 3/7] multi-pack-index: prepare for 'expire' subcommand Fcc: Sent Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MIME-Version: 1.0 To: git@vger.kernel.org Cc: sbeller@google.com, peff@peff.net, jrnieder@gmail.com, avarab@gmail.com, Junio C Hamano , Derrick Stolee Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Derrick Stolee The multi-pack-index tracks objects in a collection of pack-files. Only one copy of each object is indexed, using the modified time of the pack-files to determine tie-breakers. It is possible to have a pack-file with no referenced objects because all objects have a duplicate in a newer pack-file. Introduce a new 'expire' subcommand to the multi-pack-index builtin. This subcommand will delete these unused pack-files and rewrite the multi-pack-index to no longer refer to those files. More details about the specifics will follow as the method is implemented. Add a test that verifies the 'expire' subcommand is correctly wired, but will still be valid when the verb is implemented. Specifically, create a set of packs that should all have referenced objects and should not be removed during an 'expire' operation. Signed-off-by: Derrick Stolee --- Documentation/git-multi-pack-index.txt | 5 +++ builtin/multi-pack-index.c | 4 ++- midx.c | 5 +++ midx.h | 1 + t/t5319-multi-pack-index.sh | 47 ++++++++++++++++++++++++++ 5 files changed, 61 insertions(+), 1 deletion(-) diff --git a/Documentation/git-multi-pack-index.txt b/Documentation/git-multi-pack-index.txt index 1af406aca2..6186c4c936 100644 --- a/Documentation/git-multi-pack-index.txt +++ b/Documentation/git-multi-pack-index.txt @@ -31,6 +31,11 @@ write:: verify:: Verify the contents of the MIDX file. +expire:: + Delete the pack-files that are tracked by the MIDX file, but + have no objects referenced by the MIDX. Rewrite the MIDX file + afterward to remove all references to these pack-files. + EXAMPLES -------- diff --git a/builtin/multi-pack-index.c b/builtin/multi-pack-index.c index fca70f8e4f..145de3a46c 100644 --- a/builtin/multi-pack-index.c +++ b/builtin/multi-pack-index.c @@ -5,7 +5,7 @@ #include "midx.h" static char const * const builtin_multi_pack_index_usage[] = { - N_("git multi-pack-index [--object-dir=] (write|verify)"), + N_("git multi-pack-index [--object-dir=] (write|verify|expire)"), NULL }; @@ -44,6 +44,8 @@ int cmd_multi_pack_index(int argc, const char **argv, return write_midx_file(opts.object_dir); if (!strcmp(argv[0], "verify")) return verify_midx_file(opts.object_dir); + if (!strcmp(argv[0], "expire")) + return expire_midx_packs(opts.object_dir); die(_("unrecognized verb: %s"), argv[0]); } diff --git a/midx.c b/midx.c index 730ff84dff..bb825ef816 100644 --- a/midx.c +++ b/midx.c @@ -1025,3 +1025,8 @@ int verify_midx_file(const char *object_dir) return verify_midx_error; } + +int expire_midx_packs(const char *object_dir) +{ + return 0; +} diff --git a/midx.h b/midx.h index 774f652530..e3a2b740b5 100644 --- a/midx.h +++ b/midx.h @@ -49,6 +49,7 @@ int prepare_multi_pack_index_one(struct repository *r, const char *object_dir, i int write_midx_file(const char *object_dir); void clear_midx_file(struct repository *r); int verify_midx_file(const char *object_dir); +int expire_midx_packs(const char *object_dir); void close_midx(struct multi_pack_index *m); diff --git a/t/t5319-multi-pack-index.sh b/t/t5319-multi-pack-index.sh index 70926b5bc0..948effc1ee 100755 --- a/t/t5319-multi-pack-index.sh +++ b/t/t5319-multi-pack-index.sh @@ -348,4 +348,51 @@ test_expect_success 'verify incorrect 64-bit offset' ' "incorrect object offset" ' +test_expect_success 'setup expire tests' ' + mkdir dup && + ( + cd dup && + git init && + 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-E <<-EOF && + refs/heads/E + 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-C <<-EOF && + refs/heads/C + ^refs/heads/D + 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-A <<-EOF && + refs/heads/A + ^refs/heads/B + EOF + git multi-pack-index write + ) +' + +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 + ) +' + test_done -- gitgitgadget