Kill re-incarnated bug arround

vadim4o · vadim4o · commit b45128f1c394 · 1997-05-05T10:01:02.000Z
Assert ( --Vnpages &gt; 0 );
	and
Assert ( --Fnpages &gt; 0 );
diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.31 1997/04/30 03:05:43 vadim Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.32 1997/05/05 10:01:02 vadim Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1025,14 +1025,18 @@ vc_rpfheap (VRelStats *vacrelstats, Relation onerel,
 		dowrite = true;
 	    }
 	    else
+	    {
 		Assert ( isempty );
-	    Assert ( --Vnpages > 0 );
+	    }
+	    --Vnpages;
+	    Assert ( Vnpages > 0 );
 	    /* get prev reapped page from Vvpl */
 	    Vvplast = Vvpl->vpl_pgdesc[Vnpages - 1];
 	    Vblklast = Vvplast->vpd_blkno;
 	    if ( blkno == Fblklast )	/* this page in Fvpl too */
 	    {
-		Assert ( --Fnpages > 0 );
+		--Fnpages;
+		Assert ( Fnpages > 0 );
 		Assert ( Fvplast->vpd_nusd == 0 );
 		/* get prev reapped page from Fvpl */
 		Fvplast = Fvpl->vpl_pgdesc[Fnpages - 1];

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.31 1997/04/30 03:05:43 vadim Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.32 1997/05/05 10:01:02 vadim Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -1025,14 +1025,18 @@ vc_rpfheap (VRelStats *vacrelstats, Relation onerel,`
`1025`	`1025`	`dowrite = true;`
`1026`	`1026`	`}`
`1027`	`1027`	`else`
	`1028`	`+ {`
`1028`	`1029`	`Assert ( isempty );`
`1029`		`- Assert ( --Vnpages > 0 );`
	`1030`	`+ }`
	`1031`	`+ --Vnpages;`
	`1032`	`+ Assert ( Vnpages > 0 );`
`1030`	`1033`	`/* get prev reapped page from Vvpl */`
`1031`	`1034`	`Vvplast = Vvpl->vpl_pgdesc[Vnpages - 1];`
`1032`	`1035`	`Vblklast = Vvplast->vpd_blkno;`
`1033`	`1036`	`if ( blkno == Fblklast ) /* this page in Fvpl too */`
`1034`	`1037`	`{`
`1035`		`- Assert ( --Fnpages > 0 );`
	`1038`	`+ --Fnpages;`
	`1039`	`+ Assert ( Fnpages > 0 );`
`1036`	`1040`	`Assert ( Fvplast->vpd_nusd == 0 );`
`1037`	`1041`	`/* get prev reapped page from Fvpl */`
`1038`	`1042`	`Fvplast = Fvpl->vpl_pgdesc[Fnpages - 1];`