Commit905ce98

committed

Properly set committed subtransactions in snapbuilder.

1 parentbb2b803 commit905ce98Copy full SHA for 905ce98

File tree

-6

lines changed

-6

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -579,7 +579,7 @@ DecodeCommit(LogicalDecodingContext ctx, XLogRecordBuffer buf,`
`579`	`579`	`}`
`580`	`580`
`581`	`581`	`SnapBuildCommitTxn(ctx->snapshot_builder,buf->origptr,xid,`
`582`		`-parsed->nsubxacts,parsed->subxacts, true);`
	`582`	`+parsed->nsubxacts,parsed->subxacts, true,parsed->nmsgs>0);`
`583`	`583`
`584`	`584`	`/* ----`
`585`	`585`	`* Check whether we are interested in this specific transaction, and tell`
`@@ -646,7 +646,7 @@ DecodeCommit(LogicalDecodingContext ctx, XLogRecordBuffer buf,`
`646`	`646`	`strcpy(ctx->reorder->gid,parsed->twophase_gid);`
`647`	`647`	`*ctx->reorder->state_3pc='\0';`
`648`	`648`	`SnapBuildCommitTxn(ctx->snapshot_builder,buf->origptr,xid,`
`649`		`-parsed->nsubxacts,parsed->subxacts, true);`
	`649`	`+parsed->nsubxacts,parsed->subxacts, true, false);`
`650`	`650`	`ReorderBufferCommitBareXact(ctx->reorder,xid,buf->origptr,buf->endptr,`
`651`	`651`	`commit_time,origin_id,origin_lsn);`
`652`	`652`	`}else {`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -948,7 +948,7 @@ SnapBuildAbortTxn(SnapBuild *builder, XLogRecPtr lsn,`
`948`	`948`	`*/`
`949`	`949`	`void`
`950`	`950`	`SnapBuildCommitTxn(SnapBuild*builder,XLogRecPtrlsn,TransactionIdxid,`
`951`		`-intnsubxacts,TransactionId*subxacts,boolisCommit)`
	`951`	`+intnsubxacts,TransactionId*subxacts,boolisCommit,boolforceCatalog)`
`952`	`952`	`{`
`953`	`953`	`intnxact;`
`954`	`954`
`@@ -1006,7 +1006,7 @@ SnapBuildCommitTxn(SnapBuild *builder, XLogRecPtr lsn, TransactionId xid,`
`1006`	`1006`	`* Add subtransaction to base snapshot if it DDL, we don't distinguish`
`1007`	`1007`	`* to toplevel transactions there.`
`1008`	`1008`	`*/`
`1009`		`-elseif (ReorderBufferXidHasCatalogChanges(builder->reorder,subxid))`
	`1009`	`+elseif (ReorderBufferXidHasCatalogChanges(builder->reorder,subxid)\|\|forceCatalog)`
`1010`	`1010`	`{`
`1011`	`1011`	`sub_needs_timetravel= true;`
`1012`	`1012`
`@@ -1034,7 +1034,7 @@ SnapBuildCommitTxn(SnapBuild *builder, XLogRecPtr lsn, TransactionId xid,`
`1034`	`1034`	`SnapBuildAddCommittedTxn(builder,xid);`
`1035`	`1035`	`}`
`1036`	`1036`	`/* add toplevel transaction to base snapshot */`
`1037`		`-elseif (ReorderBufferXidHasCatalogChanges(builder->reorder,xid))`
	`1037`	`+elseif (ReorderBufferXidHasCatalogChanges(builder->reorder,xid)\|\|forceCatalog)`
`1038`	`1038`	`{`
`1039`	`1039`	`elog(DEBUG2,"found top level transaction "XID_FMT", with catalog changes!",`
`1040`	`1040`	`xid);`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ extern bool SnapBuildXactNeedsSkip(SnapBuild *snapstate, XLogRecPtr ptr);`
`70`	`70`
`71`	`71`	`externvoidSnapBuildCommitTxn(SnapBuild*builder,XLogRecPtrlsn,`
`72`	`72`	`TransactionIdxid,intnsubxacts,`
`73`		`-TransactionId*subxacts,boolisCommit);`
	`73`	`+TransactionId*subxacts,boolisCommit,boolforceCatalog);`
`74`	`74`	`externvoidSnapBuildAbortTxn(SnapBuild*builder,XLogRecPtrlsn,`
`75`	`75`	`TransactionIdxid,intnsubxacts,`
`76`	`76`	`TransactionId*subxacts);`

Comments

(0)