15fca87535d94ba45c37c8088ffb571dcb024b9e angie Mon Jul 8 10:31:31 2019 -0700 Increasing hashMaxSize to 30 to support dbSNP's 650M+ rs IDs. Replaced assert with more informative error message when too-large size is passed in. refs #23283 diff --git src/inc/hash.h src/inc/hash.h index 120ce93..22dc124 100644 --- src/inc/hash.h +++ src/inc/hash.h @@ -67,31 +67,31 @@ struct hash *next; /* Next in list. */ bits32 mask; /* Mask hashCrc with this to get it to fit table. */ struct hashEl **table; /* Hash buckets. */ int powerOfTwoSize; /* Size of table as a power of two. */ int size; /* Size of table. */ struct lm *lm; /* Local memory pool. */ int elCount; /* Count of elements. */ boolean autoExpand; /* Automatically expand hash */ float expansionFactor; /* Expand when elCount > size*expansionFactor */ int numResizes; /* number of times resize was called */ boolean ownLm; /* TRUE if lm was allocated by newHashExt */ }; #define defaultExpansionFactor 1.0 -#define hashMaxSize 28 +#define hashMaxSize 30 struct hashCookie /* used by hashFirst/hashNext in tracking location in traversing hash */ { struct hash *hash; /* hash we are associated with */ int idx; /* current index in hash */ struct hashEl *nextEl; /* current element in hash */ }; bits32 hashString(char *string); /* Compute a hash value of a string. */ bits32 hashCrc(char *string); /* Returns a CRC value on string. */