NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit378c79d

committed

Cleanup for pglz_compress code: remove dead code, const-ify API of

remaining functions, simplify pglz_compress's API to not require a uselessdata copy when compression fails. Also add a check in pglz_decompress thatthe expected amount of data was decompressed.

1 parente378f82 commit378c79dCopy full SHA for 378c79d

File tree

3 files changed

+96

-396

lines changed

src
- backend
  - access/heap
    - tuptoaster.c
  - utils/adt
    - pg_lzcompress.c
- include/utils
  - pg_lzcompress.h

3 files changed

+96

-396

lines changed

`‎src/backend/access/heap/tuptoaster.c`

Lines changed: 23 additions & 27 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/backend/access/heap/tuptoaster.c,v 1.65 2006/10/04 00:29:48 momjian Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/access/heap/tuptoaster.c,v 1.66 2006/10/05 23:33:33 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*`
`14`	`14`	`* INTERFACE ROUTINES`
`@@ -100,15 +100,12 @@ heap_tuple_untoast_attr(varattrib *attr)`
`100`	`100`	`* Fetch it from the toast heap and decompress.`
`101`	`101`	`* ----------`
`102`	`102`	`*/`
`103`		`-varattrib*tmp;`
`104`		`-`
`105`		`-tmp=toast_fetch_datum(attr);`
`106`		`-result= (varattrib*)palloc(attr->va_content.va_external.va_rawsize`
`107`		`-+VARHDRSZ);`
`108`		`-VARATT_SIZEP(result)=attr->va_content.va_external.va_rawsize`
`109`		`-+VARHDRSZ;`
`110`		`-pglz_decompress((PGLZ_Header*)tmp,VARATT_DATA(result));`
	`103`	`+PGLZ_Header*tmp;`
`111`	`104`
	`105`	`+tmp= (PGLZ_Header*)toast_fetch_datum(attr);`
	`106`	`+result= (varattrib*)palloc(PGLZ_RAW_SIZE(tmp)+VARHDRSZ);`
	`107`	`+VARATT_SIZEP(result)=PGLZ_RAW_SIZE(tmp)+VARHDRSZ;`
	`108`	`+pglz_decompress(tmp,VARATT_DATA(result));`
`112`	`109`	`pfree(tmp);`
`113`	`110`	`}`
`114`	`111`	`else`
`@@ -124,11 +121,11 @@ heap_tuple_untoast_attr(varattrib *attr)`
`124`	`121`	`/*`
`125`	`122`	`* This is a compressed value inside of the main tuple`
`126`	`123`	`*/`
`127`		`-result= (varattrib*)palloc(attr->va_content.va_compressed.va_rawsize`
`128`		`-+VARHDRSZ);`
`129`		`-VARATT_SIZEP(result)=attr->va_content.va_compressed.va_rawsize`
`130`		`-+VARHDRSZ;`
`131`		`-pglz_decompress((PGLZ_Header*)attr,VARATT_DATA(result));`
	`124`	`+PGLZ_Headertmp= (PGLZ_Header)attr;`
	`125`	`+`
	`126`	`+result=(varattrib*)palloc(PGLZ_RAW_SIZE(tmp)+VARHDRSZ);`
	`127`	`+VARATT_SIZEP(result)=PGLZ_RAW_SIZE(tmp)+VARHDRSZ;`
	`128`	`+pglz_decompress(tmp,VARATT_DATA(result));`
`132`	`129`	`}`
`133`	`130`	`else`
`134`	`131`
`@@ -157,19 +154,18 @@ heap_tuple_untoast_attr_slice(varattrib *attr, int32 sliceoffset, int32 slicelen`
`157`	`154`
`158`	`155`	`if (VARATT_IS_COMPRESSED(attr))`
`159`	`156`	`{`
`160`		`-varattrib*tmp;`
	`157`	`+PGLZ_Header*tmp;`
`161`	`158`
`162`	`159`	`if (VARATT_IS_EXTERNAL(attr))`
`163`		`-tmp=toast_fetch_datum(attr);`
	`160`	`+tmp=(PGLZ_Header*)toast_fetch_datum(attr);`
`164`	`161`	`else`
`165`		`-tmp=attr;/* compressed in main tuple */`
	`162`	`+tmp=(PGLZ_Header)attr;/ compressed in main tuple */`
`166`	`163`
`167`		`-preslice= (varattrib*)palloc(attr->va_content.va_external.va_rawsize`
`168`		`-+VARHDRSZ);`
`169`		`-VARATT_SIZEP(preslice)=attr->va_content.va_external.va_rawsize+VARHDRSZ;`
`170`		`-pglz_decompress((PGLZ_Header*)tmp,VARATT_DATA(preslice));`
	`164`	`+preslice= (varattrib*)palloc(PGLZ_RAW_SIZE(tmp)+VARHDRSZ);`
	`165`	`+VARATT_SIZEP(preslice)=PGLZ_RAW_SIZE(tmp)+VARHDRSZ;`
	`166`	`+pglz_decompress(tmp,VARATT_DATA(preslice));`
`171`	`167`
`172`		`-if (tmp!=attr)`
	`168`	`+if (tmp!=(PGLZ_Header*)attr)`
`173`	`169`	`pfree(tmp);`
`174`	`170`	`}`
`175`	`171`	`else`
`@@ -948,12 +944,12 @@ Datum`
`948`	`944`	`toast_compress_datum(Datumvalue)`
`949`	`945`	`{`
`950`	`946`	`varattrib*tmp;`
	`947`	`+int32valsize=VARATT_SIZE(value)-VARHDRSZ;`
`951`	`948`
`952`		`-tmp= (varattrib*)palloc(sizeof(PGLZ_Header)+VARATT_SIZE(value));`
`953`		`-pglz_compress(VARATT_DATA(value),VARATT_SIZE(value)-VARHDRSZ,`
`954`		`- (PGLZ_Header*)tmp,`
`955`		`-PGLZ_strategy_default);`
`956`		`-if (VARATT_SIZE(tmp)<VARATT_SIZE(value))`
	`949`	`+tmp= (varattrib*)palloc(PGLZ_MAX_OUTPUT(valsize));`
	`950`	`+if (pglz_compress(VARATT_DATA(value),valsize,`
	`951`	`+ (PGLZ_Header*)tmp,PGLZ_strategy_default)&&`
	`952`	`+VARATT_SIZE(tmp)<VARATT_SIZE(value))`
`957`	`953`	`{`
`958`	`954`	`/* successful compression */`
`959`	`955`	`VARATT_SIZEP(tmp) \|=VARATT_FLAG_COMPRESSED;`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit378c79d

File tree

3 files changed

3 files changed

`‎src/backend/access/heap/tuptoaster.c`

0 commit comments