hashmap: convert sha1hash() to oidhash()

peff · gitster · commit d40abc8e95f7 · 2019-06-20T10:44:22.000-07:00
There are no callers left of sha1hash() that do not simply pass the
"hash" member of a "struct object_id". Let's get rid of the outdated
sha1-specific function and provide one that operates on the whole struct
(even though the technique, taking the first few bytes of the hash, will
remain the same).

Signed-off-by: Jeff King &lt;peff@peff.net&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/builtin/describe.c b/builtin/describe.c
@@ -76,7 +76,7 @@ static int commit_name_neq(const void *unused_cmp_data,
 
 static inline struct commit_name *find_commit_name(const struct object_id *peeled)
 {
-	return hashmap_get_from_hash(&names, sha1hash(peeled->hash), peeled);
+	return hashmap_get_from_hash(&names, oidhash(peeled), peeled);
 }
 
 static int replace_name(struct commit_name *e,
@@ -123,7 +123,7 @@ static void add_to_known_names(const char *path,
 		if (!e) {
 			e = xmalloc(sizeof(struct commit_name));
 			oidcpy(&e->peeled, peeled);
-			hashmap_entry_init(e, sha1hash(peeled->hash));
+			hashmap_entry_init(e, oidhash(peeled));
 			hashmap_add(&names, e);
 			e->path = NULL;
 		}
diff --git a/decorate.c b/decorate.c
@@ -8,7 +8,7 @@
 
 static unsigned int hash_obj(const struct object *obj, unsigned int n)
 {
-	return sha1hash(obj->oid.hash) % n;
+	return oidhash(&obj->oid) % n;
 }
 
 static void *insert_decoration(struct decoration *n, const struct object *base, void *decoration)
diff --git a/diffcore-rename.c b/diffcore-rename.c
@@ -266,7 +266,7 @@ static unsigned int hash_filespec(struct repository *r,
 		hash_object_file(filespec->data, filespec->size, "blob",
 				 &filespec->oid);
 	}
-	return sha1hash(filespec->oid.hash);
+	return oidhash(&filespec->oid);
 }
 
 static int find_identical_files(struct hashmap *srcs,
diff --git a/hashmap.h b/hashmap.h
@@ -1,6 +1,8 @@
 #ifndef HASHMAP_H
 #define HASHMAP_H
 
+#include "hash.h"
+
 /*
  * Generic implementation of hash-based key-value mappings.
  *
@@ -118,14 +120,14 @@ unsigned int memihash_cont(unsigned int hash_seed, const void *buf, size_t len);
  * the results will be different on big-endian and little-endian
  * platforms, so they should not be stored or transferred over the net.
  */
-static inline unsigned int sha1hash(const unsigned char *sha1)
+static inline unsigned int oidhash(const struct object_id *oid)
 {
 	/*
-	 * Equivalent to 'return *(unsigned int *)sha1;', but safe on
+	 * Equivalent to 'return *(unsigned int *)oid->hash;', but safe on
 	 * platforms that don't support unaligned reads.
 	 */
 	unsigned int hash;
-	memcpy(&hash, sha1, sizeof(hash));
+	memcpy(&hash, oid->hash, sizeof(hash));
 	return hash;
 }
 
diff --git a/khash.h b/khash.h
@@ -326,7 +326,7 @@ static const double __ac_HASH_UPPER = 0.77;
 
 static inline unsigned int oidhash_by_value(struct object_id oid)
 {
-	return sha1hash(oid.hash);
+	return oidhash(&oid);
 }
 
 static inline int oideq_by_value(struct object_id a, struct object_id b)
diff --git a/object.c b/object.c
@@ -61,7 +61,7 @@ int type_from_string_gently(const char *str, ssize_t len, int gentle)
  */
 static unsigned int hash_obj(const struct object_id *oid, unsigned int n)
 {
-	return sha1hash(oid->hash) & (n - 1);
+	return oidhash(oid) & (n - 1);
 }
 
 /*
diff --git a/pack-objects.c b/pack-objects.c
@@ -11,7 +11,7 @@ static uint32_t locate_object_entry_hash(struct packing_data *pdata,
 {
 	uint32_t i, mask = (pdata->index_size - 1);
 
-	i = sha1hash(oid->hash) & mask;
+	i = oidhash(oid) & mask;
 
 	while (pdata->index[i] > 0) {
 		uint32_t pos = pdata->index[i] - 1;
diff --git a/patch-ids.c b/patch-ids.c
@@ -83,7 +83,7 @@ static int init_patch_id_entry(struct patch_id *patch,
 	if (commit_patch_id(commit, &ids->diffopts, &header_only_patch_id, 1, 0))
 		return -1;
 
-	hashmap_entry_init(patch, sha1hash(header_only_patch_id.hash));
+	hashmap_entry_init(patch, oidhash(&header_only_patch_id));
 	return 0;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ static int commit_name_neq(const void *unused_cmp_data,`
`76`	`76`
`77`	`77`	`static inline struct commit_name find_commit_name(const struct object_id peeled)`
`78`	`78`	`{`
`79`		`- return hashmap_get_from_hash(&names, sha1hash(peeled->hash), peeled);`
	`79`	`+ return hashmap_get_from_hash(&names, oidhash(peeled), peeled);`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`static int replace_name(struct commit_name *e,`
`@@ -123,7 +123,7 @@ static void add_to_known_names(const char *path,`
`123`	`123`	`if (!e) {`
`124`	`124`	`e = xmalloc(sizeof(struct commit_name));`
`125`	`125`	`oidcpy(&e->peeled, peeled);`
`126`		`- hashmap_entry_init(e, sha1hash(peeled->hash));`
	`126`	`+ hashmap_entry_init(e, oidhash(peeled));`
`127`	`127`	`hashmap_add(&names, e);`
`128`	`128`	`e->path = NULL;`
`129`	`129`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`
`9`	`9`	`static unsigned int hash_obj(const struct object *obj, unsigned int n)`
`10`	`10`	`{`
`11`		`- return sha1hash(obj->oid.hash) % n;`
	`11`	`+ return oidhash(&obj->oid) % n;`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`static void insert_decoration(struct decoration n, const struct object base, void decoration)`
Original file line number	Diff line number	Diff line change
`@@ -266,7 +266,7 @@ static unsigned int hash_filespec(struct repository *r,`
`266`	`266`	`hash_object_file(filespec->data, filespec->size, "blob",`
`267`	`267`	`&filespec->oid);`
`268`	`268`	`}`
`269`		`- return sha1hash(filespec->oid.hash);`
	`269`	`+ return oidhash(&filespec->oid);`
`270`	`270`	`}`
`271`	`271`
`272`	`272`	`static int find_identical_files(struct hashmap *srcs,`
Original file line number	Diff line number	Diff line change
`@@ -326,7 +326,7 @@ static const double __ac_HASH_UPPER = 0.77;`
`326`	`326`
`327`	`327`	`static inline unsigned int oidhash_by_value(struct object_id oid)`
`328`	`328`	`{`
`329`		`- return sha1hash(oid.hash);`
	`329`	`+ return oidhash(&oid);`
`330`	`330`	`}`
`331`	`331`
`332`	`332`	`static inline int oideq_by_value(struct object_id a, struct object_id b)`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ int type_from_string_gently(const char *str, ssize_t len, int gentle)`
`61`	`61`	`*/`
`62`	`62`	`static unsigned int hash_obj(const struct object_id *oid, unsigned int n)`
`63`	`63`	`{`
`64`		`- return sha1hash(oid->hash) & (n - 1);`
	`64`	`+ return oidhash(oid) & (n - 1);`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`/*`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ static uint32_t locate_object_entry_hash(struct packing_data *pdata,`
`11`	`11`	`{`
`12`	`12`	`uint32_t i, mask = (pdata->index_size - 1);`
`13`	`13`
`14`		`- i = sha1hash(oid->hash) & mask;`
	`14`	`+ i = oidhash(oid) & mask;`
`15`	`15`
`16`	`16`	`while (pdata->index[i] > 0) {`
`17`	`17`	`uint32_t pos = pdata->index[i] - 1;`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ static int init_patch_id_entry(struct patch_id *patch,`
`83`	`83`	`if (commit_patch_id(commit, &ids->diffopts, &header_only_patch_id, 1, 0))`
`84`	`84`	`return -1;`
`85`	`85`
`86`		`- hashmap_entry_init(patch, sha1hash(header_only_patch_id.hash));`
	`86`	`+ hashmap_entry_init(patch, oidhash(&header_only_patch_id));`
`87`	`87`	`return 0;`
`88`	`88`	`}`
`89`	`89`