git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 26/26] midx: switch to using the_hash_algo

From
brian m. carlson <sandals@crustytoothpaste.net>
Date
Aug 18, 2019, 20:04 UTC
Message-ID
<20190818200427.870753-27-sandals@crustytoothpaste.net>
In-Reply-To
<20190818200427.870753-1-sandals@crustytoothpaste.net>

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>
---
 midx.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/midx.c b/midx.c
index d649644420..f29afc0d2d 100644
--- a/midx.c
+++ b/midx.c
@@ -19,8 +19,7 @@
 #define MIDX_BYTE_NUM_PACKS 8
 #define MIDX_HASH_VERSION 1
 #define MIDX_HEADER_SIZE 12
-#define MIDX_HASH_LEN 20
-#define MIDX_MIN_SIZE (MIDX_HEADER_SIZE + MIDX_HASH_LEN)
+#define MIDX_MIN_SIZE (MIDX_HEADER_SIZE + the_hash_algo->rawsz)
 
 #define MIDX_MAX_CHUNKS 5
 #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];
 	if (hash_version != MIDX_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];
 
@@ -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)
 {
 	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,
@@ -928,7 +927,7 @@ static int write_midx_internal(const char *object_dir, struct multi_pack_index *
 
 	cur_chunk++;
 	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++;
 	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;
 
 			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;
 
 			case MIDX_CHUNKID_OBJECTOFFSETS:
Previous: brian m. carlsonNext: Derrick Stolee
Message 29 of 33 in “object_id part 17”
  1. 00/26 object_id part 17brian m. carlson, Aug 18, 2019
  2. 01/26 builtin/replace: make hash size independentbrian m. carlson, Aug 18, 2019
  3. 04/26 builtin/receive-pack: switch to use the_hash_algobrian m. carlson, Aug 18, 2019
  4. 03/26 fetch-pack: use parse_oid_hexbrian m. carlson, Aug 18, 2019
  5. 02/26 patch-id: convert to use the_hash_algobrian m. carlson, Aug 18, 2019
  6. René ScharfeAug 20, 2019
  7. brian m. carlsonAug 20, 2019
  8. Junio C HamanoAug 22, 2019
  9. 07/26 blame: remove needless comparison with GIT_SHA1_HEXSZbrian m. carlson, Aug 18, 2019
  10. 11/26 combine-diff: replace GIT_SHA1_HEXSZ with the_hash_algobrian m. carlson, Aug 18, 2019
  11. 10/26 bundle: switch to use the_hash_algobrian m. carlson, Aug 18, 2019
  12. 09/26 connected: switch GIT_SHA1_HEXSZ to the_hash_algobrian m. carlson, Aug 18, 2019
  13. 05/26 builtin/blame: switch uses of GIT_SHA1_HEXSZ to the_hash_algobrian m. carlson, Aug 18, 2019
  14. 06/26 builtin/rev-parse: switch to use the_hash_algobrian m. carlson, Aug 18, 2019
  15. 16/26 pack-write: use hash_to_hex when writing checksumsbrian m. carlson, Aug 18, 2019
  16. 17/26 builtin/repack: write object IDs of the proper lengthbrian m. carlson, Aug 18, 2019
  17. 19/26 cache: remove null_sha1brian m. carlson, Aug 18, 2019
  18. 18/26 builtin/worktree: switch null_sha1 to null_oidbrian m. carlson, Aug 18, 2019
  19. 20/26 wt-status: convert struct wt_status to object_idbrian m. carlson, Aug 18, 2019
  20. 15/26 sequencer: convert to use the_hash_algobrian m. carlson, Aug 18, 2019
  21. 12/26 config: use the_hash_algo in abbrev comparisonbrian m. carlson, Aug 18, 2019
  22. 21/26 packfile: replace sha1_to_hexbrian m. carlson, Aug 18, 2019
  23. 14/26 bisect: switch to using the_hash_algobrian m. carlson, Aug 18, 2019
  24. 22/26 builtin/index-pack: replace sha1_to_hexbrian m. carlson, Aug 18, 2019
  25. 25/26 builtin/show-index: replace sha1_to_hexbrian m. carlson, Aug 18, 2019
  26. 24/26 rerere: replace sha1_to_hexbrian m. carlson, Aug 18, 2019
  27. 08/26 show-index: switch hard-coded constants to the_hash_algobrian m. carlson, Aug 18, 2019
  28. 23/26 builtin/receive-pack: replace sha1_to_hexbrian m. carlson, Aug 18, 2019
  29. 26/26 midx: switch to using the_hash_algobrian m. carlson, Aug 18, 2019
  30. Derrick StoleeAug 22, 2019
  31. brian m. carlsonAug 23, 2019
  32. Derrick StoleeAug 23, 2019
  33. 13/26 sha1-lookup: switch hard-coded constants to the_hash_algobrian m. carlson, Aug 18, 2019

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.