fix bug in 2pc decoding

kelvich · kelvich · commit 5be673ae1767 · 2017-02-03T13:07:25.000+03:00
diff --git a/contrib/test_decoding/expected/prepared.out b/contrib/test_decoding/expected/prepared.out
@@ -45,26 +45,32 @@ SELECT data FROM pg_logical_slot_get_changes('regression_slot', NULL, NULL, 'inc
  BEGIN
  table public.test_prepared1: INSERT: id[integer]:1
  COMMIT
+ COMMIT
  BEGIN
  table public.test_prepared1: INSERT: id[integer]:2
  COMMIT
  BEGIN
- table public.test_prepared1: INSERT: id[integer]:4
+ table public.test_prepared1: INSERT: id[integer]:3
+ COMMIT
  COMMIT
  BEGIN
- table public.test_prepared2: INSERT: id[integer]:7
+ table public.test_prepared1: INSERT: id[integer]:4
  COMMIT
  BEGIN
  table public.test_prepared1: INSERT: id[integer]:5
  table public.test_prepared1: INSERT: id[integer]:6 data[text]:'frakbar'
  COMMIT
  BEGIN
+ table public.test_prepared2: INSERT: id[integer]:7
+ COMMIT
+ COMMIT
+ BEGIN
  table public.test_prepared1: INSERT: id[integer]:8 data[text]:null
  COMMIT
  BEGIN
  table public.test_prepared2: INSERT: id[integer]:9
  COMMIT
-(22 rows)
+(28 rows)
 
 SELECT pg_drop_replication_slot('regression_slot');
  pg_drop_replication_slot 
diff --git a/src/backend/replication/logical/decode.c b/src/backend/replication/logical/decode.c
@@ -640,15 +640,16 @@ DecodeCommit(LogicalDecodingContext *ctx, XLogRecordBuffer *buf,
 		 * empty. So we can skip use shortcut for coomiting bare xact.
 		 */
 		strcpy(ctx->reorder->gid, parsed->twophase_gid);
+		*ctx->reorder->state_3pc = '\0';
 		ReorderBufferCommitBareXact(ctx->reorder, xid, buf->origptr, buf->endptr,
 							commit_time, origin_id, origin_lsn);
 	} else {
+		*ctx->reorder->gid = '\0';
+		*ctx->reorder->state_3pc = '\0';
 		/* replay actions of all transaction + subtransactions in order */
 		ReorderBufferCommit(ctx->reorder, xid, buf->origptr, buf->endptr,
 							commit_time, origin_id, origin_lsn);
-		*ctx->reorder->gid = '\0';
 	}
-	*ctx->reorder->state_3pc = '\0';
 }
 
 static void
