@matheusbsbs / matheus-bagliano / commits / 8fbb558af4

khash: rename kh_oid_t to kh_oid_set

khash lets us define a hash as either a map or a set (i.e., with no "value" type). For the oid maps we define, "oid" is the set and "oid_map" is the map. As the bug in the previous commit shows, it's easy to pick the wrong one. So let's make the names more distinct: "oid_set" and "oid_map". An alternative naming scheme would be to actually name the type after the key/value types. So e.g., "oid" _would_ be the set, since it has no value type. And "oid_map" would become "oid_void" or similar (and "oid_pos" becomes "oid_int"). That's better in some ways: it's more regular, and a given map type can be more reasily reused in multiple contexts (e.g., something storing an "int" that isn't a "pos"). But it's also slightly less descriptive. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jeff King committed Jun 20, 2019 at 03:41 UTC 8fbb558af4e911a9507295809a4d1d7d6687b6e1

3 files changed +9 -9

khash.h

+1 -1

@@ -342,7 +342,7 @@ static inline int oid_equal(struct object_id a, struct object_id b)

342 return oideq(&a, &b);

343 }

344

345 -KHASH_INIT(oid, struct object_id, int, 0, oid_hash, oid_equal)

345 +KHASH_INIT(oid_set, struct object_id, int, 0, oid_hash, oid_equal)

346

347 KHASH_INIT(oid_map, struct object_id, void *, 1, oid_hash, oid_equal)

348

oidset.c

+6 -6

@@ -5,33 +5,33 @@ void oidset_init(struct oidset *set, size_t initial_size)

5 {

6 memset(&set->set, 0, sizeof(set->set));

7 if (initial_size)

8 - kh_resize_oid(&set->set, initial_size);

8 + kh_resize_oid_set(&set->set, initial_size);

9 }

11 int oidset_contains(const struct oidset *set, const struct object_id *oid)

12 {

13 - khiter_t pos = kh_get_oid(&set->set, *oid);

13 + khiter_t pos = kh_get_oid_set(&set->set, *oid);

14 return pos != kh_end(&set->set);

15 }

17 int oidset_insert(struct oidset *set, const struct object_id *oid)

18 {

19 int added;

20 - kh_put_oid(&set->set, *oid, &added);

20 + kh_put_oid_set(&set->set, *oid, &added);

21 return !added;

22 }

24 int oidset_remove(struct oidset *set, const struct object_id *oid)

25 {

26 - khiter_t pos = kh_get_oid(&set->set, *oid);

26 + khiter_t pos = kh_get_oid_set(&set->set, *oid);

27 if (pos == kh_end(&set->set))

28 return 0;

29 - kh_del_oid(&set->set, pos);

29 + kh_del_oid_set(&set->set, pos);

30 return 1;

31 }

33 void oidset_clear(struct oidset *set)

34 {

35 - kh_release_oid(&set->set);

35 + kh_release_oid_set(&set->set);

36 oidset_init(set, 0);

37 }

oidset.h

+2 -2

@@ -20,7 +20,7 @@

20 * A single oidset; should be zero-initialized (or use OIDSET_INIT).

21 */

22 struct oidset {

23 - kh_oid_t set;

23 + kh_oid_set_t set;

24 };

26 #define OIDSET_INIT { { 0 } }

@@ -62,7 +62,7 @@ int oidset_remove(struct oidset *set, const struct object_id *oid);

62 void oidset_clear(struct oidset *set);

64 struct oidset_iter {

65 - kh_oid_t *set;

65 + kh_oid_set_t *set;

66 khiter_t iter;

67 };