Commit5005a96

Nikita Glukhov

committed

Don't pass DetoastIterator to toast_decompress_iterate()

1 parent89e6e7a commit5005a96Copy full SHA for 5005a96

File tree

+13

-6

lines changed

src
- backend/access/common
  - toast_compression.c
- include/access
  - detoast.h

+13

-6

lines changed

Lines changed: 6 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -249,7 +249,9 @@ lz4_decompress_datum_slice(const struct varlena *value, int32 slicelength)`
`249`	`249`
`250`	`250`	`void`
`251`	`251`	`toast_decompress_iterate(ToastBuffersource,ToastBufferdest,`
`252`		`-DetoastIteratoriter,constchar*destend)`
	`252`	`+ToastCompressionIdcompression_method,`
	`253`	`+void**decompression_state,`
	`254`	`+constchar*destend)`
`253`	`255`	`{`
`254`	`256`	`constchar*sp;`
`255`	`257`	`constchar*srcend;`
`@@ -278,13 +280,13 @@ toast_decompress_iterate(ToastBuffer source, ToastBuffer dest,`
`278`	`280`	`/*`
`279`	`281`	`* Decompress the data using the appropriate decompression routine.`
`280`	`282`	`*/`
`281`		`-switch (iter->compression_method)`
	`283`	`+switch (compression_method)`
`282`	`284`	`{`
`283`	`285`	`caseTOAST_PGLZ_COMPRESSION_ID:`
`284`	`286`	`dlen=pglz_decompress_state(sp,&slen,dp,destend-dp,`
`285`	`287`	`last_source_chunk&&destend==dest->capacity,`
`286`	`288`	`last_source_chunk,`
`287`		`-&iter->decompression_state);`
	`289`	`+decompression_state);`
`288`	`290`	`break;`
`289`	`291`	`caseTOAST_LZ4_COMPRESSION_ID:`
`290`	`292`	`if (source->limit<source->capacity)`
`@@ -310,7 +312,7 @@ toast_decompress_iterate(ToastBuffer source, ToastBuffer dest,`
`310`	`312`	`}`
`311`	`313`	`break;`
`312`	`314`	`default:`
`313`		`-elog(ERROR,"invalid compression method id %d",iter->compression_method);`
	`315`	`+elog(ERROR,"invalid compression method id %d",compression_method);`
`314`	`316`	`return;/* keep compiler quiet */`
`315`	`317`	`}`
`316`	`318`

Lines changed: 7 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,9 @@ extern void fetch_datum_iterate(FetchDatumIterator iter);`
`112`	`112`	`externToastBuffer*create_toast_buffer(int32size,boolcompressed);`
`113`	`113`	`externvoidfree_toast_buffer(ToastBuffer*buf);`
`114`	`114`	`externvoidtoast_decompress_iterate(ToastBuffersource,ToastBufferdest,`
`115`		`-DetoastIteratoriter,constchar*destend);`
	`115`	`+ToastCompressionIdcompression_method,`
	`116`	`+void**decompression_state,`
	`117`	`+constchar*destend);`
`116`	`118`	`externvoidpglz_decompress_iterate(ToastBuffersource,ToastBufferdest,`
`117`	`119`	`DetoastIteratoriter,char*destend);`
`118`	`120`
`@@ -166,7 +168,10 @@ detoast_iterate(DetoastIterator detoast_iter, const char *destend)`
`166`	`168`	`fetch_datum_iterate(fetch_iter);`
`167`	`169`
`168`	`170`	`if (detoast_iter->compressed)`
`169`		`-toast_decompress_iterate(fetch_iter->buf,detoast_iter->buf,detoast_iter,destend);`
	`171`	`+toast_decompress_iterate(fetch_iter->buf,detoast_iter->buf,`
	`172`	`+detoast_iter->compression_method,`
	`173`	`+&detoast_iter->decompression_state,`
	`174`	`+destend);`
`170`	`175`
`171`	`176`	`if (detoast_iter->buf->limit==detoast_iter->buf->capacity)`
`172`	`177`	`detoast_iter->done= true;`

Comments

(0)