diff options
Diffstat (limited to 'src/backend/access/common')
| -rw-r--r-- | src/backend/access/common/heaptuple.c | 34 | ||||
| -rw-r--r-- | src/backend/access/common/heapvalid.c | 7 |
2 files changed, 19 insertions, 22 deletions
diff --git a/src/backend/access/common/heaptuple.c b/src/backend/access/common/heaptuple.c index 71d76a6fc2f..30961f4f549 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.19 1997/08/19 21:28:49 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.20 1997/08/24 23:07:26 momjian Exp $ * * NOTES * The old interface functions have been converted to macros @@ -695,26 +695,20 @@ heap_getattr(HeapTuple tup, if (attnum > (int) tup->t_natts) { *isnull = true; return ((char *) NULL); + } else if (attnum > 0) { + /* ---------------- + * take care of user defined attributes + * ---------------- + */ + return fastgetattr(tup, attnum, tupleDesc, isnull); + } else { + /* ---------------- + * take care of system attributes + * ---------------- + */ + *isnull = false; + return heap_getsysattr(tup, b, attnum); } - - /* ---------------- - * take care of user defined attributes - * ---------------- - */ - if (attnum > 0) { - char *datum; - datum = fastgetattr(tup, attnum, tupleDesc, isnull); - - return (datum); - } - - /* ---------------- - * take care of system attributes - * ---------------- - */ - *isnull = false; - return - heap_getsysattr(tup, b, attnum); } /* ---------------- diff --git a/src/backend/access/common/heapvalid.c b/src/backend/access/common/heapvalid.c index f0b4f3f3458..edb1e07187e 100644 --- a/src/backend/access/common/heapvalid.c +++ b/src/backend/access/common/heapvalid.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/access/common/Attic/heapvalid.c,v 1.13 1997/03/28 07:03:53 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/access/common/Attic/heapvalid.c,v 1.14 1997/08/24 23:07:26 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -22,6 +22,7 @@ #include <utils/rel.h> #include <utils/tqual.h> #include <storage/bufmgr.h> +#include <utils/builtins.h> /* ---------------- * heap_keytest @@ -53,7 +54,9 @@ heap_keytest(HeapTuple t, return (false); } - if (keys->sk_flags & SK_COMMUTE) + if (keys->sk_func == (func_ptr)oideq) /* optimization */ + test = (keys->sk_argument == atp); + else if (keys->sk_flags & SK_COMMUTE) test = (long) FMGR_PTR2(keys->sk_func, keys->sk_procedure, keys->sk_argument, atp); else |