mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

midx: switch to using the_hash_algo

Browse Source 
Instead of hard-coding the hash size, use the_hash_algo to look up the
hash size at runtime.  Remove the #define constant which was used to
hold the hash length, since writing the expression with the_hash_algo
provide enough documentary value on its own.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
brian m. carlson
2019-08-18 20:04:27 +00:00
committed by Junio C Hamano
parent be8e172e9f
commit aaa95dfa05
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
midx.c
View File

@ -19,8 +19,7 @@
#define MIDX_BYTE_NUM_PACKS 8 #define MIDX_BYTE_NUM_PACKS 8
#define MIDX_HASH_VERSION 1 #define MIDX_HASH_VERSION 1
#define MIDX_HEADER_SIZE 12 #define MIDX_HEADER_SIZE 12
#define MIDX_HASH_LEN 20 #define MIDX_MIN_SIZE (MIDX_HEADER_SIZE + the_hash_algo->rawsz)
#define MIDX_MIN_SIZE (MIDX_HEADER_SIZE + MIDX_HASH_LEN)
#define MIDX_MAX_CHUNKS 5 #define MIDX_MAX_CHUNKS 5
#define MIDX_CHUNK_ALIGNMENT 4 #define MIDX_CHUNK_ALIGNMENT 4
@ -93,7 +92,7 @@ struct multi_pack_index *load_multi_pack_index(const char *object_dir, int local
hash_version = m->data[MIDX_BYTE_HASH_VERSION]; hash_version = m->data[MIDX_BYTE_HASH_VERSION];
if (hash_version != MIDX_HASH_VERSION) if (hash_version != MIDX_HASH_VERSION)
die(_("hash version %u does not match"), hash_version); die(_("hash version %u does not match"), hash_version);
m->hash_len = MIDX_HASH_LEN; m->hash_len = the_hash_algo->rawsz;
m->num_chunks = m->data[MIDX_BYTE_NUM_CHUNKS]; m->num_chunks = m->data[MIDX_BYTE_NUM_CHUNKS];
@ -234,7 +233,7 @@ int prepare_midx_pack(struct repository *r, struct multi_pack_index *m, uint32_t
int bsearch_midx(const struct object_id *oid, struct multi_pack_index *m, uint32_t *result) int bsearch_midx(const struct object_id *oid, struct multi_pack_index *m, uint32_t *result)
{ {
return bsearch_hash(oid->hash, m->chunk_oid_fanout, m->chunk_oid_lookup, return bsearch_hash(oid->hash, m->chunk_oid_fanout, m->chunk_oid_lookup,
MIDX_HASH_LEN, result); the_hash_algo->rawsz, result);
} }
struct object_id *nth_midxed_object_oid(struct object_id *oid, struct object_id *nth_midxed_object_oid(struct object_id *oid,
@ -928,7 +927,7 @@ static int write_midx_internal(const char *object_dir, struct multi_pack_index *
cur_chunk++; cur_chunk++;
chunk_ids[cur_chunk] = MIDX_CHUNKID_OBJECTOFFSETS; chunk_ids[cur_chunk] = MIDX_CHUNKID_OBJECTOFFSETS;
chunk_offsets[cur_chunk] = chunk_offsets[cur_chunk - 1] + nr_entries * MIDX_HASH_LEN; chunk_offsets[cur_chunk] = chunk_offsets[cur_chunk - 1] + nr_entries * the_hash_algo->rawsz;
cur_chunk++; cur_chunk++;
chunk_offsets[cur_chunk] = chunk_offsets[cur_chunk - 1] + nr_entries * MIDX_CHUNK_OFFSET_WIDTH; chunk_offsets[cur_chunk] = chunk_offsets[cur_chunk - 1] + nr_entries * MIDX_CHUNK_OFFSET_WIDTH;
@ -976,7 +975,7 @@ static int write_midx_internal(const char *object_dir, struct multi_pack_index *
break; break;
case MIDX_CHUNKID_OIDLOOKUP: case MIDX_CHUNKID_OIDLOOKUP:
written += write_midx_oid_lookup(f, MIDX_HASH_LEN, entries, nr_entries); written += write_midx_oid_lookup(f, the_hash_algo->rawsz, entries, nr_entries);
break; break;
case MIDX_CHUNKID_OBJECTOFFSETS: case MIDX_CHUNKID_OBJECTOFFSETS: