Commit3b632a5

committed

simplehash: Add support for resetting a hashtable's contents.

A hashtable reset just reset the hashtable entries, but does not freememory.Author: Andres FreundDiscussion:https://postgr.es/m/20190114180423.ywhdg2iagzvh43we@alap3.anarazel.deBug: #15592 #15486Backpatch: 11, this is a prerequisite for other fixes

1 parent5567d12 commit3b632a5Copy full SHA for 3b632a5

File tree

+11

-0

lines changed

+11

-0

lines changed

Lines changed: 11 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -72,6 +72,7 @@`
`72`	`72`	`/* function declarations */`
`73`	`73`	`#defineSH_CREATE SH_MAKE_NAME(create)`
`74`	`74`	`#defineSH_DESTROY SH_MAKE_NAME(destroy)`
	`75`	`+#defineSH_RESET SH_MAKE_NAME(reset)`
`75`	`76`	`#defineSH_INSERT SH_MAKE_NAME(insert)`
`76`	`77`	`#defineSH_DELETE SH_MAKE_NAME(delete)`
`77`	`78`	`#defineSH_LOOKUP SH_MAKE_NAME(lookup)`
`@@ -140,6 +141,7 @@ typedef struct SH_ITERATOR`
`140`	`141`	`SH_SCOPESH_TYPE*SH_CREATE(MemoryContextctx,uint32nelements,`
`141`	`142`	`void*private_data);`
`142`	`143`	`SH_SCOPEvoidSH_DESTROY(SH_TYPE*tb);`
	`144`	`+SH_SCOPEvoidSH_RESET(SH_TYPE*tb);`
`143`	`145`	`SH_SCOPEvoidSH_GROW(SH_TYPE*tb,uint32newsize);`
`144`	`146`	`SH_SCOPESH_ELEMENT_TYPESH_INSERT(SH_TYPEtb,SH_KEY_TYPEkey,bool*found);`
`145`	`147`	`SH_SCOPESH_ELEMENT_TYPESH_LOOKUP(SH_TYPEtb,SH_KEY_TYPEkey);`
`@@ -368,6 +370,14 @@ SH_DESTROY(SH_TYPE * tb)`
`368`	`370`	`pfree(tb);`
`369`	`371`	`}`
`370`	`372`
	`373`	`+/* reset the contents of a previously created hash table */`
	`374`	`+SH_SCOPEvoid`
	`375`	`+SH_RESET(SH_TYPE*tb)`
	`376`	`+{`
	`377`	`+memset(tb->data,0,sizeof(SH_ELEMENT_TYPE)*tb->size);`
	`378`	`+tb->members=0;`
	`379`	`+}`
	`380`	`+`
`371`	`381`	`/*`
`372`	`382`	* Grow a hash table to at least `newsize` buckets.
`373`	`383`	`*`
`@@ -959,6 +969,7 @@ SH_STAT(SH_TYPE * tb)`
`959`	`969`	`/* external function names */`
`960`	`970`	`#undef SH_CREATE`
`961`	`971`	`#undef SH_DESTROY`
	`972`	`+#undef SH_RESET`
`962`	`973`	`#undef SH_INSERT`
`963`	`974`	`#undef SH_DELETE`
`964`	`975`	`#undef SH_LOOKUP`

Comments

(0)