Reduce size of inlining.

diff --git a/src/include/access/heapam.h b/src/include/access/heapam.h
index 4e5fe7ca5b75ea60486c2eb7262e7b3ded763647..0b7fb5e373fb2a701d7f62e9f5cf46fc65f84018 100644 (file)
--- 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)) \
                ) \
                : \
                ( \

diff --git a/src/include/access/itup.h b/src/include/access/itup.h
index 1ace51fa44fe1a6d6f620542570f012af0396580..5b80a6f320f77517417b5158c150dc6bae0e81be 100644 (file)
--- a/src/include/access/itup.h
+++ b/src/include/access/itup.h
@@ -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) \
-                       ) \
-                       : \
-                       ( \
-                               ((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)) \
+                                       (char *) (tup) + \
+                                       ( \
+                                               IndexTupleHasMinHeader(tup) ? \
+                                                       sizeof (*(tup)) \
+                                               : \
+                                                       IndexInfoFindDataOffset((tup)->t_info) \
+                                       ) + \
+                                       ( \
+                                               ((attnum) != 1) ? \
+                                                       (tupleDesc)->attrs[(attnum)-1]->attcacheoff \
+                                               : \
+                                                       0 \
+                                       ) \
                                ) \
                        ) \
+                       : \
+                               nocache_index_getattr((tup), (attnum), (tupleDesc), (isnull)) \
                ) \
                : \
                ( \

diff --git a/src/include/access/tupmacs.h b/src/include/access/tupmacs.h
index 39d3004d5619cf3b1809fef1fb30012dfa979a17..c7711f5333a0e354d4f3cfd5d04502ed7e2675cb 100644 (file)
--- a/src/include/access/tupmacs.h
+++ b/src/include/access/tupmacs.h
@@ -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