From 8f8b656984d3b0f3a87696da641866e28dd5e74c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Herrera?= Date: Mon, 23 Mar 2026 21:37:09 +0100 Subject: [PATCH v44 06/10] rename routines on the logical output plugin side --- src/backend/commands/cluster.c | 3 +- .../pgoutput_repack/pgoutput_repack.c | 54 +++++++++---------- 2 files changed, 29 insertions(+), 28 deletions(-) diff --git a/src/backend/commands/cluster.c b/src/backend/commands/cluster.c index b86e600af41..75556cbdafb 100644 --- a/src/backend/commands/cluster.c +++ b/src/backend/commands/cluster.c @@ -3121,7 +3121,8 @@ restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot) /* * Next, read any attributes we stored separately into the tts_values - * array elements expecting them, if any. This matches store_change. + * array elements expecting them, if any. This matches + * repack_store_change. */ BufFileReadExact(file, &natt_ext, sizeof(natt_ext)); if (natt_ext > 0) diff --git a/src/backend/replication/pgoutput_repack/pgoutput_repack.c b/src/backend/replication/pgoutput_repack/pgoutput_repack.c index de1892ef423..032fbd0e5b0 100644 --- a/src/backend/replication/pgoutput_repack/pgoutput_repack.c +++ b/src/backend/replication/pgoutput_repack/pgoutput_repack.c @@ -19,32 +19,32 @@ PG_MODULE_MAGIC; -static void plugin_startup(LogicalDecodingContext *ctx, +static void repack_startup(LogicalDecodingContext *ctx, OutputPluginOptions *opt, bool is_init); -static void plugin_shutdown(LogicalDecodingContext *ctx); -static void plugin_begin_txn(LogicalDecodingContext *ctx, +static void repack_shutdown(LogicalDecodingContext *ctx); +static void repack_begin_txn(LogicalDecodingContext *ctx, ReorderBufferTXN *txn); -static void plugin_commit_txn(LogicalDecodingContext *ctx, +static void repack_commit_txn(LogicalDecodingContext *ctx, ReorderBufferTXN *txn, XLogRecPtr commit_lsn); -static void plugin_change(LogicalDecodingContext *ctx, ReorderBufferTXN *txn, - Relation rel, ReorderBufferChange *change); -static void store_change(LogicalDecodingContext *ctx, Relation relation, - ConcurrentChangeKind kind, HeapTuple tuple); +static void repack_process_change(LogicalDecodingContext *ctx, ReorderBufferTXN *txn, + Relation rel, ReorderBufferChange *change); +static void repack_store_change(LogicalDecodingContext *ctx, Relation relation, + ConcurrentChangeKind kind, HeapTuple tuple); void _PG_output_plugin_init(OutputPluginCallbacks *cb) { - cb->startup_cb = plugin_startup; - cb->begin_cb = plugin_begin_txn; - cb->change_cb = plugin_change; - cb->commit_cb = plugin_commit_txn; - cb->shutdown_cb = plugin_shutdown; + cb->startup_cb = repack_startup; + cb->begin_cb = repack_begin_txn; + cb->change_cb = repack_process_change; + cb->commit_cb = repack_commit_txn; + cb->shutdown_cb = repack_shutdown; } /* initialize this plugin */ static void -plugin_startup(LogicalDecodingContext *ctx, OutputPluginOptions *opt, +repack_startup(LogicalDecodingContext *ctx, OutputPluginOptions *opt, bool is_init) { ctx->output_plugin_private = NULL; @@ -55,13 +55,13 @@ plugin_startup(LogicalDecodingContext *ctx, OutputPluginOptions *opt, if (ctx->output_plugin_options != NIL) { ereport(ERROR, - (errcode(ERRCODE_INVALID_PARAMETER_VALUE), - errmsg("This plugin does not expect any options"))); + errcode(ERRCODE_INVALID_PARAMETER_VALUE), + errmsg("this plugin does not expect any options")); } } static void -plugin_shutdown(LogicalDecodingContext *ctx) +repack_shutdown(LogicalDecodingContext *ctx) { } @@ -75,13 +75,13 @@ plugin_shutdown(LogicalDecodingContext *ctx) /* BEGIN callback */ static void -plugin_begin_txn(LogicalDecodingContext *ctx, ReorderBufferTXN *txn) +repack_begin_txn(LogicalDecodingContext *ctx, ReorderBufferTXN *txn) { } /* COMMIT callback */ static void -plugin_commit_txn(LogicalDecodingContext *ctx, ReorderBufferTXN *txn, +repack_commit_txn(LogicalDecodingContext *ctx, ReorderBufferTXN *txn, XLogRecPtr commit_lsn) { } @@ -90,8 +90,8 @@ plugin_commit_txn(LogicalDecodingContext *ctx, ReorderBufferTXN *txn, * Callback for individual changed tuples */ static void -plugin_change(LogicalDecodingContext *ctx, ReorderBufferTXN *txn, - Relation relation, ReorderBufferChange *change) +repack_process_change(LogicalDecodingContext *ctx, ReorderBufferTXN *txn, + Relation relation, ReorderBufferChange *change) { RepackDecodingState *private = (RepackDecodingState *) ctx->output_writer_private; @@ -114,7 +114,7 @@ plugin_change(LogicalDecodingContext *ctx, ReorderBufferTXN *txn, if (newtuple == NULL) elog(ERROR, "incomplete insert info."); - store_change(ctx, relation, CHANGE_INSERT, newtuple); + repack_store_change(ctx, relation, CHANGE_INSERT, newtuple); } break; case REORDER_BUFFER_CHANGE_UPDATE: @@ -129,9 +129,9 @@ plugin_change(LogicalDecodingContext *ctx, ReorderBufferTXN *txn, elog(ERROR, "incomplete update info."); if (oldtuple != NULL) - store_change(ctx, relation, CHANGE_UPDATE_OLD, oldtuple); + repack_store_change(ctx, relation, CHANGE_UPDATE_OLD, oldtuple); - store_change(ctx, relation, CHANGE_UPDATE_NEW, newtuple); + repack_store_change(ctx, relation, CHANGE_UPDATE_NEW, newtuple); } break; case REORDER_BUFFER_CHANGE_DELETE: @@ -143,7 +143,7 @@ plugin_change(LogicalDecodingContext *ctx, ReorderBufferTXN *txn, if (oldtuple == NULL) elog(ERROR, "incomplete delete info."); - store_change(ctx, relation, CHANGE_DELETE, oldtuple); + repack_store_change(ctx, relation, CHANGE_DELETE, oldtuple); } break; default: @@ -172,8 +172,8 @@ plugin_change(LogicalDecodingContext *ctx, ReorderBufferTXN *txn, * replication identity instead of the full tuple. */ static void -store_change(LogicalDecodingContext *ctx, Relation relation, - ConcurrentChangeKind kind, HeapTuple tuple) +repack_store_change(LogicalDecodingContext *ctx, Relation relation, + ConcurrentChangeKind kind, HeapTuple tuple) { RepackDecodingState *dstate; MemoryContext oldcxt; -- 2.47.3