Skip to content

Commit e59bf91

Browse files
committed
pglogical v2 - remove 9.4 compatibility
1 parent b2236d8 commit e59bf91

File tree

5 files changed

+0
-37
lines changed

5 files changed

+0
-37
lines changed

contrib/pglogical_output/pglogical_config.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
*/
1313
#include "postgres.h"
1414

15-
#include "pglogical_output/compat.h"
1615
#include "pglogical_config.h"
1716
#include "pglogical_output.h"
1817

contrib/pglogical_output/pglogical_hooks.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@
55
#include "catalog/pg_proc.h"
66
#include "catalog/pg_type.h"
77

8-
#ifdef HAVE_REPLICATION_ORIGINS
98
#include "replication/origin.h"
10-
#endif
119

1210
#include "parser/parse_func.h"
1311

contrib/pglogical_output/pglogical_output.c

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
*/
1313
#include "postgres.h"
1414

15-
#include "pglogical_output/compat.h"
1615
#include "pglogical_config.h"
1716
#include "pglogical_output.h"
1817
#include "pglogical_proto.h"
@@ -34,9 +33,7 @@
3433

3534
#include "replication/output_plugin.h"
3635
#include "replication/logical.h"
37-
#ifdef HAVE_REPLICATION_ORIGINS
3836
#include "replication/origin.h"
39-
#endif
4037

4138
#include "utils/builtins.h"
4239
#include "utils/catcache.h"
@@ -66,10 +63,8 @@ static void pg_decode_change(LogicalDecodingContext *ctx,
6663
ReorderBufferTXN *txn, Relation rel,
6764
ReorderBufferChange *change);
6865

69-
#ifdef HAVE_REPLICATION_ORIGINS
7066
static bool pg_decode_origin_filter(LogicalDecodingContext *ctx,
7167
RepOriginId origin_id);
72-
#endif
7368

7469
static void send_startup_message(LogicalDecodingContext *ctx,
7570
PGLogicalOutputData *data, bool last_message);
@@ -86,9 +81,7 @@ _PG_output_plugin_init(OutputPluginCallbacks *cb)
8681
cb->begin_cb = pg_decode_begin_txn;
8782
cb->change_cb = pg_decode_change;
8883
cb->commit_cb = pg_decode_commit_txn;
89-
#ifdef HAVE_REPLICATION_ORIGINS
9084
cb->filter_by_origin_cb = pg_decode_origin_filter;
91-
#endif
9285
cb->shutdown_cb = pg_decode_shutdown;
9386
}
9487

@@ -379,15 +372,12 @@ pg_decode_begin_txn(LogicalDecodingContext *ctx, ReorderBufferTXN *txn)
379372
if (!startup_message_sent)
380373
send_startup_message(ctx, data, false /* can't be last message */);
381374

382-
#ifdef HAVE_REPLICATION_ORIGINS
383375
/* If the record didn't originate locally, send origin info */
384376
send_replication_origin &= txn->origin_id != InvalidRepOriginId;
385-
#endif
386377

387378
OutputPluginPrepareWrite(ctx, !send_replication_origin);
388379
data->api->write_begin(ctx->out, data, txn);
389380

390-
#ifdef HAVE_REPLICATION_ORIGINS
391381
if (send_replication_origin)
392382
{
393383
char *origin;
@@ -409,7 +399,6 @@ pg_decode_begin_txn(LogicalDecodingContext *ctx, ReorderBufferTXN *txn)
409399
replorigin_by_oid(txn->origin_id, true, &origin))
410400
data->api->write_origin(ctx->out, origin, txn->origin_lsn);
411401
}
412-
#endif
413402

414403
OutputPluginWrite(ctx, true);
415404
}
@@ -490,7 +479,6 @@ pg_decode_change(LogicalDecodingContext *ctx, ReorderBufferTXN *txn,
490479
MemoryContextReset(data->context);
491480
}
492481

493-
#ifdef HAVE_REPLICATION_ORIGINS
494482
/*
495483
* Decide if the whole transaction with specific origin should be filtered out.
496484
*/
@@ -508,7 +496,6 @@ pg_decode_origin_filter(LogicalDecodingContext *ctx,
508496

509497
return false;
510498
}
511-
#endif
512499

513500
static void
514501
send_startup_message(LogicalDecodingContext *ctx,

contrib/pglogical_output/pglogical_output/compat.h

Lines changed: 0 additions & 19 deletions
This file was deleted.

contrib/pglogical_output/pglogical_output/hooks.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
#include "utils/palloc.h"
88
#include "replication/reorderbuffer.h"
99

10-
#include "pglogical_output/compat.h"
11-
1210
struct PGLogicalOutputData;
1311
typedef struct PGLogicalOutputData PGLogicalOutputData;
1412

0 commit comments

Comments
 (0)