diff options
| author | Bruce Momjian <bruce@momjian.us> | 1999-06-12 14:07:33 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 1999-06-12 14:07:33 +0000 |
| commit | 0c3281ce7c0b66d2f6a9d06b8bd475691c37c2b5 (patch) | |
| tree | 5bdf0164cda7f52c9577a6cc3c6676a5fad4eee6 /src/backend/access/common/heaptuple.c | |
| parent | 603e153bb8acc27773807a7eacf4e7c3cf8a5a17 (diff) | |
| download | postgresql-0c3281ce7c0b66d2f6a9d06b8bd475691c37c2b5.tar.gz | |
Reversed out Massimo patch.
Diffstat (limited to 'src/backend/access/common/heaptuple.c')
| -rw-r--r-- | src/backend/access/common/heaptuple.c | 29 |
1 files changed, 3 insertions, 26 deletions
diff --git a/src/backend/access/common/heaptuple.c b/src/backend/access/common/heaptuple.c index 9fa0097a93..626ffd1457 100644 --- a/src/backend/access/common/heaptuple.c +++ b/src/backend/access/common/heaptuple.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.52 1999/06/12 14:05:36 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.53 1999/06/12 14:07:20 momjian Exp $ * * NOTES * The old interface functions have been converted to macros @@ -27,11 +27,6 @@ #include <storage/bufpage.h> #include <utils/memutils.h> -#ifdef FREE_TUPLE_MEMORY -#include <utils/portal.h> -#include <utils/trace.h> -#endif - #ifndef HAVE_MEMMOVE #include <regex/utils.h> #else @@ -98,9 +93,6 @@ DataFill(char *data, int i; int numberOfAttributes = tupleDesc->natts; Form_pg_attribute *att = tupleDesc->attrs; -#ifdef FREE_TUPLE_MEMORY - bool free_tuple_memory = pg_options[OPT_FREE_TUPLE_MEMORY]; -#endif if (bit != NULL) { @@ -139,14 +131,6 @@ DataFill(char *data, *infomask |= HEAP_HASVARLENA; data_length = VARSIZE(DatumGetPointer(value[i])); memmove(data, DatumGetPointer(value[i]), data_length); -#ifdef FREE_TUPLE_MEMORY - /* try to pfree value[i] - dz */ - if (free_tuple_memory && - PortalHeapMemoryIsValid(CurrentMemoryContext, - (Pointer) value[i])) { - pfree(value[i]); - } -#endif break; case sizeof(char): *data = att[i]->attbyval ? @@ -163,15 +147,8 @@ DataFill(char *data, *((int32 *) value[i])); break; default: - memmove(data, DatumGetPointer(value[i]), att[i]->attlen); -#ifdef FREE_TUPLE_MEMORY - /* try to pfree value[i] - dz */ - if (free_tuple_memory && - PortalHeapMemoryIsValid(CurrentMemoryContext, - (Pointer) value[i])) { - pfree(value[i]); - } -#endif + memmove(data, DatumGetPointer(value[i]), + att[i]->attlen); break; } data = (char *) att_addlength((long) data, att[i]->attlen, value[i]); |