Commit55efc6f

committed

Make itemsize calculation same in writetup_rum and readtup_rum

It was incorrectly set different RumSortSize vs RumScanSize

1 parentd9963d9 commit55efc6fCopy full SHA for 55efc6f

File tree

-3

lines changed

-3

lines changed

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -203,11 +203,13 @@ copytup_rumitem(RumTuplesortstate * state, SortTuple stup, void tup)`
`203`	`203`	`#defineLogicalTapeReadExact_compat(state,LT_ARG,args...) LogicalTapeReadExact(state->tapeset, LT_ARG, ##args)`
`204`	`204`	`#endif`
`205`	`205`
	`206`	`+#defineITEMSIZE(is_scanitem) is_scanitem ? sizeof(RumScanItem) : RumSortItemSize(state->nKeys);`
	`207`	`+`
`206`	`208`	`staticvoid`
`207`	`209`	`writetup_rum_internal(RumTuplesortstatestate,LT_TYPELT_ARG,SortTuplestup,boolis_item)`
`208`	`210`	`{`
`209`		`-RumSortItemitem= (RumSortItem)stup->tuple;`
`210`		`-size_tsize=is_item ?sizeof(*item) :RumSortItemSize(state->nKeys);`
	`211`	`+void*item=stup->tuple;`
	`212`	`+size_tsize=ITEMSIZE(is_item);`
`211`	`213`	`unsignedintwrittenlen=size+sizeof(unsignedint);`
`212`	`214`
`213`	`215`	`LogicalTapeWrite(TAPE(state,LT_ARG),`
`@@ -239,7 +241,7 @@ readtup_rum_internal(RumTuplesortstate * state, SortTuple *stup,`
`239`	`241`	`LT_TYPELT_ARG,unsignedintlen,boolis_item)`
`240`	`242`	`{`
`241`	`243`	`unsignedinttuplen=len-sizeof(unsignedint);`
`242`		`-size_tsize=is_item ?sizeof(RumScanItem) :RumSortItemSize(state->nKeys);`
	`244`	`+size_tsize=ITEMSIZE(is_item);`
`243`	`245`	`void*item=palloc(size);`
`244`	`246`
`245`	`247`	`Assert(tuplen==RumSortItemSize(state->nKeys));`

Comments

(0)