diff options
Diffstat (limited to 'src/include/access/heapam.h')
| -rw-r--r-- | src/include/access/heapam.h | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/src/include/access/heapam.h b/src/include/access/heapam.h index 4e5fe7ca5b7..0b7fb5e373f 100644 --- a/src/include/access/heapam.h +++ b/src/include/access/heapam.h @@ -6,7 +6,7 @@ * * Copyright (c) 1994, Regents of the University of California * - * $Id: heapam.h,v 1.27 1998/01/31 04:39:21 momjian Exp $ + * $Id: heapam.h,v 1.28 1998/02/01 05:38:38 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -95,22 +95,21 @@ typedef HeapAccessStatisticsData *HeapAccessStatistics; ((isnull) ? (*(isnull) = false) : (dummyret)NULL), \ HeapTupleNoNulls(tup) ? \ ( \ - ((tupleDesc)->attrs[(attnum)-1]->attcacheoff > 0) ? \ + ((tupleDesc)->attrs[(attnum)-1]->attcacheoff > 0 || \ + (attnum) == 1) ? \ ( \ (Datum)fetchatt(&((tupleDesc)->attrs[(attnum)-1]), \ - (char *) (tup) + (tup)->t_hoff + (tupleDesc)->attrs[(attnum)-1]->attcacheoff) \ - ) \ - : \ - ( \ - ((attnum)-1 == 0) ? \ - ( \ - (Datum)fetchatt(&((tupleDesc)->attrs[0]), (char *) (tup) + (tup)->t_hoff) \ - ) \ - : \ - ( \ - nocachegetattr((tup), (attnum), (tupleDesc), (isnull)) \ + (char *) (tup) + (tup)->t_hoff + \ + ( \ + ((attnum) != 1) ? \ + (tupleDesc)->attrs[(attnum)-1]->attcacheoff \ + : \ + 0 \ + ) \ ) \ ) \ + : \ + nocachegetattr((tup), (attnum), (tupleDesc), (isnull)) \ ) \ : \ ( \ |