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>

diff --git a/pack-bitmap-write.c b/pack-bitmap-write.c
index 0637378533eae2fe10c70fa6b91327a5193004b3..fa78a460c9aa5dd3b0c89960a23b7a410fca83d9 100644 (file)
--- a/pack-bitmap-write.c
+++ b/pack-bitmap-write.c
@@ -28,8 +28,8 @@ struct bitmap_writer {
        struct ewah_bitmap *blobs;
        struct ewah_bitmap *tags;
 
        struct ewah_bitmap *blobs;
        struct ewah_bitmap *tags;
 

-       khash_sha1 *bitmaps;
-       khash_sha1 *reused;
+       kh_oid_map_t *bitmaps;
+       kh_oid_map_t *reused;

        struct packing_data *to_pack;
 
        struct bitmapped_commit *selected;
        struct packing_data *to_pack;
 
        struct bitmapped_commit *selected;


@@ -175,7 +175,7 @@ add_to_include_set(struct bitmap *base, struct commit *commit)
        if (bitmap_get(base, bitmap_pos))
                return 0;
 
        if (bitmap_get(base, bitmap_pos))
                return 0;
 

-       hash_pos = kh_get_sha1(writer.bitmaps, commit->object.oid.hash);
+       hash_pos = kh_get_oid_map(writer.bitmaps, commit->object.oid);

        if (hash_pos < kh_end(writer.bitmaps)) {
                struct bitmapped_commit *bc = kh_value(writer.bitmaps, hash_pos);
                bitmap_or_ewah(base, bc->bitmap);
        if (hash_pos < kh_end(writer.bitmaps)) {
                struct bitmapped_commit *bc = kh_value(writer.bitmaps, hash_pos);
                bitmap_or_ewah(base, bc->bitmap);


@@ -256,7 +256,7 @@ void bitmap_writer_build(struct packing_data *to_pack)
        struct bitmap *base = bitmap_new();
        struct rev_info revs;
 
        struct bitmap *base = bitmap_new();
        struct rev_info revs;
 

-       writer.bitmaps = kh_init_sha1();
+       writer.bitmaps = kh_init_oid_map();

        writer.to_pack = to_pack;
 
        if (writer.show_progress)
        writer.to_pack = to_pack;
 
        if (writer.show_progress)


@@ -311,7 +311,7 @@ void bitmap_writer_build(struct packing_data *to_pack)
                if (i >= reuse_after)
                        stored->flags |= BITMAP_FLAG_REUSE;
 
                if (i >= reuse_after)
                        stored->flags |= BITMAP_FLAG_REUSE;
 

-               hash_pos = kh_put_sha1(writer.bitmaps, object->oid.hash, &hash_ret);
+               hash_pos = kh_put_oid_map(writer.bitmaps, object->oid, &hash_ret);

                if (hash_ret == 0)
                        die("Duplicate entry when writing index: %s",
                            oid_to_hex(&object->oid));
                if (hash_ret == 0)
                        die("Duplicate entry when writing index: %s",
                            oid_to_hex(&object->oid));


@@ -366,7 +366,7 @@ void bitmap_writer_reuse_bitmaps(struct packing_data *to_pack)
        if (!(bitmap_git = prepare_bitmap_git(to_pack->repo)))
                return;
 
        if (!(bitmap_git = prepare_bitmap_git(to_pack->repo)))
                return;
 

-       writer.reused = kh_init_sha1();
+       writer.reused = kh_init_oid_map();

        rebuild_existing_bitmaps(bitmap_git, to_pack, writer.reused,
                                 writer.show_progress);
        /*
        rebuild_existing_bitmaps(bitmap_git, to_pack, writer.reused,
                                 writer.show_progress);
        /*


@@ -382,7 +382,7 @@ static struct ewah_bitmap *find_reused_bitmap(const struct object_id *oid)
        if (!writer.reused)
                return NULL;
 
        if (!writer.reused)
                return NULL;
 

-       hash_pos = kh_get_sha1(writer.reused, oid->hash);
+       hash_pos = kh_get_oid_map(writer.reused, *oid);

        if (hash_pos >= kh_end(writer.reused))
                return NULL;
 
        if (hash_pos >= kh_end(writer.reused))
                return NULL;
 

diff --git a/pack-bitmap.c b/pack-bitmap.c
index 998133588ff60b4ee60e55fe87dd63d3a2459c71..ed2befaac6535f25602fca57374d27d058277426 100644 (file)
--- a/pack-bitmap.c
+++ b/pack-bitmap.c
@@ -1041,7 +1041,7 @@ static int rebuild_bitmap(uint32_t *reposition,
 
 int rebuild_existing_bitmaps(struct bitmap_index *bitmap_git,
                             struct packing_data *mapping,
 
 int rebuild_existing_bitmaps(struct bitmap_index *bitmap_git,
                             struct packing_data *mapping,

-                            khash_sha1 *reused_bitmaps,
+                            kh_oid_map_t *reused_bitmaps,

                             int show_progress)
 {
        uint32_t i, num_objects;
                             int show_progress)
 {
        uint32_t i, num_objects;


@@ -1080,9 +1080,9 @@ int rebuild_existing_bitmaps(struct bitmap_index *bitmap_git,
                        if (!rebuild_bitmap(reposition,
                                            lookup_stored_bitmap(stored),
                                            rebuild)) {
                        if (!rebuild_bitmap(reposition,
                                            lookup_stored_bitmap(stored),
                                            rebuild)) {

-                               hash_pos = kh_put_sha1(reused_bitmaps,
-                                                      stored->oid.hash,
-                                                      &hash_ret);
+                               hash_pos = kh_put_oid_map(reused_bitmaps,
+                                                         stored->oid,
+                                                         &hash_ret);

                                kh_value(reused_bitmaps, hash_pos) =
                                        bitmap_to_ewah(rebuild);
                        }
                                kh_value(reused_bitmaps, hash_pos) =
                                        bitmap_to_ewah(rebuild);
                        }

diff --git a/pack-bitmap.h b/pack-bitmap.h
index ee9792264c84c43b75fc4e8ffb66dd8c6e88bf1c..00de3ec8e41d88b972ea28387930ad4342a2defe 100644 (file)
--- a/pack-bitmap.h
+++ b/pack-bitmap.h
@@ -51,7 +51,7 @@ int reuse_partial_packfile_from_bitmap(struct bitmap_index *,
                                       struct packed_git **packfile,
                                       uint32_t *entries, off_t *up_to);
 int rebuild_existing_bitmaps(struct bitmap_index *, struct packing_data *mapping,
                                       struct packed_git **packfile,
                                       uint32_t *entries, off_t *up_to);
 int rebuild_existing_bitmaps(struct bitmap_index *, struct packing_data *mapping,

-                            khash_sha1 *reused_bitmaps, int show_progress);
+                            kh_oid_map_t *reused_bitmaps, int show_progress);

 void free_bitmap_index(struct bitmap_index *);
 
 /*
 void free_bitmap_index(struct bitmap_index *);
 
 /*