From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-2.8 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,T_RP_MATCHES_RCVD shortcircuit=no autolearn=no autolearn_force=no version=3.4.0 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 142B91F404 for ; Wed, 14 Mar 2018 19:28:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751892AbeCNT2A (ORCPT ); Wed, 14 Mar 2018 15:28:00 -0400 Received: from mail-qk0-f196.google.com ([209.85.220.196]:41734 "EHLO mail-qk0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751871AbeCNT14 (ORCPT ); Wed, 14 Mar 2018 15:27:56 -0400 Received: by mail-qk0-f196.google.com with SMTP id s78so4737669qkl.8 for ; Wed, 14 Mar 2018 12:27:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=9nZx5X0q9usVK4gB7Ks945sr6K346nc8sZvAE7O6h24=; b=TjPmVCKIq3yvIYp8JLIXKaYSKNQ55hch6K3ygHvxlrBGBIiazKmatRavJIyZ8qjjj8 U0b7jLSDbffEppab4M3a3kb35UhGeRlhD1UuYkrFThodOi7dc+Ddm3Zm/MO77Wd3YAo6 ZZ43ePADC1OLTxs0Z8uRVIpT48LJIVEL8lzB4SopZSTinWb4+00OCoBVC3jZCySCReuC L+PAe5OEZE5fOP9vj/yJFmET59jkGdeepM4aa9tm/XZHlHXyh0hdTCshmUgJaPhXLZVP SUMbZ9Fd42YHF18kScsStf0hE82DGLwqlca47V+UpKWwktGetyQlzuURW+lirFCXjajK FgBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=9nZx5X0q9usVK4gB7Ks945sr6K346nc8sZvAE7O6h24=; b=saXH0ffzxdfx6Q9mveclcLBtAgPhljHJWgKFjz1s15vvCnZIGcRCtQc4+MfAC3OBCG DwDsxcN1MteniXCr1ImCFip5qk941DtyMsrFGlF8CnzTSS1Ng6PZZ/yu7UphxztLSJC7 sWUL2y6p+7sPkUwO6RP8ULiM+P+IT+DYOhpUNmpN0qtp+dZ/fL+6VCIvTqbfvy9/dN4Y AAgJfK2EMVVr2Qy5kJO2IU0SoDe42Avxm5HE456CsBGmvCLlcAhdPI/tv/l03ZBNF1ik y0be6cs4t4Ot0obgFOzVyB51V7TyS7f2fnLjn4sJfh/olQ4r/PGlR9mm47CY2eYeXwvp JCDg== X-Gm-Message-State: AElRT7GU4Rhmy6Mi8+Aw2dHqSc8JWZFl2K1ljsEHONtoXJh+f8LEX0uV knRHywVd02f0WTE05IYriHCTzQpkGpY= X-Google-Smtp-Source: AG47ELsSVvC22lYz0R0TdBE0HFHlCtH2yoabYFo5Sk2KAAyG+rFbDhsUPnalO34X5+LAv0VH6FAINg== X-Received: by 10.55.217.77 with SMTP id u74mr8504263qki.148.1521055675826; Wed, 14 Mar 2018 12:27:55 -0700 (PDT) Received: from stolee-linux-2.corp.microsoft.com ([2001:4898:8010:0:eb4a:5dff:fe0f:730f]) by smtp.gmail.com with ESMTPSA id q30sm2847395qte.10.2018.03.14.12.27.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Mar 2018 12:27:55 -0700 (PDT) From: Derrick Stolee X-Google-Original-From: Derrick Stolee To: git@vger.kernel.org Cc: gitster@pobox.com, peff@peff.net, sbeller@google.com, szeder.dev@gmail.com, ramsay@ramsayjones.plus.com, git@jeffhostetler.com, Derrick Stolee Subject: [PATCH v6 03/14] commit-graph: add format document Date: Wed, 14 Mar 2018 15:27:25 -0400 Message-Id: <20180314192736.70602-4-dstolee@microsoft.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180314192736.70602-1-dstolee@microsoft.com> References: <1519698787-190494-1-git-send-email-dstolee@microsoft.com> <20180314192736.70602-1-dstolee@microsoft.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Derrick Stolee Add document specifying the binary format for commit graphs. This format allows for: * New versions. * New hash functions and hash lengths. * Optional extensions. Basic header information is followed by a binary table of contents into "chunks" that include: * An ordered list of commit object IDs. * A 256-entry fanout into that list of OIDs. * A list of metadata for the commits. * A list of "large edges" to enable octopus merges. The format automatically includes two parent positions for every commit. This favors speed over space, since using only one position per commit would cause an extra level of indirection for every merge commit. (Octopus merges suffer from this indirection, but they are very rare.) Signed-off-by: Derrick Stolee --- Documentation/technical/commit-graph-format.txt | 98 +++++++++++++++++++++++++ 1 file changed, 98 insertions(+) create mode 100644 Documentation/technical/commit-graph-format.txt diff --git a/Documentation/technical/commit-graph-format.txt b/Documentation/technical/commit-graph-format.txt new file mode 100644 index 0000000000..4402baa131 --- /dev/null +++ b/Documentation/technical/commit-graph-format.txt @@ -0,0 +1,98 @@ +Git commit graph format +======================= + +The Git commit graph stores a list of commit OIDs and some associated +metadata, including: + +- The generation number of the commit. Commits with no parents have + generation number 1; commits with parents have generation number + one more than the maximum generation number of its parents. We + reserve zero as special, and can be used to mark a generation + number invalid or as "not computed". + +- The root tree OID. + +- The commit date. + +- The parents of the commit, stored using positional references within + the graph file. + +These positional references are stored as 32-bit integers corresponding to +the array position withing the list of commit OIDs. We use the most-significant +bit for special purposes, so we can store at most (1 << 31) - 1 (around 2 +billion) commits. + +== Commit graph files have the following format: + +In order to allow extensions that add extra data to the graph, we organize +the body into "chunks" and provide a binary lookup table at the beginning +of the body. The header includes certain values, such as number of chunks +and hash type. + +All 4-byte numbers are in network order. + +HEADER: + + 4-byte signature: + The signature is: {'C', 'G', 'P', 'H'} + + 1-byte version number: + Currently, the only valid version is 1. + + 1-byte Hash Version (1 = SHA-1) + We infer the hash length (H) from this value. + + 1-byte number (C) of "chunks" + + 1-byte (reserved for later use) + Current clients should ignore this value. + +CHUNK LOOKUP: + + (C + 1) * 12 bytes listing the table of contents for the chunks: + First 4 bytes describe the chunk id. Value 0 is a terminating label. + Other 8 bytes provide the byte-offset in current file for chunk to + start. (Chunks are ordered contiguously in the file, so you can infer + the length using the next chunk position if necessary.) Each chunk + type appears at most once. + + The remaining data in the body is described one chunk at a time, and + these chunks may be given in any order. Chunks are required unless + otherwise specified. + +CHUNK DATA: + + OID Fanout (ID: {'O', 'I', 'D', 'F'}) (256 * 4 bytes) + The ith entry, F[i], stores the number of OIDs with first + byte at most i. Thus F[255] stores the total + number of commits (N). + + OID Lookup (ID: {'O', 'I', 'D', 'L'}) (N * H bytes) + The OIDs for all commits in the graph, sorted in ascending order. + + Commit Data (ID: {'C', 'G', 'E', 'T' }) (N * (H + 16) bytes) + * The first H bytes are for the OID of the root tree. + * The next 8 bytes are for the positions of the first two parents + of the ith commit. Stores value 0xffffffff if no parent in that + position. If there are more than two parents, the second value + has its most-significant bit on and the other bits store an array + position into the Large Edge List chunk. + * The next 8 bytes store the generation number of the commit and + the commit time in seconds since EPOCH. The generation number + uses the higher 30 bits of the first 4 bytes, while the commit + time uses the 32 bits of the second 4 bytes, along with the lowest + 2 bits of the lowest byte, storing the 33rd and 34th bit of the + commit time. + + Large Edge List (ID: {'E', 'D', 'G', 'E'}) [Optional] + This list of 4-byte values store the second through nth parents for + all octopus merges. The second parent value in the commit data stores + an array position within this list along with the most-significant bit + on. Starting at that array position, iterate through this list of commit + positions for the parents until reaching a value with the most-significant + bit on. The other bits correspond to the position of the last parent. + +TRAILER: + + H-byte HASH-checksum of all of the above. + -- 2.14.1