Partly merge with new version of pglogical_output plugin

knizhnik · knizhnik · commit b7d599ef4941 · 2016-04-04T10:13:29.000+03:00
diff --git a/contrib/mmts/pglogical_config.h b/contrib/mmts/pglogical_config.h
@@ -5,6 +5,9 @@
 #error <postgres.h> must be included first
 #endif
 
+#include "nodes/pg_list.h"
+#include "pglogical_output.h"
+
 inline static bool
 server_float4_byval(void)
 {
@@ -45,9 +48,6 @@ server_bigendian(void)
 #endif
 }
 
-typedef struct List List;
-typedef struct PGLogicalOutputData PGLogicalOutputData;
-
 extern int process_parameters(List *options, PGLogicalOutputData *data);
 
 extern List * prepare_startup_message(PGLogicalOutputData *data);
diff --git a/contrib/mmts/pglogical_hooks.h b/contrib/mmts/pglogical_hooks.h
@@ -5,6 +5,7 @@
 
 /* public interface for hooks */
 #include "pglogical_output/hooks.h"
+#include "pglogical_output.h"
 
 extern void load_hooks(PGLogicalOutputData *data);
 
diff --git a/contrib/mmts/pglogical_output/compat.h b/contrib/mmts/pglogical_output/compat.h
@@ -0,0 +1,28 @@
+#ifndef PG_LOGICAL_COMPAT_H
+#define PG_LOGICAL_COMPAT_H
+
+#include "pg_config.h"
+
+/* 9.4 lacks replication origins */
+#if PG_VERSION_NUM >= 90500
+#define HAVE_REPLICATION_ORIGINS
+#else
+/* To allow the same signature on hooks in 9.4 */
+typedef uint16 RepOriginId;
+#define InvalidRepOriginId 0
+#endif
+
+/* 9.4 lacks PG_UINT32_MAX */
+#ifndef PG_UINT32_MAX
+#define PG_UINT32_MAX UINT32_MAX
+#endif
+
+#ifndef PG_INT32_MAX
+#define PG_INT32_MAX INT32_MAX
+#endif
+
+#ifndef PG_INT32_MIN
+#define PG_INT32_MIN INT32_MIN
+#endif
+
+#endif
diff --git a/contrib/mmts/pglogical_output/hooks.h b/contrib/mmts/pglogical_output/hooks.h
@@ -7,8 +7,7 @@
 #include "utils/palloc.h"
 #include "replication/reorderbuffer.h"
 
-struct PGLogicalOutputData;
-typedef struct PGLogicalOutputData PGLogicalOutputData;
+#include "pglogical_output/compat.h"
 
 /*
  * This header is to be included by extensions that implement pglogical output
@@ -43,6 +42,8 @@ struct PGLogicalRowFilterArgs
 	void 	   *private_data;
 	Relation	changed_rel;
 	enum ReorderBufferChangeType	change_type;
+	/* detailed row change event from logical decoding */
+	ReorderBufferChange* change;
 };
 
 typedef bool (*pglogical_row_filter_hook_fn)(struct PGLogicalRowFilterArgs *args);
diff --git a/contrib/mmts/pglogical_proto.h b/contrib/mmts/pglogical_proto.h
@@ -13,22 +13,26 @@
 #ifndef PG_LOGICAL_PROTO_H
 #define PG_LOGICAL_PROTO_H
 
-typedef void (*pglogical_write_rel_fn)(StringInfo out, PGLogicalOutputData *data, Relation rel);
+struct PGLogicalOutputData;
+struct PGLRelMetaCacheEntry;
 
-typedef void (*pglogical_write_begin_fn)(StringInfo out, PGLogicalOutputData *data,
+typedef void (*pglogical_write_rel_fn)(StringInfo out, struct PGLogicalOutputData *data,
+									   Relation rel/*, struct PGLRelMetaCacheEntry *cache_entry*/);
+
+typedef void (*pglogical_write_begin_fn)(StringInfo out, struct PGLogicalOutputData *data,
 							 ReorderBufferTXN *txn);
-typedef void (*pglogical_write_commit_fn)(StringInfo out, PGLogicalOutputData *data,
+typedef void (*pglogical_write_commit_fn)(StringInfo out, struct PGLogicalOutputData *data,
 							 ReorderBufferTXN *txn, XLogRecPtr commit_lsn);
 
 typedef void (*pglogical_write_origin_fn)(StringInfo out, const char *origin,
 							 XLogRecPtr origin_lsn);
 
-typedef void (*pglogical_write_insert_fn)(StringInfo out, PGLogicalOutputData *data,
+typedef void (*pglogical_write_insert_fn)(StringInfo out, struct PGLogicalOutputData *data,
 							 Relation rel, HeapTuple newtuple);
-typedef void (*pglogical_write_update_fn)(StringInfo out, PGLogicalOutputData *data,
+typedef void (*pglogical_write_update_fn)(StringInfo out, struct PGLogicalOutputData *data,
 							 Relation rel, HeapTuple oldtuple,
 							 HeapTuple newtuple);
-typedef void (*pglogical_write_delete_fn)(StringInfo out, PGLogicalOutputData *data,
+typedef void (*pglogical_write_delete_fn)(StringInfo out, struct PGLogicalOutputData *data,
 							 Relation rel, HeapTuple oldtuple);
 
 typedef void (*write_startup_message_fn)(StringInfo out, List *msg);
@@ -45,7 +49,7 @@ typedef struct PGLogicalProtoAPI
 	pglogical_write_update_fn	write_update;
 	pglogical_write_delete_fn	write_delete;
 	pglogical_setup_hooks_fn    setup_hooks;
-	write_startup_message_fn	write_startup_message;	
+	write_startup_message_fn	write_startup_message;
 } PGLogicalProtoAPI;
 
 
diff --git a/contrib/pglogical_output/pglogical_output.c b/contrib/pglogical_output/pglogical_output.c
@@ -559,7 +559,7 @@ static void pg_decode_shutdown(LogicalDecodingContext * ctx)
 {
 	PGLogicalOutputData* data = (PGLogicalOutputData*)ctx->output_plugin_private;
 
-	call_shu\tdown_hook(data);
+	call_shutdown_hook(data);
 
 	pglogical_destroy_relmetacache();
 

Original file line number	Diff line number	Diff line change
`@@ -559,7 +559,7 @@ static void pg_decode_shutdown(LogicalDecodingContext * ctx)`
`559`	`559`	`{`
`560`	`560`	`PGLogicalOutputData* data = (PGLogicalOutputData*)ctx->output_plugin_private;`
`561`	`561`
`562`		`- call_shu\tdown_hook(data);`
	`562`	`+ call_shutdown_hook(data);`
`563`	`563`
`564`	`564`	`pglogical_destroy_relmetacache();`
`565`	`565`