Commitddc54d4

kovdb75

authored and

Mikhail Rutman

committed

Fixed processing of error for DDL-queries in PgPlSQL block

Tags: atx, multimaster

1 parentb6fcf8c commitddc54d4Copy full SHA for ddc54d4

File tree

1 file changed

+33

-5

lines changed

src
- commit.c

1 file changed

+33

-5

lines changed

`‎src/commit.c‎`

Lines changed: 33 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -135,14 +135,39 @@ mtm_commit_cleanup(int status, Datum arg)`
`135`	`135`	`/* there was no precommit, we can abort */`
`136`	`136`	`PG_TRY();`
`137`	`137`	`{`
`138`		`-AbortOutOfAnyTransaction();`
`139`		`-StartTransactionCommand();`
	`138`	`+#ifdefPGPRO_EE`
	`139`	`+intatxLevel=DatumGetInt32(arg);`
	`140`	`+`
	`141`	`+/*`
	`142`	`+ * If we are inside ATX transaction, we can not call`
	`143`	`+ * AbortOutOfAnyTransaction() because this call will abort`
	`144`	`+ * ALL transactions and we will have problems if the`
	`145`	`+ * calling code is not designed for this case.`
	`146`	`+ */`
	`147`	`+if (atxLevel)`
	`148`	`+{`
	`149`	`+/* Abort (current ATX transaction only): */`
	`150`	`+AbortCurrentTransaction();`
	`151`	`+/* Restart ATX transaction if it was resumed: */`
	`152`	`+if (atxLevel>getNestLevelATX())`
	`153`	`+SuspendTransaction();`
	`154`	`+}`
	`155`	`+else`
	`156`	`+#endif`
	`157`	`+{`
	`158`	`+AbortOutOfAnyTransaction();`
	`159`	`+StartTransactionCommand();`
	`160`	`+}`
`140`	`161`	`FinishPreparedTransaction(mtm_commit_state.gid, false, false);`
`141`	`162`	`mtm_commit_state.gtx->state.status=GTXAborted;`
`142`	`163`	`mtm_log(MtmTxFinish,"%s aborted as own orphaned not precomitted",`
`143`	`164`	`mtm_commit_state.gid);`
`144`	`165`	`CommitTransactionCommand();`
`145`		`-`
	`166`	`+#ifdefPGPRO_EE`
	`167`	`+/* Restart ATX transaction if it was resumed: */`
	`168`	`+if (atxLevel>getNestLevelATX())`
	`169`	`+SuspendTransaction();`
	`170`	`+#endif`
`146`	`171`	`}`
`147`	`172`	`/*`
`148`	`173`	`* this should be extremely unlikely, but if we fail, don't`
`@@ -218,7 +243,7 @@ MtmBeginTransaction()`
`218`	`243`	`* register gtx hook first (it will be called last)`
`219`	`244`	`*/`
`220`	`245`	`GlobalTxEnsureBeforeShmemExitHook();`
`221`		`-before_shmem_exit(mtm_commit_cleanup,Int32GetDatum(1));`
	`246`	`+before_shmem_exit(mtm_commit_cleanup,Int32GetDatum(0));`
`222`	`247`	`mtm_commit_state.mctx=AllocSetContextCreate(TopMemoryContext,`
`223`	`248`	`"MtmCommitContext",`
`224`	`249`	`ALLOCSET_DEFAULT_SIZES);`
`@@ -373,6 +398,9 @@ MtmTwoPhaseCommit(void)`
`373`	`398`	`MtmGenerationxact_gen;`
`374`	`399`	`chardmq_stream_name[DMQ_STREAM_NAME_MAXLEN];`
`375`	`400`	`GTxStategtx_state;`
	`401`	`+#ifdefPGPRO_EE`
	`402`	`+intatxLevel=getNestLevelATX();`
	`403`	`+#endif`
`376`	`404`
`377`	`405`	`if (MtmNo3PC)`
`378`	`406`	`{`
`@@ -714,7 +742,7 @@ MtmTwoPhaseCommit(void)`
`714`	`742`	`}`
`715`	`743`	`PG_CATCH();`
`716`	`744`	`{`
`717`		`-mtm_commit_cleanup(0,Int32GetDatum(0));`
	`745`	`+mtm_commit_cleanup(0,Int32GetDatum(atxLevel));`
`718`	`746`
`719`	`747`	`PG_RE_THROW();`
`720`	`748`	`}`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitddc54d4

File tree

1 file changed

1 file changed

`‎src/commit.c‎`

0 commit comments