diff options
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/access/heapam.h | 15 | ||||
| -rw-r--r-- | src/include/access/itup.h | 15 | ||||
| -rw-r--r-- | src/include/catalog/pg_type.h | 3 |
3 files changed, 9 insertions, 24 deletions
diff --git a/src/include/access/heapam.h b/src/include/access/heapam.h index de4f2934853..db40344dc46 100644 --- a/src/include/access/heapam.h +++ b/src/include/access/heapam.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: heapam.h,v 1.58 2000/11/21 21:16:05 petere Exp $ + * $Id: heapam.h,v 1.59 2000/11/30 18:38:46 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -107,18 +107,11 @@ extern Datum nocachegetattr(HeapTuple tup, int attnum, ((isnull) ? (*(isnull) = false) : (dummyret)NULL), \ HeapTupleNoNulls(tup) ? \ ( \ - ((tupleDesc)->attrs[(attnum)-1]->attcacheoff != -1 || \ - (attnum) == 1) ? \ + (tupleDesc)->attrs[(attnum)-1]->attcacheoff >= 0 ? \ ( \ - (Datum)fetchatt(&((tupleDesc)->attrs[(attnum)-1]), \ + (Datum) fetchatt(&((tupleDesc)->attrs[(attnum)-1]), \ (char *) (tup)->t_data + (tup)->t_data->t_hoff + \ - ( \ - ((attnum) != 1) ? \ - (tupleDesc)->attrs[(attnum)-1]->attcacheoff \ - : \ - 0 \ - ) \ - ) \ + (tupleDesc)->attrs[(attnum)-1]->attcacheoff) \ ) \ : \ nocachegetattr((tup), (attnum), (tupleDesc), (isnull)) \ diff --git a/src/include/access/itup.h b/src/include/access/itup.h index a5047729616..18639eb7f20 100644 --- a/src/include/access/itup.h +++ b/src/include/access/itup.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: itup.h,v 1.25 2000/07/14 22:17:53 tgl Exp $ + * $Id: itup.h,v 1.26 2000/11/30 18:38:46 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -109,24 +109,17 @@ typedef RetrieveIndexResultData *RetrieveIndexResult; *(isnull) = false, \ IndexTupleNoNulls(tup) ? \ ( \ - ((tupleDesc)->attrs[(attnum)-1]->attcacheoff != -1 || \ - (attnum) == 1) ? \ + (tupleDesc)->attrs[(attnum)-1]->attcacheoff >= 0 ? \ ( \ - (Datum)fetchatt(&((tupleDesc)->attrs[(attnum)-1]), \ + (Datum) fetchatt(&((tupleDesc)->attrs[(attnum)-1]), \ (char *) (tup) + \ ( \ IndexTupleHasMinHeader(tup) ? \ sizeof (*(tup)) \ : \ IndexInfoFindDataOffset((tup)->t_info) \ - ) + \ - ( \ - ((attnum) != 1) ? \ - (tupleDesc)->attrs[(attnum)-1]->attcacheoff \ - : \ - 0 \ - ) \ ) \ + + (tupleDesc)->attrs[(attnum)-1]->attcacheoff) \ ) \ : \ nocache_index_getattr((tup), (attnum), (tupleDesc), (isnull)) \ diff --git a/src/include/catalog/pg_type.h b/src/include/catalog/pg_type.h index 48cf26d172a..f9f7372fd78 100644 --- a/src/include/catalog/pg_type.h +++ b/src/include/catalog/pg_type.h @@ -8,7 +8,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pg_type.h,v 1.97 2000/08/21 04:48:52 tgl Exp $ + * $Id: pg_type.h,v 1.98 2000/11/30 18:38:47 tgl Exp $ * * NOTES * the genbki.sh script reads this file and generates .bki @@ -415,7 +415,6 @@ DATA(insert OID = 1700 ( numeric PGUID -1 -1 f b t \054 0 0 numeric_in nume DESCR("numeric(precision, decimal), arbitrary precision number"); #define NUMERICOID 1700 -#define VARLENA_FIXED_SIZE(attr) ((attr)->atttypid == BPCHAROID && (attr)->atttypmod > 0) /* * prototypes for functions in pg_type.c |