Commit9c4eceb

committed

Fix for vacuum updating problem.

1 parent5fbbd36 commit9c4ecebCopy full SHA for 9c4eceb

File tree

+14

-8

lines changed

+14

-8

lines changed

Lines changed: 4 additions & 5 deletions

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.70 1998/08/1902:01:56 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.71 1998/08/1915:47:35 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -39,6 +39,7 @@`
`39`	`39`	`#include"storage/bufpage.h"`
`40`	`40`	`#include"storage/shmem.h"`
`41`	`41`	`#include"storage/smgr.h"`
	`42`	`+#include"storage/itemptr.h"`
`42`	`43`	`#include"storage/lmgr.h"`
`43`	`44`	`#include"utils/builtins.h"`
`44`	`45`	`#include"utils/inval.h"`
`@@ -1883,13 +1884,11 @@ vc_updstats(Oid relid, int npages, int ntups, bool hasindex, VRelStats *vacrelst`
`1883`	`1884`	`}`
`1884`	`1885`
`1885`	`1886`	`/* XXX -- after write, should invalidate relcache in other backends */`
`1886`		`-#ifdefNOT_USED`
`1887`		`-WriteNoReleaseBuffer(&rtup->t_ctid);/* heap_endscan release scan' buffers ? */`
`1888`		`-#endif`
	`1887`	`+WriteNoReleaseBuffer(ItemPointerGetBlockNumber(&rtup->t_ctid));`
`1889`	`1888`
`1890`	`1889`	`/*`
`1891`	`1890`	`* invalidating system relations confuses the function cache of`
`1892`		`- * pg_operator and pg_opclass`
	`1891`	`+ * pg_operator and pg_opclass, bjm`
`1893`	`1892`	`*/`
`1894`	`1893`	`if (!IsSystemRelationName(pgcform->relname.data))`
`1895`	`1894`	`RelationInvalidateHeapTuple(rd,rtup);`

Lines changed: 10 additions & 3 deletions

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/executor/nodeIndexscan.c,v 1.24 1998/08/1902:02:02 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/executor/nodeIndexscan.c,v 1.25 1998/08/1915:47:36 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -129,7 +129,7 @@ IndexNext(IndexScan *node)`
`129`	`129`	`{`
`130`	`130`	`boolprev_matches= false;`
`131`	`131`	`intprev_index;`
`132`		`-`
	`132`	`+`
`133`	`133`	`/* ----------------`
`134`	`134`	`*store the scanned tuple in the scan tuple slot of`
`135`	`135`	`*the scan state. Eventually we will only do this and not`
`@@ -142,10 +142,17 @@ IndexNext(IndexScan *node)`
`142`	`142`	`slot,/* slot to store in */`
`143`	`143`	`buffer,/* buffer associated with tuple */`
`144`	`144`	`false);/* don't pfree */`
`145`		`-`
	`145`	`+`
	`146`	`+/*`
	`147`	`+ *We must check to see if the current tuple would have been`
	`148`	`+ *matched by an earlier index, so we don't double report it.`
	`149`	`+ *We do this by passing the tuple through ExecQual and look`
	`150`	`+ *for failure with all previous qualifications.`
	`151`	`+ */`
`146`	`152`	`for (prev_index=0;prev_index<indexstate->iss_IndexPtr;`
`147`	`153`	`prev_index++)`
`148`	`154`	`{`
	`155`	`+scanstate->cstate.cs_ExprContext->ecxt_scantuple=slot;`
`149`	`156`	`if (ExecQual(nth(prev_index,node->indxqual),`
`150`	`157`	`scanstate->cstate.cs_ExprContext))`
`151`	`158`	`{`

Comments

(0)