pack-bitmap: convert khash_sha1 maps into kh_oid_map
All of the users of our khash_sha1 maps actually have a "struct object_id". Let's use the more descriptive type. 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
d2bc62b1fa7f2df247199ed88edff30875ee19bc
3 files changed
+12
-12
pack-bitmap-write.c
+7
-7
@@ -28,8 +28,8 @@ struct bitmap_writer {
28
struct ewah_bitmap *blobs;
29
struct ewah_bitmap *tags;
30
31
- khash_sha1 *bitmaps;
32
- khash_sha1 *reused;
31
+ kh_oid_map_t *bitmaps;
32
+ kh_oid_map_t *reused;
33
struct packing_data *to_pack;
34
35
struct bitmapped_commit *selected;
@@ -175,7 +175,7 @@ add_to_include_set(struct bitmap *base, struct commit *commit)
175
if (bitmap_get(base, bitmap_pos))
176
return 0;
177
178
- hash_pos = kh_get_sha1(writer.bitmaps, commit->object.oid.hash);
178
+ hash_pos = kh_get_oid_map(writer.bitmaps, commit->object.oid);
179
if (hash_pos < kh_end(writer.bitmaps)) {
180
struct bitmapped_commit *bc = kh_value(writer.bitmaps, hash_pos);
181
bitmap_or_ewah(base, bc->bitmap);
@@ -256,7 +256,7 @@ void bitmap_writer_build(struct packing_data *to_pack)
256
struct bitmap *base = bitmap_new();
257
struct rev_info revs;
258
259
- writer.bitmaps = kh_init_sha1();
259
+ writer.bitmaps = kh_init_oid_map();
260
writer.to_pack = to_pack;
261
262
if (writer.show_progress)
@@ -311,7 +311,7 @@ void bitmap_writer_build(struct packing_data *to_pack)
311
if (i >= reuse_after)
312
stored->flags |= BITMAP_FLAG_REUSE;
313
314
- hash_pos = kh_put_sha1(writer.bitmaps, object->oid.hash, &hash_ret);
314
+ hash_pos = kh_put_oid_map(writer.bitmaps, object->oid, &hash_ret);
315
if (hash_ret == 0)
316
die("Duplicate entry when writing index: %s",
317
oid_to_hex(&object->oid));
@@ -366,7 +366,7 @@ void bitmap_writer_reuse_bitmaps(struct packing_data *to_pack)
366
if (!(bitmap_git = prepare_bitmap_git(to_pack->repo)))
367
return;
368
369
- writer.reused = kh_init_sha1();
369
+ writer.reused = kh_init_oid_map();
370
rebuild_existing_bitmaps(bitmap_git, to_pack, writer.reused,
371
writer.show_progress);
372
/*
@@ -382,7 +382,7 @@ static struct ewah_bitmap *find_reused_bitmap(const struct object_id *oid)
382
if (!writer.reused)
383
return NULL;
384
385
- hash_pos = kh_get_sha1(writer.reused, oid->hash);
385
+ hash_pos = kh_get_oid_map(writer.reused, *oid);
386
if (hash_pos >= kh_end(writer.reused))
387
return NULL;
388
pack-bitmap.c
+4
-4
@@ -1041,7 +1041,7 @@ static int rebuild_bitmap(uint32_t *reposition,
1041
1042
int rebuild_existing_bitmaps(struct bitmap_index *bitmap_git,
1043
struct packing_data *mapping,
1044
- khash_sha1 *reused_bitmaps,
1044
+ kh_oid_map_t *reused_bitmaps,
1045
int show_progress)
1046
{
1047
uint32_t i, num_objects;
@@ -1080,9 +1080,9 @@ int rebuild_existing_bitmaps(struct bitmap_index *bitmap_git,
1080
if (!rebuild_bitmap(reposition,
1081
lookup_stored_bitmap(stored),
1082
rebuild)) {
1083
- hash_pos = kh_put_sha1(reused_bitmaps,
1084
- stored->oid.hash,
1085
- &hash_ret);
1083
+ hash_pos = kh_put_oid_map(reused_bitmaps,
1084
+ stored->oid,
1085
+ &hash_ret);
1086
kh_value(reused_bitmaps, hash_pos) =
1087
bitmap_to_ewah(rebuild);
1088
}
pack-bitmap.h
+1
-1
@@ -51,7 +51,7 @@ int reuse_partial_packfile_from_bitmap(struct bitmap_index *,
51
struct packed_git **packfile,
52
uint32_t *entries, off_t *up_to);
53
int rebuild_existing_bitmaps(struct bitmap_index *, struct packing_data *mapping,
54
- khash_sha1 *reused_bitmaps, int show_progress);
54
+ kh_oid_map_t *reused_bitmaps, int show_progress);
55
void free_bitmap_index(struct bitmap_index *);
56
57
/*