Commit350b0a4

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 parent9cf37a5 commit350b0a4Copy full SHA for 350b0a4

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);`
`@@ -356,6 +358,14 @@ SH_DESTROY(SH_TYPE * tb)`
`356`	`358`	`pfree(tb);`
`357`	`359`	`}`
`358`	`360`
	`361`	`+/* reset the contents of a previously created hash table */`
	`362`	`+SH_SCOPEvoid`
	`363`	`+SH_RESET(SH_TYPE*tb)`
	`364`	`+{`
	`365`	`+memset(tb->data,0,sizeof(SH_ELEMENT_TYPE)*tb->size);`
	`366`	`+tb->members=0;`
	`367`	`+}`
	`368`	`+`
`359`	`369`	`/*`
`360`	`370`	* Grow a hash table to at least `newsize` buckets.
`361`	`371`	`*`
`@@ -946,6 +956,7 @@ SH_STAT(SH_TYPE * tb)`
`946`	`956`	`/* external function names */`
`947`	`957`	`#undef SH_CREATE`
`948`	`958`	`#undef SH_DESTROY`
	`959`	`+#undef SH_RESET`
`949`	`960`	`#undef SH_INSERT`
`950`	`961`	`#undef SH_DELETE`
`951`	`962`	`#undef SH_LOOKUP`

Comments

(0)