fixup! Merge pull request #964 from jeffhostetler/jeffhostetler/memihash_perf

I should really implement special-handling for a new drop! prefix to
commit messages...

This commit reverts that Pull Request, in preparation for merging in a new
iteration of that work (which looks substantially different from the
previous iteration...).

Signed-off-by: Johannes Schindelin <[email protected]>

Author: dscho

cache.h

@@ -177,9 +177,6 @@ struct cache_entry {
 	unsigned int ce_flags;
 	unsigned int ce_namelen;
 	unsigned int index;	/* for link extension */
-	unsigned int precompute_hash_state;
-	unsigned int precompute_hash_name;
-	unsigned int precompute_hash_dir;
 	struct object_id oid;
 	char name[FLEX_ARRAY]; /* more */
 };
@@ -236,19 +233,6 @@ struct cache_entry {
 #error "CE_EXTENDED_FLAGS out of range"
 #endif
 
-/*
- * Bit set if preload-index precomputed the hash value(s)
- * for this cache-entry.
- */ 
-#define CE_PRECOMPUTE_HASH_STATE__SET   (1 << 0)
-/*
- * Bit set if precompute-index also precomputed the hash value
- * for the parent directory.
- */ 
-#define CE_PRECOMPUTE_HASH_STATE__DIR   (1 << 1)
-
-void precompute_istate_hashes(struct cache_entry *ce);
-
 /* Forward structure decls */
 struct pathspec;
 struct child_process;

hashmap.h

@@ -12,7 +12,6 @@ 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)
 {

preload-index.c

@@ -46,8 +46,6 @@ static void *preload_thread(void *_data)
 		struct cache_entry *ce = *cep++;
 		struct stat st;
 
-		precompute_istate_hashes(ce);
-
 		if (ce_stage(ce))
 			continue;
 		if (S_ISGITLINK(ce->ce_mode))

read-cache.c

@@ -77,7 +77,6 @@ void rename_index_entry_at(struct index_state *istate, int nr, const char *new_n
 	copy_cache_entry(new, old);
 	new->ce_flags &= ~CE_HASHED;
 	new->ce_namelen = namelen;
-	new->precompute_hash_state = 0;
 	new->index = 0;
 	memcpy(new->name, new_name, namelen + 1);
 
@@ -619,7 +618,6 @@ static struct cache_entry *create_alias_ce(struct index_state *istate,
 	new = xcalloc(1, cache_entry_size(len));
 	memcpy(new->name, alias->name, len);
 	copy_cache_entry(new, ce);
-	new->precompute_hash_state = 0;
 	save_or_free_index_entry(istate, ce);
 	return new;
 }
@@ -1562,7 +1560,6 @@ static struct cache_entry *cache_entry_from_ondisk(struct ondisk_cache_entry *on
 	ce->ce_stat_data.sd_size  = get_be32(&ondisk->size);
 	ce->ce_flags = flags & ~CE_NAMEMASK;
 	ce->ce_namelen = len;
-	ce->precompute_hash_state = 0;
 	ce->index = 0;
 	hashcpy(ce->oid.hash, ondisk->sha1);
 	memcpy(ce->name, name, len);