mirror of
https://github.com/git/git.git
synced 2024-09-08 03:50:44 +02:00
ewah: bitmap_equals_ewah()
Prepare to reuse existing pseudo-merge bitmaps by implementing a `bitmap_equals_ewah()` helper. This helper will be used to see if a raw bitmap (containing the set of parents for some pseudo-merge) is equal to any existing pseudo-merge's commits bitmap (which are stored as EWAH-compressed bitmaps on disk). Signed-off-by: Taylor Blau <me@ttaylorr.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
25163f50a2
commit
94c1addf86
@ -261,6 +261,25 @@ int bitmap_equals(struct bitmap *self, struct bitmap *other)
|
||||
return 1;
|
||||
}
|
||||
|
||||
int bitmap_equals_ewah(struct bitmap *self, struct ewah_bitmap *other)
|
||||
{
|
||||
struct ewah_iterator it;
|
||||
eword_t word;
|
||||
size_t i = 0;
|
||||
|
||||
ewah_iterator_init(&it, other);
|
||||
|
||||
while (ewah_iterator_next(&word, &it))
|
||||
if (word != (i < self->word_alloc ? self->words[i++] : 0))
|
||||
return 0;
|
||||
|
||||
for (; i < self->word_alloc; i++)
|
||||
if (self->words[i])
|
||||
return 0;
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
int bitmap_is_subset(struct bitmap *self, struct bitmap *other)
|
||||
{
|
||||
size_t common_size, i;
|
||||
|
@ -179,6 +179,7 @@ void bitmap_unset(struct bitmap *self, size_t pos);
|
||||
int bitmap_get(struct bitmap *self, size_t pos);
|
||||
void bitmap_free(struct bitmap *self);
|
||||
int bitmap_equals(struct bitmap *self, struct bitmap *other);
|
||||
int bitmap_equals_ewah(struct bitmap *self, struct ewah_bitmap *other);
|
||||
|
||||
/*
|
||||
* Both `bitmap_is_subset()` and `ewah_bitmap_is_subset()` return 1 if the set
|
||||
|
Loading…
Reference in New Issue
Block a user