diff options
| author | Tom Lane | 2014-12-25 18:22:55 +0000 |
|---|---|---|
| committer | Tom Lane | 2014-12-25 18:22:55 +0000 |
| commit | 966115c305c297cf4a1ec5ebbd0a55be46ff33ad (patch) | |
| tree | 674c0683bbfaf05c34cb34d4460ec63a64e4645a /src/backend/access/heap/tuptoaster.c | |
| parent | d72731a70450b5e7084991b9caa15cb58a2820df (diff) | |
Temporarily revert "Move pg_lzcompress.c to src/common."
This reverts commit 60838df922345b26a616e49ac9fab808a35d1f85.
That change needs a bit more thought to be workable. In view of
the potentially machine-dependent stuff that went in today,
we need all of the buildfarm to be testing those other changes.
Diffstat (limited to 'src/backend/access/heap/tuptoaster.c')
| -rw-r--r-- | src/backend/access/heap/tuptoaster.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/backend/access/heap/tuptoaster.c b/src/backend/access/heap/tuptoaster.c index c91bdc0d3f5..d230387c859 100644 --- a/src/backend/access/heap/tuptoaster.c +++ b/src/backend/access/heap/tuptoaster.c @@ -37,7 +37,7 @@ #include "catalog/catalog.h" #include "miscadmin.h" #include "utils/fmgroids.h" -#include "common/pg_lzcompress.h" +#include "utils/pg_lzcompress.h" #include "utils/rel.h" #include "utils/typcache.h" #include "utils/tqual.h" @@ -142,8 +142,7 @@ heap_tuple_untoast_attr(struct varlena * attr) attr = (struct varlena *) palloc(PGLZ_RAW_SIZE(tmp) + VARHDRSZ); SET_VARSIZE(attr, PGLZ_RAW_SIZE(tmp) + VARHDRSZ); - if (!pglz_decompress(tmp, VARDATA(attr))) - elog(ERROR, "compressed data is corrupted"); + pglz_decompress(tmp, VARDATA(attr)); pfree(tmp); } } @@ -168,8 +167,7 @@ heap_tuple_untoast_attr(struct varlena * attr) attr = (struct varlena *) palloc(PGLZ_RAW_SIZE(tmp) + VARHDRSZ); SET_VARSIZE(attr, PGLZ_RAW_SIZE(tmp) + VARHDRSZ); - if (!pglz_decompress(tmp, VARDATA(attr))) - elog(ERROR, "compressed data is corrupted"); + pglz_decompress(tmp, VARDATA(attr)); } else if (VARATT_IS_SHORT(attr)) { @@ -241,8 +239,7 @@ heap_tuple_untoast_attr_slice(struct varlena * attr, preslice = (struct varlena *) palloc(size); SET_VARSIZE(preslice, size); - if (!pglz_decompress(tmp, VARDATA(preslice))) - elog(ERROR, "compressed data is corrupted"); + pglz_decompress(tmp, VARDATA(preslice)); if (tmp != (PGLZ_Header *) attr) pfree(tmp); |