fix gid send/recv

kelvich · kelvich · commit c50886fbc55b · 2016-03-03T20:02:23.000+03:00
diff --git a/contrib/pglogical_output/pglogical_proto_json.c b/contrib/pglogical_output/pglogical_proto_json.c
@@ -93,17 +93,17 @@ pglogical_json_write_commit(StringInfo out, PGLogicalOutputData *data, ReorderBu
 	if (txn->xact_action == XLOG_XACT_PREPARE)
 	{
 		appendStringInfoString(out, "\"action\":\"P\"");
-		appendStringInfo(out, ", \"gid\":\"%s\"", txn->gid); /* NB: Add \0 at the end, if we are using all 200 bytes in GID */
+		appendStringInfo(out, ", \"gid\":\"%s\"", txn->gid);
 	}
 	else if (txn->xact_action == XLOG_XACT_COMMIT_PREPARED)
 	{
 		appendStringInfoString(out, "\"action\":\"CP\"");
-		appendStringInfo(out, ", \"gid\":\"%s\"", txn->gid); /* NB: Add \0 at the end, if we are using all 200 bytes in GID */
+		appendStringInfo(out, ", \"gid\":\"%s\"", txn->gid);
 	}
 	else if (txn->xact_action == XLOG_XACT_ABORT_PREPARED)
 	{
 		appendStringInfoString(out, "\"action\":\"AP\"");
-		appendStringInfo(out, ", \"gid\":\"%s\"", txn->gid); /* NB: Add \0 at the end, if we are using all 200 bytes in GID */
+		appendStringInfo(out, ", \"gid\":\"%s\"", txn->gid);
 	}
 	else if (txn->xact_action == XLOG_XACT_COMMIT)
 	{
diff --git a/contrib/pglogical_output/pglogical_proto_native.c b/contrib/pglogical_output/pglogical_proto_native.c
@@ -216,11 +216,10 @@ pglogical_write_commit(StringInfo out, PGLogicalOutputData *data,
 	pq_sendint64(out, txn->end_lsn);
 	pq_sendint64(out, txn->commit_time);
 
-	// send that as a cstring, instead of fixlen
-	if (txn->xact_action == XLOG_XACT_PREPARE || 
+	if (txn->xact_action == XLOG_XACT_PREPARE ||
 			txn->xact_action == XLOG_XACT_COMMIT_PREPARED ||
 			txn->xact_action == XLOG_XACT_ABORT_PREPARED)
-		pq_sendbytes(out, txn->gid, GIDSIZE);
+		pq_sendstring(out, txn->gid);
 }
 
 /*

Original file line number	Diff line number	Diff line change
`@@ -93,17 +93,17 @@ pglogical_json_write_commit(StringInfo out, PGLogicalOutputData *data, ReorderBu`
`93`	`93`	`if (txn->xact_action == XLOG_XACT_PREPARE)`
`94`	`94`	`{`
`95`	`95`	`appendStringInfoString(out, "\"action\":\"P\"");`
`96`		`- appendStringInfo(out, ", \"gid\":\"%s\"", txn->gid); /* NB: Add \0 at the end, if we are using all 200 bytes in GID */`
	`96`	`+ appendStringInfo(out, ", \"gid\":\"%s\"", txn->gid);`
`97`	`97`	`}`
`98`	`98`	`else if (txn->xact_action == XLOG_XACT_COMMIT_PREPARED)`
`99`	`99`	`{`
`100`	`100`	`appendStringInfoString(out, "\"action\":\"CP\"");`
`101`		`- appendStringInfo(out, ", \"gid\":\"%s\"", txn->gid); /* NB: Add \0 at the end, if we are using all 200 bytes in GID */`
	`101`	`+ appendStringInfo(out, ", \"gid\":\"%s\"", txn->gid);`
`102`	`102`	`}`
`103`	`103`	`else if (txn->xact_action == XLOG_XACT_ABORT_PREPARED)`
`104`	`104`	`{`
`105`	`105`	`appendStringInfoString(out, "\"action\":\"AP\"");`
`106`		`- appendStringInfo(out, ", \"gid\":\"%s\"", txn->gid); /* NB: Add \0 at the end, if we are using all 200 bytes in GID */`
	`106`	`+ appendStringInfo(out, ", \"gid\":\"%s\"", txn->gid);`
`107`	`107`	`}`
`108`	`108`	`else if (txn->xact_action == XLOG_XACT_COMMIT)`
`109`	`109`	`{`