From: Derrick Stolee Date: Tue, 23 Aug 2022 16:22:51 GMT Subject: Re: [PATCH v2 7/7] midx.c: avoid adding preferred objects twice Message-ID: <98b4d348-e162-29f0-85e2-e36a9a500792@github.com> In-Reply-To: <887ab9485faa21f5a5cd889d97895ed41013803d.1661197803.git.me@ttaylorr.com> On 8/22/2022 3:50 PM, Taylor Blau wrote: > The last commit changes the behavior of midx.c's `get_sorted_objects()` > function to handle the case of writing a MIDX bitmap while reusing an > existing MIDX and changing the identity of the preferred pack > separately. > > As part of this change, all objects from the (new) preferred pack are > added to the fanout table in a separate pass. Since these copies of the > objects all have their preferred bits set, any duplicates will be > resolved in their favor. > > Importantly, this includes any copies of those same objects that come > from the existing MIDX. We know at the time of adding them that they'll > be redundant if their source pack is the (new) preferred one, so we can > avoid adding them to the list in this case. Good call to reduce memory requirements. > @@ -605,6 +606,15 @@ static void midx_fanout_add_midx_fanout(struct midx_fanout *fanout, > end = ntohl(m->chunk_oid_fanout[cur_fanout]); > > for (cur_object = start; cur_object < end; cur_object++) { > + if ((preferred_pack > -1) && > + (preferred_pack == nth_midxed_pack_int_id(m, cur_object))) { nit: you don't need the extra parentheses here. Thanks, -Stolee