On 10/15/2020 11:18 PM, Taylor Blau wrote: > On Thu, Oct 15, 2020 at 10:18:47PM -0400, Derrick Stolee wrote: >> On 10/15/2020 5:41 PM, Taylor Blau wrote: >>> So, we need to be more aggressively checking the Bloom filter settings >>> in any layer we want to reuse a Bloom filter out of before reusing it >>> verbatim in the current layer. The patch below the scissors line is >>> sufficient to do that, and it causes the third test to start passing. >> >> I think there are three things we should keep in mind: >> >> 1. Incompatible Bloom filter settings between layers should be seen >> as _inconsistent data_ as Git should not be writing incremental >> commit-graph files with inconsistent Bloom filter settings. Thus, >> when reading the commit-graph chain we should prevent incompatible >> filters from being used. One way to do this is to notice different >> settings and completely disable Bloom filters. The other way would >> be to take the settings from the first layer with filters and then >> clear the chunk_bloom_indexes and chunk_bloom_data fields for the >> layers that don't agree. This fits with an expectation that lower >> layers are larger, so more filters can be used in that situation. > > Sure; I'd be fine with only allowing filters computed with the settings > present in the lowest or largest layer in the event that multiple layers > exist with incompatible settings. > > I'm trying to point us towards a direction of not optimizing too far > along a direction that we're unlikely to take, while also trying to do > something relatively non-invasive to make it possible for a version of > Git to change the default Bloom settings. That is, if a user is writing > split commit-graphs, and we change the default Bloom settings, they > shouldn't have to recompute or merge down all of their Bloom filters. They would need to recompute when they merge layers, which introduces a big question about how we should handle such a case. > If that's something that we never think is going to happen, I'm fine > with not thinking too hard about it. But, I also don't want to paint > ourselves into a corner, so I think something like the patch I wrote in > the email that you're replying to actually may be worth pursuing > further. I dunno. Definitely after 2.29, though. I think the proposed "react properly to this unlikely situation" is a good way to prevent getting locked into our choices now. It makes it possible for "old" Git versions (2.30 until we decide to allow this mix) to interact with the inconsistent settings without failure. We don't need to do the 100% "optimal" case of using all filters in order to enable this choice in the future. [...] > For what it's worth, I was mainly talking about it to say that it would > be more effort than it's probably worth to do. There's also nothing that > we're currently discussing that would prevent us from taking that same > direction up in six months from now. Yes, I just want to make sure that everyone agrees there is a middle ground without saying that inconsistent filter settings across layers is a "fully supported" feature. If someone wants to tackle the work to make it a desirable state, then they can try that (with great care). Thanks, -Stolee
