Update now that attcacheoff initial value is -1 always.

bmomjian · bmomjian · commit ec9d5d71ec4c · 1998-02-06T20:18:01.000Z
diff --git 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
@@ -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
@@ -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
@@ -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]), \

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.34 1998/02/05 15:08:49 scrappy Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/access/common/heaptuple.c,v 1.35 1998/02/06 20:17:49 momjian Exp $`
`12`	`12`	`*`
`13`	`13`	`* NOTES`
`14`	`14`	`* The old interface functions have been converted to macros`
`@@ -428,7 +428,7 @@ nocachegetattr(HeapTuple tup,`
`428`	`428`
`429`	`429`	`#if IN_MACRO`
`430`	`430`	`/* This is handled in the macro */`
`431`		`- if (att[attnum]->attcacheoff > 0)`
	`431`	`+ if (att[attnum]->attcacheoff != -1)`
`432`	`432`	`{`
`433`	`433`	`return (Datum)`
`434`	`434`	`fetchatt(&(att[attnum]),`
`@@ -512,7 +512,7 @@ nocachegetattr(HeapTuple tup,`
`512`	`512`	`*/`
`513`	`513`	`if (!slow)`
`514`	`514`	`{`
`515`		`- if (att[attnum]->attcacheoff > 0)`
	`515`	`+ if (att[attnum]->attcacheoff != -1)`
`516`	`516`	`{`
`517`	`517`	`return (Datum)fetchatt(&(att[attnum]),`
`518`	`518`	`tp + att[attnum]->attcacheoff);`
`@@ -650,7 +650,7 @@ nocachegetattr(HeapTuple tup,`
`650`	`650`	`}`
`651`	`651`
`652`	`652`	`/* If we know the next offset, we can skip the rest */`
`653`		`- if (usecache && att[i]->attcacheoff > 0)`
	`653`	`+ if (usecache && att[i]->attcacheoff != -1)`
`654`	`654`	`off = att[i]->attcacheoff;`
`655`	`655`	`else`
`656`	`656`	`{`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`*`
`7`	`7`	`* Copyright (c) 1994, Regents of the University of California`
`8`	`8`	`*`
`9`		`- * $Id: heapam.h,v 1.28 1998/02/01 05:38:38 momjian Exp $`
	`9`	`+ * $Id: heapam.h,v 1.29 1998/02/06 20:18:00 momjian Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -95,7 +95,7 @@ typedef HeapAccessStatisticsData *HeapAccessStatistics;`
`95`	`95`	`((isnull) ? (*(isnull) = false) : (dummyret)NULL), \`
`96`	`96`	`HeapTupleNoNulls(tup) ? \`
`97`	`97`	`( \`
`98`		`- ((tupleDesc)->attrs[(attnum)-1]->attcacheoff > 0 \|\| \`
	`98`	`+ ((tupleDesc)->attrs[(attnum)-1]->attcacheoff != -1 \|\| \`
`99`	`99`	`(attnum) == 1) ? \`
`100`	`100`	`( \`
`101`	`101`	`(Datum)fetchatt(&((tupleDesc)->attrs[(attnum)-1]), \`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`*`
`7`	`7`	`* Copyright (c) 1994, Regents of the University of California`
`8`	`8`	`*`
`9`		`- * $Id: itup.h,v 1.11 1998/02/01 05:38:39 momjian Exp $`
	`9`	`+ * $Id: itup.h,v 1.12 1998/02/06 20:18:01 momjian Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -123,7 +123,7 @@ typedef struct PredInfo`
`123`	`123`	`*(isnull) = false, \`
`124`	`124`	`IndexTupleNoNulls(tup) ? \`
`125`	`125`	`( \`
`126`		`- ((tupleDesc)->attrs[(attnum)-1]->attcacheoff > 0 \|\| \`
	`126`	`+ ((tupleDesc)->attrs[(attnum)-1]->attcacheoff != -1 \|\| \`
`127`	`127`	`(attnum) == 1) ? \`
`128`	`128`	`( \`
`129`	`129`	`(Datum)fetchatt(&((tupleDesc)->attrs[(attnum)-1]), \`