Update now that attcacheoff initial value is -1 always.

diff --git a/src/backend/access/common/heaptuple.c b/src/backend/access/common/heaptuple.c
index 2ab5673787d56e67574114d1d37c4093244eb69b..5c905275f397e52be0d4179c07e72ba456bc509a 100644 (file)
--- 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.34 1998/02/05 15:08:49 scrappy Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.35 1998/02/06 20:17:49 momjian Exp $
  *
  * NOTES
  *   The old interface functions have been converted to macros
@@ -428,7 +428,7 @@ nocachegetattr(HeapTuple tup,
 
 #if IN_MACRO
 /* This is handled in the macro */
-       if (att[attnum]->attcacheoff > 0)
+       if (att[attnum]->attcacheoff != -1)
        {
            return (Datum)
                fetchatt(&(att[attnum]),
@@ -512,7 +512,7 @@ nocachegetattr(HeapTuple tup,
     */
    if (!slow)
    {
-       if (att[attnum]->attcacheoff > 0)
+       if (att[attnum]->attcacheoff != -1)
        {
            return (Datum)fetchatt(&(att[attnum]),
                        tp + att[attnum]->attcacheoff);
@@ -650,7 +650,7 @@ nocachegetattr(HeapTuple tup,
            }
 
            /* If we know the next offset, we can skip the rest */
-           if (usecache && att[i]->attcacheoff > 0)
+           if (usecache && att[i]->attcacheoff != -1)
                off = att[i]->attcacheoff;
            else
            {

diff --git a/src/backend/access/common/indextuple.c b/src/backend/access/common/indextuple.c
index 569fe547bcf1b07194f8d7f3395316baca0a1fd2..d3fbe0fef4d42fad4cc14d9d4bbff23534831c52 100644 (file)
--- a/src/backend/access/common/indextuple.c
+++ b/src/backend/access/common/indextuple.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *   $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.25 1998/02/05 17:22:23 momjian Exp $
+ *   $Header: /cvsroot/pgsql/src/backend/access/common/indextuple.c,v 1.26 1998/02/06 20:17:51 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -181,7 +181,7 @@ nocache_index_getattr(IndexTuple tup,
        {
            return (Datum) fetchatt(&(att[0]), (char *) tup + data_off);
        }
-       if (att[attnum]->attcacheoff > 0)
+       if (att[attnum]->attcacheoff != -1)
        {
            return (Datum) fetchatt(&(att[attnum]),
                             (char *) tup + data_off +
@@ -254,7 +254,7 @@ nocache_index_getattr(IndexTuple tup,
 
    if (!slow)
    {
-       if (att[attnum]->attcacheoff > 0)
+       if (att[attnum]->attcacheoff != -1)
        {
            return (Datum) fetchatt(&(att[attnum]),
                             tp + att[attnum]->attcacheoff);
@@ -290,7 +290,7 @@ nocache_index_getattr(IndexTuple tup,
 
        att[0]->attcacheoff = 0;
 
-       while (att[j]->attcacheoff > 0)
+       while (att[j]->attcacheoff != -1)
            j++;
 
        if (!VARLENA_FIXED_SIZE(att[j-1]))
@@ -366,7 +366,7 @@ nocache_index_getattr(IndexTuple tup,
            }
 
            /* If we know the next offset, we can skip the rest */
-           if (usecache && att[i]->attcacheoff > 0)
+           if (usecache && att[i]->attcacheoff != -1)
                off = att[i]->attcacheoff;
            else
            {

diff --git a/src/include/access/heapam.h b/src/include/access/heapam.h
index 0b7fb5e373fb2a701d7f62e9f5cf46fc65f84018..ad1114c5bf03663c0a62162734e8b0b17e87830e 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.28 1998/02/01 05:38:38 momjian Exp $
+ * $Id: heapam.h,v 1.29 1998/02/06 20:18:00 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -95,7 +95,7 @@ typedef HeapAccessStatisticsData *HeapAccessStatistics;
        ((isnull) ? (*(isnull) = false) : (dummyret)NULL), \
        HeapTupleNoNulls(tup) ? \
        ( \
-           ((tupleDesc)->attrs[(attnum)-1]->attcacheoff > 0 || \
+           ((tupleDesc)->attrs[(attnum)-1]->attcacheoff != -1 || \
             (attnum) == 1) ? \
            ( \
                (Datum)fetchatt(&((tupleDesc)->attrs[(attnum)-1]), \

diff --git a/src/include/access/itup.h b/src/include/access/itup.h
index 5b80a6f320f77517417b5158c150dc6bae0e81be..b230ab2265ebb698fad1630db4e1ef96b1dd7364 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.11 1998/02/01 05:38:39 momjian Exp $
+ * $Id: itup.h,v 1.12 1998/02/06 20:18:01 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -123,7 +123,7 @@ typedef struct PredInfo
        *(isnull) = false, \
        IndexTupleNoNulls(tup) ? \
        ( \
-           ((tupleDesc)->attrs[(attnum)-1]->attcacheoff > 0 || \
+           ((tupleDesc)->attrs[(attnum)-1]->attcacheoff != -1 || \
             (attnum) == 1) ? \
            ( \
                (Datum)fetchatt(&((tupleDesc)->attrs[(attnum)-1]), \