mirror of
https://github.com/git/git.git
synced 2024-12-11 10:54:21 +08:00
12c4b4ce75
We provide oid_array_for_each_unique() for iterating over the
de-duplicated items in an array. But it's awkward to use for two
reasons:
1. It uses a callback, which means marshaling arguments into a struct
and passing it to the callback with a void parameter.
2. The callback doesn't know the numeric index of the oid we're
looking at. This is useful for things like progress meters.
Iterating with a for-loop is much more natural for some cases, but the
caller has to do the de-duping itself. However, we can provide a small
helper to make this easier (see the docstring in the header for an
example use).
The caller does have to remember to sort the array first. We could add
an assertion into the helper that array->sorted is set, but I didn't
want to complicate what is otherwise a pretty fast code path.
I also considered adding a full iterator type with init/next/end
functions (similar to what we have for hashmaps). But it ended up making
the callers much harder to read. This version keeps us close to a basic
for-loop.
Yet another option would be adding an option to sort the array and
compact out the duplicates. This would mean iterating over the array an
extra time, though that's probably not a big deal (we did just do an
O(n log n) sort). But we'd still have to write a for-loop to iterate, so
it doesn't really make anything easier for the caller.
No new test, since we'll convert the callback iterator (which is covered
by t0064, among other callers) to use the new code.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
94 lines
1.8 KiB
C
94 lines
1.8 KiB
C
#include "cache.h"
|
|
#include "oid-array.h"
|
|
#include "sha1-lookup.h"
|
|
|
|
void oid_array_append(struct oid_array *array, const struct object_id *oid)
|
|
{
|
|
ALLOC_GROW(array->oid, array->nr + 1, array->alloc);
|
|
oidcpy(&array->oid[array->nr++], oid);
|
|
array->sorted = 0;
|
|
}
|
|
|
|
static int void_hashcmp(const void *a, const void *b)
|
|
{
|
|
return oidcmp(a, b);
|
|
}
|
|
|
|
void oid_array_sort(struct oid_array *array)
|
|
{
|
|
if (array->sorted)
|
|
return;
|
|
QSORT(array->oid, array->nr, void_hashcmp);
|
|
array->sorted = 1;
|
|
}
|
|
|
|
static const unsigned char *sha1_access(size_t index, void *table)
|
|
{
|
|
struct object_id *array = table;
|
|
return array[index].hash;
|
|
}
|
|
|
|
int oid_array_lookup(struct oid_array *array, const struct object_id *oid)
|
|
{
|
|
oid_array_sort(array);
|
|
return sha1_pos(oid->hash, array->oid, array->nr, sha1_access);
|
|
}
|
|
|
|
void oid_array_clear(struct oid_array *array)
|
|
{
|
|
FREE_AND_NULL(array->oid);
|
|
array->nr = 0;
|
|
array->alloc = 0;
|
|
array->sorted = 0;
|
|
}
|
|
|
|
|
|
int oid_array_for_each(struct oid_array *array,
|
|
for_each_oid_fn fn,
|
|
void *data)
|
|
{
|
|
size_t i;
|
|
|
|
/* No oid_array_sort() here! See oid-array.h */
|
|
|
|
for (i = 0; i < array->nr; i++) {
|
|
int ret = fn(array->oid + i, data);
|
|
if (ret)
|
|
return ret;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
int oid_array_for_each_unique(struct oid_array *array,
|
|
for_each_oid_fn fn,
|
|
void *data)
|
|
{
|
|
size_t i;
|
|
|
|
oid_array_sort(array);
|
|
|
|
for (i = 0; i < array->nr; i = oid_array_next_unique(array, i)) {
|
|
int ret = fn(array->oid + i, data);
|
|
if (ret)
|
|
return ret;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
void oid_array_filter(struct oid_array *array,
|
|
for_each_oid_fn want,
|
|
void *cb_data)
|
|
{
|
|
size_t nr = array->nr, src, dst;
|
|
struct object_id *oids = array->oid;
|
|
|
|
for (src = dst = 0; src < nr; src++) {
|
|
if (want(&oids[src], cb_data)) {
|
|
if (src != dst)
|
|
oidcpy(&oids[dst], &oids[src]);
|
|
dst++;
|
|
}
|
|
}
|
|
array->nr = dst;
|
|
}
|