midx: read pack names into array

Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/midx.c b/midx.c
index ca7a32bf9565961ac30e40d7c772aa54028cd06d..fcdf6553cea3120492d7a3ff02563c55b8a784fb 100644 (file)
--- a/midx.c
+++ b/midx.c
@@ -37,6 +37,7 @@ struct multi_pack_index *load_multi_pack_index(const char *object_dir)
        uint32_t hash_version;
        char *midx_name = get_midx_filename(object_dir);
        uint32_t i;
        uint32_t hash_version;
        char *midx_name = get_midx_filename(object_dir);
        uint32_t i;

+       const char *cur_pack_name;

 
        fd = git_open(midx_name);
 
 
        fd = git_open(midx_name);
 


@@ -115,6 +116,22 @@ struct multi_pack_index *load_multi_pack_index(const char *object_dir)
        if (!m->chunk_pack_names)
                die(_("multi-pack-index missing required pack-name chunk"));
 
        if (!m->chunk_pack_names)
                die(_("multi-pack-index missing required pack-name chunk"));
 

+       m->pack_names = xcalloc(m->num_packs, sizeof(*m->pack_names));
+
+       cur_pack_name = (const char *)m->chunk_pack_names;
+       for (i = 0; i < m->num_packs; i++) {
+               m->pack_names[i] = cur_pack_name;
+
+               cur_pack_name += strlen(cur_pack_name) + 1;
+
+               if (i && strcmp(m->pack_names[i], m->pack_names[i - 1]) <= 0) {
+                       error(_("multi-pack-index pack names out of order: '%s' before '%s'"),
+                             m->pack_names[i - 1],
+                             m->pack_names[i]);
+                       goto cleanup_fail;
+               }
+       }
+

        return m;
 
 cleanup_fail:
        return m;
 
 cleanup_fail:

diff --git a/midx.h b/midx.h
index 38af01fa3beac9a4a5fa04ef2e32552e9da6c75a..17b56172e3cc4c075d74e0814a45e9517284550c 100644 (file)
--- a/midx.h
+++ b/midx.h
@@ -16,6 +16,7 @@ struct multi_pack_index {
 
        const unsigned char *chunk_pack_names;
 
 
        const unsigned char *chunk_pack_names;
 

+       const char **pack_names;

        char object_dir[FLEX_ARRAY];
 };
 
        char object_dir[FLEX_ARRAY];
 };
 

diff --git a/t/helper/test-read-midx.c b/t/helper/test-read-midx.c
index 3f2d2cfa7807cdd6220711885687fd63175c8233..76a60d78828307b20040ebeedb97fb4b642f2c81 100644 (file)
--- a/t/helper/test-read-midx.c
+++ b/t/helper/test-read-midx.c
@@ -6,6 +6,7 @@
 
 static int read_midx_file(const char *object_dir)
 {
 
 static int read_midx_file(const char *object_dir)
 {

+       uint32_t i;

        struct multi_pack_index *m = load_multi_pack_index(object_dir);
 
        if (!m)
        struct multi_pack_index *m = load_multi_pack_index(object_dir);
 
        if (!m)


@@ -24,6 +25,10 @@ static int read_midx_file(const char *object_dir)
 
        printf("\n");
 
 
        printf("\n");
 

+       printf("packs:\n");
+       for (i = 0; i < m->num_packs; i++)
+               printf("%s\n", m->pack_names[i]);
+

        printf("object-dir: %s\n", m->object_dir);
 
        return 0;
        printf("object-dir: %s\n", m->object_dir);
 
        return 0;

diff --git a/t/t5319-multi-pack-index.sh b/t/t5319-multi-pack-index.sh
index 7512d55c927ed9f8039c2147ea18ccc2d6ec44bf..e8da082c64fa496728e62a32b0e24d37fc145488 100755 (executable)
--- a/t/t5319-multi-pack-index.sh
+++ b/t/t5319-multi-pack-index.sh
@@ -5,11 +5,18 @@ test_description='multi-pack-indexes'
 
 midx_read_expect () {
        NUM_PACKS=$1
 
 midx_read_expect () {
        NUM_PACKS=$1

-       cat >expect <<-EOF
-       header: 4d494458 1 1 $NUM_PACKS
-       chunks: pack-names
-       object-dir: .
-       EOF
+       {
+               cat <<-EOF &&
+               header: 4d494458 1 1 $NUM_PACKS
+               chunks: pack-names
+               packs:
+               EOF
+               if test $NUM_PACKS -ge 1
+               then
+                       ls pack/ | grep idx | sort
+               fi &&
+               printf "object-dir: .\n"
+       } >expect &&

        test-tool read-midx . >actual &&
        test_cmp expect actual
 }
        test-tool read-midx . >actual &&
        test_cmp expect actual
 }