Update RecentXmin

knizhnik · knizhnik · commit adbbd196e8bb · 2015-09-23T15:54:19.000+03:00
diff --git a/contrib/pg_xtm/dtmd/Makefile b/contrib/pg_xtm/dtmd/Makefile
@@ -1,5 +1,5 @@
 CC=gcc
-CFLAGS=-g -Wall -Iinclude -D_LARGEFILE64_SOURCE -DDEBUG
+CFLAGS=-g -Wall -Iinclude -D_LARGEFILE64_SOURCE # -DDEBUG
 LIBUV_PREFIX=$(HOME)/libuv-build
 LIBUV_CFLAGS=-I"$(LIBUV_PREFIX)/include" -L"$(LIBUV_PREFIX)/lib"
 LIBUV_LDFLAGS=-luv -pthread
diff --git a/contrib/pg_xtm/pg_dtm.c b/contrib/pg_xtm/pg_dtm.c
@@ -183,9 +183,6 @@ static void DtmMergeSnapshots(Snapshot dst, Snapshot src)
 		}
 	}
 	dst->xcnt = j;
-    if (RecentXmin > dst->xmin) { 
-        RecentXmin = dst->xmin;
-    }
 	DumpSnapshot(dst, "merged");
 }
 
@@ -207,6 +204,9 @@ static void DtmUpdateRecentXmin(void)
 		if (TransactionIdFollows(RecentGlobalXmin, xmin)) {
 			RecentGlobalXmin = xmin;
 		}
+		if (TransactionIdFollows(RecentXmin, xmin)) {
+			RecentXmin = xmin;
+		}
 	}
 }
 
diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c
@@ -7611,10 +7611,10 @@ heap_xlog_visible(XLogReaderState *record)
 		 * we did for the heap page.  If this results in a dropped bit, no
 		 * real harm is done; and the next VACUUM will fix it.
 		 */
-		if (lsn > PageGetLSN(vmpage))
+		if (lsn > PageGetLSN(vmpage)) { 
 			visibilitymap_set(reln, blkno, InvalidBuffer, lsn, vmbuffer,
 							  xlrec->cutoff_xid);
-
+        }
 		ReleaseBuffer(vmbuffer);
 		FreeFakeRelcacheEntry(reln);
 	}
diff --git a/src/backend/access/heap/pruneheap.c b/src/backend/access/heap/pruneheap.c
@@ -98,7 +98,7 @@ heap_page_prune_opt(Relation relation, Buffer buffer)
 		OldestXmin = RecentGlobalXmin;
 	else
 		OldestXmin = RecentGlobalDataXmin;
-
+    fprintf(stderr, "PRUNEHEAP: xmin=%d\n", OldestXmin);
 	Assert(TransactionIdIsValid(OldestXmin));
 
 	/*
diff --git a/src/backend/access/heap/visibilitymap.c b/src/backend/access/heap/visibilitymap.c
@@ -85,6 +85,7 @@
 #include "access/heapam_xlog.h"
 #include "access/visibilitymap.h"
 #include "access/xlog.h"
+#include "utils/snapmgr.h"
 #include "miscadmin.h"
 #include "storage/bufmgr.h"
 #include "storage/lmgr.h"
@@ -253,6 +254,9 @@ visibilitymap_set(Relation rel, BlockNumber heapBlk, Buffer heapBuf,
 	Page		page;
 	char	   *map;
 
+    fprintf(stderr, "Visibilitymap cutoff %d, RecentLocalDataXmin=%d\n", cutoff_xid, RecentGlobalDataXmin);
+    return;
+
 #ifdef TRACE_VISIBILITYMAP
 	elog(DEBUG1, "vm_set %s %d", RelationGetRelationName(rel), heapBlk);
 #endif

Original file line number	Diff line number	Diff line change
`@@ -183,9 +183,6 @@ static void DtmMergeSnapshots(Snapshot dst, Snapshot src)`
`183`	`183`	`}`
`184`	`184`	`}`
`185`	`185`	`dst->xcnt = j;`
`186`		`- if (RecentXmin > dst->xmin) {`
`187`		`- RecentXmin = dst->xmin;`
`188`		`- }`
`189`	`186`	`DumpSnapshot(dst, "merged");`
`190`	`187`	`}`
`191`	`188`
`@@ -207,6 +204,9 @@ static void DtmUpdateRecentXmin(void)`
`207`	`204`	`if (TransactionIdFollows(RecentGlobalXmin, xmin)) {`
`208`	`205`	`RecentGlobalXmin = xmin;`
`209`	`206`	`}`
	`207`	`+ if (TransactionIdFollows(RecentXmin, xmin)) {`
	`208`	`+ RecentXmin = xmin;`
	`209`	`+ }`
`210`	`210`	`}`
`211`	`211`	`}`
`212`	`212`