hashmap: allow memihash computation to be continued

jeffhostetler · gitster · commit f75619bd6d21 · 2017-03-22T13:41:41.000-07:00
Add variant of memihash() to allow the hash computation to
be continued.  There are times when we compute the hash on
a full path and then the hash on just the path to the parent
directory.  This can be expensive on large repositories.

With this, we can hash the parent directory first. And then
continue the computation to include the "/filename".

Signed-off-by: Jeff Hostetler &lt;jeffhost@microsoft.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/hashmap.c b/hashmap.c
@@ -50,6 +50,23 @@ unsigned int memihash(const void *buf, size_t len)
 	return hash;
 }
 
+/*
+ * Incoporate another chunk of data into a memihash
+ * computation.
+ */
+unsigned int memihash_cont(unsigned int hash_seed, const void *buf, size_t len)
+{
+	unsigned int hash = hash_seed;
+	unsigned char *ucbuf = (unsigned char *) buf;
+	while (len--) {
+		unsigned int c = *ucbuf++;
+		if (c >= 'a' && c <= 'z')
+			c -= 'a' - 'A';
+		hash = (hash * FNV32_PRIME) ^ c;
+	}
+	return hash;
+}
+
 #define HASHMAP_INITIAL_SIZE 64
 /* grow / shrink by 2^2 */
 #define HASHMAP_RESIZE_BITS 2
diff --git a/hashmap.h b/hashmap.h
@@ -12,6 +12,7 @@ extern unsigned int strhash(const char *buf);
 extern unsigned int strihash(const char *buf);
 extern unsigned int memhash(const void *buf, size_t len);
 extern unsigned int memihash(const void *buf, size_t len);
+extern unsigned int memihash_cont(unsigned int hash_seed, const void *buf, size_t len);
 
 static inline unsigned int sha1hash(const unsigned char *sha1)
 {

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@ extern unsigned int strhash(const char *buf);`
`12`	`12`	`extern unsigned int strihash(const char *buf);`
`13`	`13`	`extern unsigned int memhash(const void *buf, size_t len);`
`14`	`14`	`extern unsigned int memihash(const void *buf, size_t len);`
	`15`	`+extern unsigned int memihash_cont(unsigned int hash_seed, const void *buf, size_t len);`
`15`	`16`
`16`	`17`	`static inline unsigned int sha1hash(const unsigned char *sha1)`
`17`	`18`	`{`