From: Derrick Stolee <derrickstolee@github.com>
To: Abhradeep Chakraborty via GitGitGadget <gitgitgadget@gmail.com>,
git@vger.kernel.org
Cc: Taylor Blau <me@ttaylorr.com>,
Kaartic Sivaram <kaartic.sivaraam@gmail.com>,
Abhradeep Chakraborty <chakrabortyabhradeep79@gmail.com>
Subject: Re: [PATCH v2 2/6] pack-bitmap-write.c: write lookup table extension
Date: Mon, 27 Jun 2022 10:35:25 -0400 [thread overview]
Message-ID: <560d1802-8565-04eb-9faf-0f821861d321@github.com> (raw)
In-Reply-To: <d118f1d45e6202925d4efd5435acdd08545bf132.1656249017.git.gitgitgadget@gmail.com>
On 6/26/2022 9:10 AM, Abhradeep Chakraborty via GitGitGadget wrote:
> From: Abhradeep Chakraborty <chakrabortyabhradeep79@gmail.com>
>
> The bitmap lookup table extension was documentated by an earlier
s/documentated/documented/
> change, but Git does not yet knowhow to write that extension.
s/knowhow/know how/
> +static int table_cmp(const void *_va, const void *_vb, void *commit_positions)
> +{
> + int8_t result = 0;
> + uint32_t *positions = (uint32_t *) commit_positions;
nit: drop the space between the cast and commit_positions.
> + uint32_t a = positions[*(uint32_t *)_va];
> + uint32_t b = positions[*(uint32_t *)_vb];
> +
> + if (a > b)
> + result = 1;
> + else if (a < b)
> + result = -1;
> + else
> + result = 0;
> +
> + return result;
> +}
Ok, here you are sorting by commit OID (indirectly by the order in the
[multi-]pack-index). I suppose that I misunderstood in the previous
patch, so that could use some more specific language, maybe.
> +static void write_lookup_table(struct hashfile *f,
> + uint64_t *offsets,
> + uint32_t *commit_positions)
> +{
> + uint32_t i;
> + uint32_t *table, *table_inv;
> +
> + ALLOC_ARRAY(table, writer.selected_nr);
> + ALLOC_ARRAY(table_inv, writer.selected_nr);
> +
> + for (i = 0; i < writer.selected_nr; i++)
> + table[i] = i;
> +
> + QSORT_S(table, writer.selected_nr, table_cmp, commit_positions);
At the end of this sort, table[j] = i means that the ith bitmap corresponds
to the jth bitmapped commit in lex order of OIDs.
> + for (i = 0; i < writer.selected_nr; i++)
> + table_inv[table[i]] = i;
And table_inv helps us discover that relationship (ith bitmap to jth commit
by j = table_inv[i]).
> + for (i = 0; i < writer.selected_nr; i++) {
> + struct bitmapped_commit *selected = &writer.selected[table[i]];
> + uint32_t xor_offset = selected->xor_offset;
Here, xor_offset is "number of bitmaps in relationship to the current bitmap"
> + hashwrite_be32(f, commit_positions[table[i]]);
> + hashwrite_be64(f, offsets[table[i]]);
> + hashwrite_be32(f, xor_offset ?
> + table_inv[table[i] - xor_offset]: 0xffffffff);
Which means that if "k = table[i] - xor_offset" that the xor base is the kth
bitmap. table_inv[k] gets us the position in this table of that bitmap's
commit.
(It's also strange to me that the offset is being _subtracted_, but I guess
the bitmap format requires the xor base to appear first so the offset does
not need to be a negative number ever.)
This last line is a bit complex.
uint32_t xor_offset = selected->xor_offset;
uint32_t xor_row = 0xffffffff;
if (xor_offset) {
uint32_t xor_order = table[i] - xor_offset;
xor_row = table_inf[xor_order];
}
...then we can "hashwrite_be32(f, xor_row);" when necessary. I'm not sure
that we need the "uint32_t xor_order" inside the "if (xor_offset)" block,
but splitting it helps add clarity to the multi-step computation.
> enum pack_bitmap_opts {
> - BITMAP_OPT_FULL_DAG = 1,
> - BITMAP_OPT_HASH_CACHE = 4,
> + BITMAP_OPT_FULL_DAG = 0x1,
> + BITMAP_OPT_HASH_CACHE = 0x4,
> + BITMAP_OPT_LOOKUP_TABLE = 0x10,
> };
Excellent.
Thanks,
-Stolee
next prev parent reply other threads:[~2022-06-27 14:36 UTC|newest]
Thread overview: 162+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-20 12:33 [PATCH 0/6] [GSoC] bitmap: integrate a lookup table extension to the bitmap format Abhradeep Chakraborty via GitGitGadget
2022-06-20 12:33 ` [PATCH 1/6] Documentation/technical: describe bitmap lookup table extension Abhradeep Chakraborty via GitGitGadget
2022-06-20 16:56 ` Derrick Stolee
2022-06-20 17:09 ` Taylor Blau
2022-06-21 8:31 ` Abhradeep Chakraborty
2022-06-22 16:26 ` Taylor Blau
2022-06-21 8:23 ` Abhradeep Chakraborty
2022-06-20 17:21 ` Taylor Blau
2022-06-21 9:22 ` Abhradeep Chakraborty
2022-06-22 16:29 ` Taylor Blau
2022-06-22 16:45 ` Abhradeep Chakraborty
2022-06-20 20:21 ` Derrick Stolee
2022-06-21 10:08 ` Abhradeep Chakraborty
2022-06-22 16:30 ` Taylor Blau
2022-06-20 12:33 ` [PATCH 2/6] pack-bitmap: prepare to read " Abhradeep Chakraborty via GitGitGadget
2022-06-20 20:49 ` Derrick Stolee
2022-06-21 10:28 ` Abhradeep Chakraborty
2022-06-20 22:06 ` Taylor Blau
2022-06-21 11:52 ` Abhradeep Chakraborty
2022-06-22 16:49 ` Taylor Blau
2022-06-22 17:18 ` Abhradeep Chakraborty
2022-06-22 21:34 ` Taylor Blau
2022-06-20 12:33 ` [PATCH 3/6] pack-bitmap-write.c: write " Abhradeep Chakraborty via GitGitGadget
2022-06-20 22:16 ` Taylor Blau
2022-06-21 12:50 ` Abhradeep Chakraborty
2022-06-22 16:51 ` Taylor Blau
2022-06-20 12:33 ` [PATCH 4/6] builtin/pack-objects.c: learn pack.writeBitmapLookupTable Taylor Blau via GitGitGadget
2022-06-20 22:18 ` Taylor Blau
2022-06-20 12:33 ` [PATCH 5/6] bitmap-commit-table: add tests for the bitmap lookup table Abhradeep Chakraborty via GitGitGadget
2022-06-22 16:54 ` Taylor Blau
2022-06-20 12:33 ` [PATCH 6/6] bitmap-lookup-table: add performance tests Abhradeep Chakraborty via GitGitGadget
2022-06-22 17:14 ` Taylor Blau
2022-06-26 13:10 ` [PATCH v2 0/6] [GSoC] bitmap: integrate a lookup table extension to the bitmap format Abhradeep Chakraborty via GitGitGadget
2022-06-26 13:10 ` [PATCH v2 1/6] Documentation/technical: describe bitmap lookup table extension Abhradeep Chakraborty via GitGitGadget
2022-06-27 14:18 ` Derrick Stolee
2022-06-27 15:48 ` Taylor Blau
2022-06-27 16:51 ` Abhradeep Chakraborty
2022-06-26 13:10 ` [PATCH v2 2/6] pack-bitmap-write.c: write " Abhradeep Chakraborty via GitGitGadget
2022-06-27 14:35 ` Derrick Stolee [this message]
2022-06-27 16:12 ` Taylor Blau
2022-06-27 17:10 ` Abhradeep Chakraborty
2022-06-27 16:05 ` Taylor Blau
2022-06-27 18:29 ` Abhradeep Chakraborty
2022-06-26 13:10 ` [PATCH v2 3/6] pack-bitmap-write: learn pack.writeBitmapLookupTable and add tests Abhradeep Chakraborty via GitGitGadget
2022-06-27 14:43 ` Derrick Stolee
2022-06-27 17:42 ` Abhradeep Chakraborty
2022-06-27 17:49 ` Taylor Blau
2022-06-27 17:47 ` Taylor Blau
2022-06-27 18:39 ` Abhradeep Chakraborty
2022-06-29 20:11 ` Taylor Blau
2022-06-26 13:10 ` [PATCH v2 4/6] pack-bitmap: prepare to read lookup table extension Abhradeep Chakraborty via GitGitGadget
2022-06-27 15:12 ` Derrick Stolee
2022-06-27 18:06 ` [PATCH v2 4/6] pack-bitmap: prepare to read lookup table Abhradeep Chakraborty
2022-06-27 18:32 ` Derrick Stolee
2022-06-27 21:49 ` [PATCH v2 4/6] pack-bitmap: prepare to read lookup table extension Taylor Blau
2022-06-28 8:59 ` [PATCH v2 4/6] pack-bitmap: prepare to read lookup table Abhradeep Chakraborty
2022-06-29 20:22 ` Taylor Blau
2022-06-30 6:58 ` [PATCH v2 4/6] pack-bitmap: prepare to read lookup table extension Abhradeep Chakraborty
2022-06-27 21:38 ` Taylor Blau
2022-06-28 19:25 ` Abhradeep Chakraborty
2022-06-29 20:37 ` Taylor Blau
2022-06-29 20:41 ` Taylor Blau
2022-06-30 8:35 ` Abhradeep Chakraborty
2022-06-26 13:10 ` [PATCH v2 5/6] bitmap-lookup-table: add performance tests for lookup table Abhradeep Chakraborty via GitGitGadget
2022-06-27 21:53 ` Taylor Blau
2022-06-28 7:58 ` Abhradeep Chakraborty
2022-06-29 20:40 ` Taylor Blau
2022-06-26 13:10 ` [PATCH v2 6/6] p5310-pack-bitmaps.sh: enable pack.writeReverseIndex for testing Abhradeep Chakraborty via GitGitGadget
2022-06-27 21:50 ` Taylor Blau
2022-06-28 8:01 ` Abhradeep Chakraborty
2022-07-04 8:46 ` [PATCH v3 0/6] [GSoC] bitmap: integrate a lookup table extension to the bitmap format Abhradeep Chakraborty via GitGitGadget
2022-07-04 8:46 ` [PATCH v3 1/6] Documentation/technical: describe bitmap lookup table extension Abhradeep Chakraborty via GitGitGadget
2022-07-08 16:38 ` Philip Oakley
2022-07-09 7:53 ` Abhradeep Chakraborty
2022-07-10 15:01 ` Philip Oakley
2022-07-14 23:15 ` Taylor Blau
2022-07-15 10:36 ` Philip Oakley
2022-07-15 18:48 ` Abhradeep Chakraborty
2022-07-04 8:46 ` [PATCH v3 2/6] pack-bitmap-write.c: write " Abhradeep Chakraborty via GitGitGadget
2022-07-14 23:26 ` Taylor Blau
2022-07-15 2:22 ` Taylor Blau
2022-07-15 15:58 ` Abhradeep Chakraborty
2022-07-15 22:15 ` Taylor Blau
2022-07-16 11:50 ` Abhradeep Chakraborty
2022-07-26 0:34 ` Taylor Blau
2022-07-18 8:59 ` Martin Ågren
2022-07-04 8:46 ` [PATCH v3 3/6] pack-bitmap-write: learn pack.writeBitmapLookupTable and add tests Abhradeep Chakraborty via GitGitGadget
2022-07-04 8:46 ` [PATCH v3 4/6] pack-bitmap: prepare to read lookup table extension Abhradeep Chakraborty via GitGitGadget
2022-07-15 2:46 ` Taylor Blau
2022-07-15 16:38 ` Abhradeep Chakraborty
2022-07-15 22:20 ` Taylor Blau
2022-07-18 9:06 ` Martin Ågren
2022-07-18 19:25 ` Abhradeep Chakraborty
2022-07-18 23:26 ` Martin Ågren
2022-07-26 0:45 ` Taylor Blau
2022-07-04 8:46 ` [PATCH v3 5/6] bitmap-lookup-table: add performance tests for lookup table Abhradeep Chakraborty via GitGitGadget
2022-07-15 2:53 ` Taylor Blau
2022-07-15 18:23 ` Abhradeep Chakraborty
2022-07-04 8:46 ` [PATCH v3 6/6] p5310-pack-bitmaps.sh: remove pack.writeReverseIndex Abhradeep Chakraborty via GitGitGadget
2022-07-04 16:35 ` [PATCH v3 0/6] [GSoC] bitmap: integrate a lookup table extension to the bitmap format Abhradeep Chakraborty
2022-07-06 19:21 ` Junio C Hamano
2022-07-07 8:48 ` Abhradeep Chakraborty
2022-07-07 18:09 ` Kaartic Sivaraam
2022-07-07 18:42 ` Abhradeep Chakraborty
2022-07-20 14:05 ` [PATCH v4 " Abhradeep Chakraborty via GitGitGadget
2022-07-20 14:05 ` [PATCH v4 1/6] Documentation/technical: describe bitmap lookup table extension Abhradeep Chakraborty via GitGitGadget
2022-07-20 14:05 ` [PATCH v4 2/6] pack-bitmap-write.c: write " Abhradeep Chakraborty via GitGitGadget
2022-07-20 14:05 ` [PATCH v4 3/6] pack-bitmap-write: learn pack.writeBitmapLookupTable and add tests Abhradeep Chakraborty via GitGitGadget
2022-07-20 14:05 ` [PATCH v4 4/6] pack-bitmap: prepare to read lookup table extension Abhradeep Chakraborty via GitGitGadget
2022-07-20 14:05 ` [PATCH v4 5/6] p5310-pack-bitmaps.sh: enable `pack.writeReverseIndex` Abhradeep Chakraborty via GitGitGadget
2022-07-20 14:05 ` [PATCH v4 6/6] bitmap-lookup-table: add performance tests for lookup table Abhradeep Chakraborty via GitGitGadget
2022-07-20 18:38 ` [PATCH v5 0/6] [GSoC] bitmap: integrate a lookup table extension to the bitmap format Abhradeep Chakraborty via GitGitGadget
2022-07-20 18:38 ` [PATCH v5 1/6] Documentation/technical: describe bitmap lookup table extension Abhradeep Chakraborty via GitGitGadget
2022-07-20 18:38 ` [PATCH v5 2/6] pack-bitmap-write.c: write " Abhradeep Chakraborty via GitGitGadget
2022-07-26 0:52 ` Taylor Blau
2022-07-26 18:22 ` Abhradeep Chakraborty
2022-07-20 18:38 ` [PATCH v5 3/6] pack-bitmap-write: learn pack.writeBitmapLookupTable and add tests Abhradeep Chakraborty via GitGitGadget
2022-07-28 19:22 ` Johannes Schindelin
2022-08-02 12:40 ` Abhradeep Chakraborty
2022-08-02 15:35 ` Johannes Schindelin
2022-08-02 17:44 ` Abhradeep Chakraborty
2022-08-08 13:06 ` Johannes Schindelin
2022-08-08 13:58 ` Abhradeep Chakraborty
2022-08-09 9:03 ` Johannes Schindelin
2022-08-09 12:03 ` Abhradeep Chakraborty
2022-08-09 12:07 ` Abhradeep Chakraborty
2022-08-10 9:09 ` Johannes Schindelin
2022-08-10 9:20 ` Johannes Schindelin
2022-08-10 10:04 ` Abhradeep Chakraborty
2022-08-10 17:51 ` Derrick Stolee
2022-08-12 18:51 ` Abhradeep Chakraborty
2022-08-12 19:22 ` Derrick Stolee
2022-08-13 10:59 ` Abhradeep Chakraborty
2022-08-16 21:57 ` Taylor Blau
2022-08-17 10:02 ` Abhradeep Chakraborty
2022-08-17 20:38 ` Taylor Blau
2022-08-19 21:49 ` Taylor Blau
2022-08-13 11:05 ` Abhradeep Chakraborty
2022-08-16 18:47 ` Taylor Blau
2022-07-20 18:38 ` [PATCH v5 4/6] pack-bitmap: prepare to read lookup table extension Abhradeep Chakraborty via GitGitGadget
2022-07-26 1:13 ` Taylor Blau
2022-07-26 18:56 ` Abhradeep Chakraborty
2022-07-26 19:36 ` Eric Sunshine
2022-07-20 18:38 ` [PATCH v5 5/6] p5310-pack-bitmaps.sh: enable `pack.writeReverseIndex` Abhradeep Chakraborty via GitGitGadget
2022-07-26 1:18 ` Taylor Blau
2022-07-26 7:15 ` Ævar Arnfjörð Bjarmason
2022-07-26 13:32 ` Derrick Stolee
2022-07-26 13:54 ` Ævar Arnfjörð Bjarmason
2022-07-26 18:17 ` Abhradeep Chakraborty
2022-07-20 18:38 ` [PATCH v5 6/6] bitmap-lookup-table: add performance tests for lookup table Abhradeep Chakraborty via GitGitGadget
2022-08-14 16:55 ` [PATCH v6 0/6] [GSoC] bitmap: integrate a lookup table extension to the bitmap format Abhradeep Chakraborty via GitGitGadget
2022-08-14 16:55 ` [PATCH v6 1/6] Documentation/technical: describe bitmap lookup table extension Abhradeep Chakraborty via GitGitGadget
2022-08-14 16:55 ` [PATCH v6 2/6] bitmap: move `get commit positions` code to `bitmap_writer_finish` Abhradeep Chakraborty via GitGitGadget
2022-08-14 16:55 ` [PATCH v6 3/6] pack-bitmap-write.c: write lookup table extension Abhradeep Chakraborty via GitGitGadget
2022-08-14 16:55 ` [PATCH v6 4/6] pack-bitmap-write: learn pack.writeBitmapLookupTable and add tests Abhradeep Chakraborty via GitGitGadget
2022-08-14 16:55 ` [PATCH v6 5/6] pack-bitmap: prepare to read lookup table extension Abhradeep Chakraborty via GitGitGadget
2022-08-14 16:55 ` [PATCH v6 6/6] bitmap-lookup-table: add performance tests for lookup table Abhradeep Chakraborty via GitGitGadget
2022-08-19 21:21 ` [PATCH v6 0/6] [GSoC] bitmap: integrate a lookup table extension to the bitmap format Junio C Hamano
2022-08-22 14:42 ` Johannes Schindelin
2022-08-22 14:48 ` Taylor Blau
2022-08-25 22:16 ` Taylor Blau
2022-08-26 16:02 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=560d1802-8565-04eb-9faf-0f821861d321@github.com \
--to=derrickstolee@github.com \
--cc=chakrabortyabhradeep79@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=kaartic.sivaraam@gmail.com \
--cc=me@ttaylorr.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).