Fill subxip array

knizhnik · knizhnik · commit 15a412f90fcc · 2015-09-12T14:45:27.000+03:00
diff --git a/contrib/pg_xtm/pg_dtm.c b/contrib/pg_xtm/pg_dtm.c
@@ -65,9 +65,11 @@ static void DtmCopySnapshot(Snapshot dst, Snapshot src)
 {
     DtmInitSnapshot(dst);
     memcpy(dst->xip, src->xip, src->xcnt*sizeof(TransactionId));
+    memcpy(dst->subxip, src->xip, src->xcnt*sizeof(TransactionId));
     dst->xmax = src->xmax;
     dst->xmin = src->xmin;
     dst->xcnt = src->xcnt;
+    dst->subxcnt = src->xcnt;
     dst->curcid = src->curcid;
 }
 
diff --git a/src/backend/access/transam/twophase.c b/src/backend/access/transam/twophase.c
@@ -659,7 +659,7 @@ AllocGXid(TransactionId xid)
 	gxact->prepare_lsn = 0;
 	gxact->owner = 0;
 	gxact->locking_backend = MyBackendId;
-	gxact->valid = false;
+	gxact->valid = true;
 	strcpy(gxact->gid, gid);
 
 	/* And insert it into the active array */
@@ -677,7 +677,7 @@ AllocGXid(TransactionId xid)
 	return gxact->pgprocno;
 }
 
-void
+bool
 RemoveGXid(TransactionId xid)
 {
 	int			i;
@@ -699,12 +699,13 @@ RemoveGXid(TransactionId xid)
 			TwoPhaseState->prepXacts[i]->next = TwoPhaseState->freeGXacts;
 			TwoPhaseState->freeGXacts = TwoPhaseState->prepXacts[i];
 
-            break;
+            LWLockRelease(TwoPhaseStateLock);
+            return true;
 		}
 	}
 
 	LWLockRelease(TwoPhaseStateLock);
-    
+    return false;
 }
 
 /*
diff --git a/src/backend/storage/ipc/procarray.c b/src/backend/storage/ipc/procarray.c
@@ -3869,7 +3869,7 @@ KnownAssignedXidsReset(void)
 
 static bool TransactionIsStillInProgress(TransactionId xid, Snapshot snapshot)
 {
-    return (bsearch(&xid, snapshot->xip, snapshot->xcnt, sizeof(TransactionId), xidComparator) != NULL) || (xid > snapshot->xmax);
+    return (xid > snapshot->xmax) || (bsearch(&xid, snapshot->xip, snapshot->xcnt, sizeof(TransactionId), xidComparator) != NULL);
 }
 
 
@@ -3895,13 +3895,14 @@ void VacuumProcArray(Snapshot snapshot)
             nInProgress += 1;
             continue;
         }
-        RemoveGXid(pxid);
-        nCompleted += 1;
-        memmove(&arrayP->pgprocnos[i], &arrayP->pgprocnos[i + 1],
-                (arrayP->numProcs - i - 1) * sizeof(int));
-        arrayP->pgprocnos[arrayP->numProcs - 1] = -1;		/* for debugging */
-        arrayP->numProcs--;
+        if (RemoveGXid(pxid)) { 
+            nCompleted += 1;
+            memmove(&arrayP->pgprocnos[i], &arrayP->pgprocnos[i + 1],
+                    (arrayP->numProcs - i - 1) * sizeof(int));
+            arrayP->pgprocnos[arrayP->numProcs - 1] = -1;		/* for debugging */
+            arrayP->numProcs--;
+        }
     }
 	LWLockRelease(ProcArrayLock);
-    //elog(WARNING, "VacuumProcArray: %d in progress, %d completed, %d total\n", nInProgress, nCompleted, arrayP->numProcs);
+    elog(WARNING, "VacuumProcArray: %d in progress, %d completed, %d total\n", nInProgress, nCompleted, arrayP->numProcs);
 }
diff --git a/src/include/access/twophase.h b/src/include/access/twophase.h
@@ -59,6 +59,6 @@ extern void FinishPreparedTransaction(const char *gid, bool isCommit);
 extern const char* GetLockedGlobalTransactionId(void);
 
 extern int  AllocGXid(TransactionId xid);
-extern void RemoveGXid(TransactionId xid);
+extern bool RemoveGXid(TransactionId xid);
 
 #endif   /* TWOPHASE_H */

Original file line number	Diff line number	Diff line change
`@@ -65,9 +65,11 @@ static void DtmCopySnapshot(Snapshot dst, Snapshot src)`
`65`	`65`	`{`
`66`	`66`	`DtmInitSnapshot(dst);`
`67`	`67`	`memcpy(dst->xip, src->xip, src->xcnt*sizeof(TransactionId));`
	`68`	`+ memcpy(dst->subxip, src->xip, src->xcnt*sizeof(TransactionId));`
`68`	`69`	`dst->xmax = src->xmax;`
`69`	`70`	`dst->xmin = src->xmin;`
`70`	`71`	`dst->xcnt = src->xcnt;`
	`72`	`+ dst->subxcnt = src->xcnt;`
`71`	`73`	`dst->curcid = src->curcid;`
`72`	`74`	`}`
`73`	`75`
Original file line number	Diff line number	Diff line change
`@@ -659,7 +659,7 @@ AllocGXid(TransactionId xid)`
`659`	`659`	`gxact->prepare_lsn = 0;`
`660`	`660`	`gxact->owner = 0;`
`661`	`661`	`gxact->locking_backend = MyBackendId;`
`662`		`- gxact->valid = false;`
	`662`	`+ gxact->valid = true;`
`663`	`663`	`strcpy(gxact->gid, gid);`
`664`	`664`
`665`	`665`	`/* And insert it into the active array */`
`@@ -677,7 +677,7 @@ AllocGXid(TransactionId xid)`
`677`	`677`	`return gxact->pgprocno;`
`678`	`678`	`}`
`679`	`679`
`680`		`-void`
	`680`	`+bool`
`681`	`681`	`RemoveGXid(TransactionId xid)`
`682`	`682`	`{`
`683`	`683`	`int i;`
`@@ -699,12 +699,13 @@ RemoveGXid(TransactionId xid)`
`699`	`699`	`TwoPhaseState->prepXacts[i]->next = TwoPhaseState->freeGXacts;`
`700`	`700`	`TwoPhaseState->freeGXacts = TwoPhaseState->prepXacts[i];`
`701`	`701`
`702`		`- break;`
	`702`	`+ LWLockRelease(TwoPhaseStateLock);`
	`703`	`+ return true;`
`703`	`704`	`}`
`704`	`705`	`}`
`705`	`706`
`706`	`707`	`LWLockRelease(TwoPhaseStateLock);`
`707`		`-`
	`708`	`+ return false;`
`708`	`709`	`}`
`709`	`710`
`710`	`711`	`/*`
Original file line number	Diff line number	Diff line change
`@@ -3869,7 +3869,7 @@ KnownAssignedXidsReset(void)`
`3869`	`3869`
`3870`	`3870`	`static bool TransactionIsStillInProgress(TransactionId xid, Snapshot snapshot)`
`3871`	`3871`	`{`
`3872`		`- return (bsearch(&xid, snapshot->xip, snapshot->xcnt, sizeof(TransactionId), xidComparator) != NULL) \|\| (xid > snapshot->xmax);`
	`3872`	`+ return (xid > snapshot->xmax) \|\| (bsearch(&xid, snapshot->xip, snapshot->xcnt, sizeof(TransactionId), xidComparator) != NULL);`
`3873`	`3873`	`}`
`3874`	`3874`
`3875`	`3875`
`@@ -3895,13 +3895,14 @@ void VacuumProcArray(Snapshot snapshot)`
`3895`	`3895`	`nInProgress += 1;`
`3896`	`3896`	`continue;`
`3897`	`3897`	`}`
`3898`		`- RemoveGXid(pxid);`
`3899`		`- nCompleted += 1;`
`3900`		`- memmove(&arrayP->pgprocnos[i], &arrayP->pgprocnos[i + 1],`
`3901`		`- (arrayP->numProcs - i - 1) * sizeof(int));`
`3902`		`- arrayP->pgprocnos[arrayP->numProcs - 1] = -1; /* for debugging */`
`3903`		`- arrayP->numProcs--;`
	`3898`	`+ if (RemoveGXid(pxid)) {`
	`3899`	`+ nCompleted += 1;`
	`3900`	`+ memmove(&arrayP->pgprocnos[i], &arrayP->pgprocnos[i + 1],`
	`3901`	`+ (arrayP->numProcs - i - 1) * sizeof(int));`
	`3902`	`+ arrayP->pgprocnos[arrayP->numProcs - 1] = -1; /* for debugging */`
	`3903`	`+ arrayP->numProcs--;`
	`3904`	`+ }`
`3904`	`3905`	`}`
`3905`	`3906`	`LWLockRelease(ProcArrayLock);`
`3906`		`- //elog(WARNING, "VacuumProcArray: %d in progress, %d completed, %d total\n", nInProgress, nCompleted, arrayP->numProcs);`
	`3907`	`+ elog(WARNING, "VacuumProcArray: %d in progress, %d completed, %d total\n", nInProgress, nCompleted, arrayP->numProcs);`
`3907`	`3908`	`}`