Reduce size of inlining.

This commit is contained in:
Bruce Momjian 1998-02-01 05:38:40 +00:00
parent 1af818b8bf
commit d8ddb10f51
3 changed files with 48 additions and 40 deletions

View File

@ -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) \
(char *) (tup) + (tup)->t_hoff + \
( \
((attnum) != 1) ? \
(tupleDesc)->attrs[(attnum)-1]->attcacheoff \
: \
0 \
) \
) \
) \
: \
( \
((attnum)-1 == 0) ? \
( \
(Datum)fetchatt(&((tupleDesc)->attrs[0]), (char *) (tup) + (tup)->t_hoff) \
) \
: \
( \
nocachegetattr((tup), (attnum), (tupleDesc), (isnull)) \
) \
) \
nocachegetattr((tup), (attnum), (tupleDesc), (isnull)) \
) \
: \
( \

View File

@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
* $Id: itup.h,v 1.10 1998/01/31 04:39:23 momjian Exp $
* $Id: itup.h,v 1.11 1998/02/01 05:38:39 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -123,28 +123,27 @@ typedef struct PredInfo
*(isnull) = false, \
IndexTupleNoNulls(tup) ? \
( \
((tupleDesc)->attrs[(attnum)-1]->attcacheoff > 0) ? \
((tupleDesc)->attrs[(attnum)-1]->attcacheoff > 0 || \
(attnum) == 1) ? \
( \
(Datum)fetchatt(&((tupleDesc)->attrs[(attnum)-1]), \
(char *) (tup) + \
(IndexTupleHasMinHeader(tup) ? sizeof (*(tup)) : \
IndexInfoFindDataOffset((tup)->t_info)) + \
(tupleDesc)->attrs[(attnum)-1]->attcacheoff) \
(char *) (tup) + \
( \
IndexTupleHasMinHeader(tup) ? \
sizeof (*(tup)) \
: \
IndexInfoFindDataOffset((tup)->t_info) \
) + \
( \
((attnum) != 1) ? \
(tupleDesc)->attrs[(attnum)-1]->attcacheoff \
: \
0 \
) \
) \
) \
: \
( \
((attnum)-1 == 0) ? \
( \
(Datum)fetchatt(&((tupleDesc)->attrs[0]), \
(char *) (tup) + \
(IndexTupleHasMinHeader(tup) ? sizeof (*(tup)) : \
IndexInfoFindDataOffset((tup)->t_info))) \
) \
: \
( \
nocache_index_getattr((tup), (attnum), (tupleDesc), (isnull)) \
) \
) \
nocache_index_getattr((tup), (attnum), (tupleDesc), (isnull)) \
) \
: \
( \

View File

@ -6,7 +6,7 @@
*
* Copyright (c) 1994, Regents of the University of California
*
* $Id: tupmacs.h,v 1.2 1997/09/07 04:56:17 momjian Exp $
* $Id: tupmacs.h,v 1.3 1998/02/01 05:38:40 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@ -44,12 +44,22 @@
* I would eliminate attbyval altogether, but I don't know how. -BRYANH.
*/
#define fetchatt(A, T) \
((*(A))->attbyval && (*(A))->attlen != -1 \
? ((*(A))->attlen > sizeof(int16) \
? (char *) (long) *((int32 *)(T)) \
: ((*(A))->attlen < sizeof(int16) \
? (char *) (long) *((char *)(T)) \
: (char *) (long) *((int16 *)(T)))) \
: (char *) (T))
( \
(*(A))->attbyval && (*(A))->attlen != -1 ? \
( \
(*(A))->attlen > sizeof(int16) ? \
( \
(char *) (long) *((int32 *)(T)) \
) \
: \
( \
(*(A))->attlen < sizeof(int16) ? \
(char *) (long) *((char *)(T)) \
: \
(char *) (long) *((int16 *)(T))) \
) \
: \
(char *) (T) \
)
#endif