merge

kelvich · kelvich · commit 05af1db2fee3 · 2016-10-06T14:52:42.000+03:00
diff --git a/contrib/mmts/pglogical_proto.c b/contrib/mmts/pglogical_proto.c
@@ -77,12 +77,12 @@ pglogical_write_rel(StringInfo out, PGLogicalOutputData *data, Relation rel)
 	Oid         relid;
 
 	if (MtmTransactionSnapshot(MtmCurrentXid) == INVALID_CSN) {
-		MTM_LOG1("%d: pglogical_write_message filtered", MyProcPid);
+		MTM_LOG2("%d: pglogical_write_message filtered", MyProcPid);
 		return;
 	}
 
 	if (DDLInProress) {
-		MTM_LOG1("%d: pglogical_write_message filtered DDLInProress", MyProcPid);
+		MTM_LOG2("%d: pglogical_write_message filtered DDLInProress", MyProcPid);
 		return;
 	}
 
@@ -141,7 +141,7 @@ pglogical_write_message(StringInfo out,
 	{
 		if (MtmTransactionSnapshot(MtmCurrentXid) == INVALID_CSN)
 		{
-			MTM_LOG1("%d: pglogical_write_message filtered", MyProcPid);
+			MTM_LOG2("%d: pglogical_write_message filtered", MyProcPid);
 			return;
 		}
 		DDLInProress = true;
@@ -263,12 +263,12 @@ pglogical_write_insert(StringInfo out, PGLogicalOutputData *data,
 						Relation rel, HeapTuple newtuple)
 {
 	if (MtmTransactionSnapshot(MtmCurrentXid) == INVALID_CSN){
-		MTM_LOG1("%d: pglogical_write_insert filtered", MyProcPid);
+		MTM_LOG2("%d: pglogical_write_insert filtered", MyProcPid);
 		return;
 	}
 
 	if (DDLInProress) {
-		MTM_LOG1("%d: pglogical_write_insert filtered DDLInProress", MyProcPid);
+		MTM_LOG2("%d: pglogical_write_insert filtered DDLInProress", MyProcPid);
 		return;
 	}
 
@@ -286,12 +286,12 @@ pglogical_write_update(StringInfo out, PGLogicalOutputData *data,
 						Relation rel, HeapTuple oldtuple, HeapTuple newtuple)
 {
 	if (MtmTransactionSnapshot(MtmCurrentXid) == INVALID_CSN){
-		MTM_LOG1("%d: pglogical_write_update filtered", MyProcPid);
+		MTM_LOG2("%d: pglogical_write_update filtered", MyProcPid);
 		return;
 	}
 
 	if (DDLInProress) {
-		MTM_LOG1("%d: pglogical_write_update filtered DDLInProress", MyProcPid);
+		MTM_LOG2("%d: pglogical_write_update filtered DDLInProress", MyProcPid);
 		return;
 	}
 
@@ -319,12 +319,12 @@ pglogical_write_delete(StringInfo out, PGLogicalOutputData *data,
 						Relation rel, HeapTuple oldtuple)
 {
 	if (MtmTransactionSnapshot(MtmCurrentXid) == INVALID_CSN){
-		MTM_LOG1("%d: pglogical_write_delete filtered", MyProcPid);
+		MTM_LOG2("%d: pglogical_write_delete filtered", MyProcPid);
 		return;
 	}
 
 	if (DDLInProress) {
-		MTM_LOG1("%d: pglogical_write_delete filtered DDLInProress", MyProcPid);
+		MTM_LOG2("%d: pglogical_write_delete filtered DDLInProress", MyProcPid);
 		return;
 	}
 
@@ -356,12 +356,12 @@ pglogical_write_tuple(StringInfo out, PGLogicalOutputData *data,
 	uint16		nliveatts = 0;
 
 	if (MtmTransactionSnapshot(MtmCurrentXid) == INVALID_CSN){
-		MTM_LOG1("%d: pglogical_write_tuple filtered", MyProcPid);
+		MTM_LOG2("%d: pglogical_write_tuple filtered", MyProcPid);
 		return;
 	}
 
 	if (DDLInProress) {
-		MTM_LOG1("%d: pglogical_write_tuple filtered DDLInProress", MyProcPid);
+		MTM_LOG2("%d: pglogical_write_tuple filtered DDLInProress", MyProcPid);
 		return;
 	}
 
diff --git a/src/backend/utils/time/tqual.c b/src/backend/utils/time/tqual.c
@@ -989,8 +989,9 @@ HeapTupleSatisfiesMVCC(HeapTuple htup, Snapshot snapshot,
 			{
 				if (TransactionIdDidCommit(xvac))
 				{
-					SetHintBits(tuple, buffer, HEAP_XMIN_INVALID,
-								InvalidTransactionId);
+					if (!TransactionIdIsInProgress(xvac))
+						SetHintBits(tuple, buffer, HEAP_XMIN_INVALID,
+									InvalidTransactionId);
 					return false;
 				}
 				SetHintBits(tuple, buffer, HEAP_XMIN_COMMITTED,
@@ -1011,8 +1012,9 @@ HeapTupleSatisfiesMVCC(HeapTuple htup, Snapshot snapshot,
 								InvalidTransactionId);
 				else
 				{
-					SetHintBits(tuple, buffer, HEAP_XMIN_INVALID,
-								InvalidTransactionId);
+					if (!TransactionIdIsInProgress(xvac))
+						SetHintBits(tuple, buffer, HEAP_XMIN_INVALID,
+									InvalidTransactionId);
 					return false;
 				}
 			}
@@ -1067,8 +1069,9 @@ HeapTupleSatisfiesMVCC(HeapTuple htup, Snapshot snapshot,
 		else
 		{
 			/* it must have aborted or crashed */
-			SetHintBits(tuple, buffer, HEAP_XMIN_INVALID,
-						InvalidTransactionId);
+			if (!TransactionIdIsInProgress(HeapTupleHeaderGetRawXmin(tuple)))
+				SetHintBits(tuple, buffer, HEAP_XMIN_INVALID,
+							InvalidTransactionId);
 			return false;
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -77,12 +77,12 @@ pglogical_write_rel(StringInfo out, PGLogicalOutputData *data, Relation rel)`
`77`	`77`	`Oid relid;`
`78`	`78`
`79`	`79`	`if (MtmTransactionSnapshot(MtmCurrentXid) == INVALID_CSN) {`
`80`		`- MTM_LOG1("%d: pglogical_write_message filtered", MyProcPid);`
	`80`	`+ MTM_LOG2("%d: pglogical_write_message filtered", MyProcPid);`
`81`	`81`	`return;`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`if (DDLInProress) {`
`85`		`- MTM_LOG1("%d: pglogical_write_message filtered DDLInProress", MyProcPid);`
	`85`	`+ MTM_LOG2("%d: pglogical_write_message filtered DDLInProress", MyProcPid);`
`86`	`86`	`return;`
`87`	`87`	`}`
`88`	`88`
`@@ -141,7 +141,7 @@ pglogical_write_message(StringInfo out,`
`141`	`141`	`{`
`142`	`142`	`if (MtmTransactionSnapshot(MtmCurrentXid) == INVALID_CSN)`
`143`	`143`	`{`
`144`		`- MTM_LOG1("%d: pglogical_write_message filtered", MyProcPid);`
	`144`	`+ MTM_LOG2("%d: pglogical_write_message filtered", MyProcPid);`
`145`	`145`	`return;`
`146`	`146`	`}`
`147`	`147`	`DDLInProress = true;`
`@@ -263,12 +263,12 @@ pglogical_write_insert(StringInfo out, PGLogicalOutputData *data,`
`263`	`263`	`Relation rel, HeapTuple newtuple)`
`264`	`264`	`{`
`265`	`265`	`if (MtmTransactionSnapshot(MtmCurrentXid) == INVALID_CSN){`
`266`		`- MTM_LOG1("%d: pglogical_write_insert filtered", MyProcPid);`
	`266`	`+ MTM_LOG2("%d: pglogical_write_insert filtered", MyProcPid);`
`267`	`267`	`return;`
`268`	`268`	`}`
`269`	`269`
`270`	`270`	`if (DDLInProress) {`
`271`		`- MTM_LOG1("%d: pglogical_write_insert filtered DDLInProress", MyProcPid);`
	`271`	`+ MTM_LOG2("%d: pglogical_write_insert filtered DDLInProress", MyProcPid);`
`272`	`272`	`return;`
`273`	`273`	`}`
`274`	`274`
`@@ -286,12 +286,12 @@ pglogical_write_update(StringInfo out, PGLogicalOutputData *data,`
`286`	`286`	`Relation rel, HeapTuple oldtuple, HeapTuple newtuple)`
`287`	`287`	`{`
`288`	`288`	`if (MtmTransactionSnapshot(MtmCurrentXid) == INVALID_CSN){`
`289`		`- MTM_LOG1("%d: pglogical_write_update filtered", MyProcPid);`
	`289`	`+ MTM_LOG2("%d: pglogical_write_update filtered", MyProcPid);`
`290`	`290`	`return;`
`291`	`291`	`}`
`292`	`292`
`293`	`293`	`if (DDLInProress) {`
`294`		`- MTM_LOG1("%d: pglogical_write_update filtered DDLInProress", MyProcPid);`
	`294`	`+ MTM_LOG2("%d: pglogical_write_update filtered DDLInProress", MyProcPid);`
`295`	`295`	`return;`
`296`	`296`	`}`
`297`	`297`
`@@ -319,12 +319,12 @@ pglogical_write_delete(StringInfo out, PGLogicalOutputData *data,`
`319`	`319`	`Relation rel, HeapTuple oldtuple)`
`320`	`320`	`{`
`321`	`321`	`if (MtmTransactionSnapshot(MtmCurrentXid) == INVALID_CSN){`
`322`		`- MTM_LOG1("%d: pglogical_write_delete filtered", MyProcPid);`
	`322`	`+ MTM_LOG2("%d: pglogical_write_delete filtered", MyProcPid);`
`323`	`323`	`return;`
`324`	`324`	`}`
`325`	`325`
`326`	`326`	`if (DDLInProress) {`
`327`		`- MTM_LOG1("%d: pglogical_write_delete filtered DDLInProress", MyProcPid);`
	`327`	`+ MTM_LOG2("%d: pglogical_write_delete filtered DDLInProress", MyProcPid);`
`328`	`328`	`return;`
`329`	`329`	`}`
`330`	`330`
`@@ -356,12 +356,12 @@ pglogical_write_tuple(StringInfo out, PGLogicalOutputData *data,`
`356`	`356`	`uint16 nliveatts = 0;`
`357`	`357`
`358`	`358`	`if (MtmTransactionSnapshot(MtmCurrentXid) == INVALID_CSN){`
`359`		`- MTM_LOG1("%d: pglogical_write_tuple filtered", MyProcPid);`
	`359`	`+ MTM_LOG2("%d: pglogical_write_tuple filtered", MyProcPid);`
`360`	`360`	`return;`
`361`	`361`	`}`
`362`	`362`
`363`	`363`	`if (DDLInProress) {`
`364`		`- MTM_LOG1("%d: pglogical_write_tuple filtered DDLInProress", MyProcPid);`
	`364`	`+ MTM_LOG2("%d: pglogical_write_tuple filtered DDLInProress", MyProcPid);`
`365`	`365`	`return;`
`366`	`366`	`}`
`367`	`367`
Original file line number	Diff line number	Diff line change
`@@ -989,8 +989,9 @@ HeapTupleSatisfiesMVCC(HeapTuple htup, Snapshot snapshot,`
`989`	`989`	`{`
`990`	`990`	`if (TransactionIdDidCommit(xvac))`
`991`	`991`	`{`
`992`		`- SetHintBits(tuple, buffer, HEAP_XMIN_INVALID,`
`993`		`- InvalidTransactionId);`
	`992`	`+ if (!TransactionIdIsInProgress(xvac))`
	`993`	`+ SetHintBits(tuple, buffer, HEAP_XMIN_INVALID,`
	`994`	`+ InvalidTransactionId);`
`994`	`995`	`return false;`
`995`	`996`	`}`
`996`	`997`	`SetHintBits(tuple, buffer, HEAP_XMIN_COMMITTED,`
`@@ -1011,8 +1012,9 @@ HeapTupleSatisfiesMVCC(HeapTuple htup, Snapshot snapshot,`
`1011`	`1012`	`InvalidTransactionId);`
`1012`	`1013`	`else`
`1013`	`1014`	`{`
`1014`		`- SetHintBits(tuple, buffer, HEAP_XMIN_INVALID,`
`1015`		`- InvalidTransactionId);`
	`1015`	`+ if (!TransactionIdIsInProgress(xvac))`
	`1016`	`+ SetHintBits(tuple, buffer, HEAP_XMIN_INVALID,`
	`1017`	`+ InvalidTransactionId);`
`1016`	`1018`	`return false;`
`1017`	`1019`	`}`
`1018`	`1020`	`}`
`@@ -1067,8 +1069,9 @@ HeapTupleSatisfiesMVCC(HeapTuple htup, Snapshot snapshot,`
`1067`	`1069`	`else`
`1068`	`1070`	`{`
`1069`	`1071`	`/* it must have aborted or crashed */`
`1070`		`- SetHintBits(tuple, buffer, HEAP_XMIN_INVALID,`
`1071`		`- InvalidTransactionId);`
	`1072`	`+ if (!TransactionIdIsInProgress(HeapTupleHeaderGetRawXmin(tuple)))`
	`1073`	`+ SetHintBits(tuple, buffer, HEAP_XMIN_INVALID,`
	`1074`	`+ InvalidTransactionId);`
`1072`	`1075`	`return false;`
`1073`	`1076`	`}`
`1074`	`1077`	`}`