diff options
| author | Stephen Frost <sfrost@snowman.net> | 2018-12-10 09:31:38 -0500 |
|---|---|---|
| committer | Stephen Frost <sfrost@snowman.net> | 2018-12-10 09:31:38 -0500 |
| commit | 96c702c1edbde8a3f5013bd0ac6c25c85710258d (patch) | |
| tree | 0d89209ef689b54ab55e9be963ef171109791d3a /src | |
| parent | 6d8727f95e7043d52ea8f6d62f7bcf81fdeaa658 (diff) | |
| download | postgresql-96c702c1edbde8a3f5013bd0ac6c25c85710258d.tar.gz postgresql-96c702c1edbde8a3f5013bd0ac6c25c85710258d.zip | |
Remove dead code in toast_fetch_datum_slice
In toast_fetch_datum_slice(), we Assert() that what is passed in isn't
compressed, but we then later had a check to see what the length of if
what was passed in is compressed. That later check is rather confusing
since toast_fetch_datum_slice() is only ever called with non-compressed
datums and the Assert() earlier makes it clear that one shouldn't be
passing in compressed datums.
Add a comment to make it clear that toast_fetch_datum_slice() is just
for non-compressed datums, and remove the dead code.
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/access/heap/tuptoaster.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/backend/access/heap/tuptoaster.c b/src/backend/access/heap/tuptoaster.c index fdbaf38126d..d1dad998d28 100644 --- a/src/backend/access/heap/tuptoaster.c +++ b/src/backend/access/heap/tuptoaster.c @@ -2026,6 +2026,8 @@ toast_fetch_datum(struct varlena *attr) * * Reconstruct a segment of a Datum from the chunks saved * in the toast relation + * + * Note that this function only supports non-compressed external datums. * ---------- */ static struct varlena * @@ -2085,10 +2087,7 @@ toast_fetch_datum_slice(struct varlena *attr, int32 sliceoffset, int32 length) result = (struct varlena *) palloc(length + VARHDRSZ); - if (VARATT_EXTERNAL_IS_COMPRESSED(toast_pointer)) - SET_VARSIZE_COMPRESSED(result, length + VARHDRSZ); - else - SET_VARSIZE(result, length + VARHDRSZ); + SET_VARSIZE(result, length + VARHDRSZ); if (length == 0) return result; /* Can save a lot of work at this point! */ |