agora inbox for [email protected]help / color / mirror / Atom feed
[PATCH v50 6/8] Error out any process that would block at REPACK 98+ messages / 1 participants [nested] [flat]
* [PATCH v50 6/8] Error out any process that would block at REPACK @ 2026-04-01 15:35 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-04-01 15:35 UTC (permalink / raw) Any process waiting on REPACK to release its lock would actually cause it to deadlock when it tries to upgrade its lock to AEL, losing all work done to that point. We avoid this by teaching the deadlock detector to raise an error when this condition is detected. --- src/backend/commands/repack.c | 60 ++++++++++---- src/backend/storage/lmgr/deadlock.c | 15 ++++ src/include/storage/proc.h | 6 +- src/test/modules/injection_points/Makefile | 1 + .../expected/repack_deadlock.out | 63 ++++++++++++++ src/test/modules/injection_points/meson.build | 1 + .../specs/repack_deadlock.spec | 83 +++++++++++++++++++ 7 files changed, 210 insertions(+), 19 deletions(-) create mode 100644 src/test/modules/injection_points/expected/repack_deadlock.out create mode 100644 src/test/modules/injection_points/specs/repack_deadlock.spec diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index 03829892d57..d6e446d582d 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -279,6 +279,21 @@ ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel) /* Determine the lock mode to use. */ lockmode = RepackLockLevel((params.options & CLUOPT_CONCURRENT) != 0); + /* + * If in concurrent mode, set the PROC_IN_CONCURRENT_REPACK flag. This + * makes the deadlock checker cause anyone that would conflict with us to + * error out. It's important to set this flag ahead of actually locking + * the relation; it won't of course affect anyone until we do have a lock + * that others can conflict with. + */ + if ((params.options & CLUOPT_CONCURRENT) != 0) + { + LWLockAcquire(ProcArrayLock, LW_EXCLUSIVE); + MyProc->statusFlags |= PROC_IN_CONCURRENT_REPACK; + ProcGlobal->statusFlags[MyProc->pgxactoff] = MyProc->statusFlags; + LWLockRelease(ProcArrayLock); + } + /* * If a single relation is specified, process it and we're done ... unless * the relation is a partitioned table, in which case we fall through. @@ -479,11 +494,8 @@ RepackLockLevel(bool concurrent) * If indexOid is InvalidOid, the table will be rewritten in physical order * instead of index order. * - * Note that, in the concurrent case, the function releases the lock at some - * point, in order to get AccessExclusiveLock for the final steps (i.e. to - * swap the relation files). To make things simpler, the caller should expect - * OldHeap to be closed on return, regardless CLUOPT_CONCURRENT. (The - * AccessExclusiveLock is kept till the end of the transaction.) + * On return, OldHeap is closed but locked with AccessExclusiveLock - the lock + * will be released at end of the transaction. * * 'cmd' indicates which command is being executed, to be used for error * messages. @@ -515,10 +527,12 @@ cluster_rel(RepackCommand cmd, Relation OldHeap, Oid indexOid, /* * Make sure we're not in a transaction block. * - * The reason is that repack_setup_logical_decoding() could deadlock - * if there's an XID already assigned. It would be possible to run in - * a transaction block if we had no XID, but this restriction is - * simpler for users to understand and we don't lose anything. + * The reason is that repack_setup_logical_decoding() could wait + * indefinitely for our XID to complete. (The deadlock detector would + * not recognize it because we'd be waiting for ourselves, i.e. no + * real lock conflict.) It would be possible to run in a transaction + * block if we had no XID, but this restriction is simpler for users + * to understand and we don't lose anything. */ PreventInTransactionBlock(isTopLevel, "REPACK (CONCURRENTLY)"); @@ -1001,10 +1015,8 @@ rebuild_relation(Relation OldHeap, Relation index, bool verbose, * Note that the worker has to wait for all transactions with XID * already assigned to finish. If some of those transactions is * waiting for a lock conflicting with ShareUpdateExclusiveLock on our - * table (e.g. it runs CREATE INDEX), we can end up in a deadlock. - * Not sure this risk is worth unlocking/locking the table (and its - * clustering index) and checking again if it's still eligible for - * REPACK CONCURRENTLY. + * table (e.g. it runs CREATE INDEX), it should encounter ERROR in the + * deadlock checking code. */ start_repack_decoding_worker(tableOid); @@ -3093,7 +3105,19 @@ rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, LockRelationOid(OldHeap->rd_rel->reltoastrelid, AccessExclusiveLock); /* - * Tuples and pages of the old heap will be gone, but the heap will stay. + * Now that we have all access-exclusive locks on all relations, we no + * longer want other processes to error out when trying to acquire a + * conflicting lock. Therefore, unset our flag. + */ + LWLockAcquire(ProcArrayLock, LW_EXCLUSIVE); + MyProc->statusFlags &= ~PROC_IN_CONCURRENT_REPACK; + ProcGlobal->statusFlags[MyProc->pgxactoff] = MyProc->statusFlags; + LWLockRelease(ProcArrayLock); + + /* + * Tuples and pages of the old heap will be gone, but the heap itself will + * stay. In order for predicate locks to continue to work, convert them + * to relation-level locks. We do this both for table and indexes. */ TransferPredicateLocksToHeapRelation(OldHeap); foreach_ptr(RelationData, index, indexrels) @@ -3366,9 +3390,11 @@ start_repack_decoding_worker(Oid relid) /* * The decoding setup must be done before the caller can have XID assigned - * for any reason, otherwise the worker might end up in a deadlock, - * waiting for the caller's transaction to end. Therefore wait here until - * the worker indicates that it has the logical decoding initialized. + * for any reason, otherwise the worker might end up waiting for the + * caller's transaction to end. (Deadlock detector does not consider this + * a conflict because the worker is in the same locking group as the + * backend that launched it.) Therefore wait here until the worker + * indicates that it has the logical decoding initialized. */ ConditionVariablePrepareToSleep(&shared->cv); for (;;) diff --git a/src/backend/storage/lmgr/deadlock.c b/src/backend/storage/lmgr/deadlock.c index b8962d875b6..c20ac682b0d 100644 --- a/src/backend/storage/lmgr/deadlock.c +++ b/src/backend/storage/lmgr/deadlock.c @@ -620,6 +620,21 @@ FindLockCycleRecurseMember(PGPROC *checkProc, proc->statusFlags & PROC_IS_AUTOVACUUM) blocking_autovacuum_proc = proc; + /* + * Similarly, if we note that we're blocked by some + * process running REPACK (CONCURRENTLY), just fail. That + * process is going to upgrade its lock at some point, and + * it would be inappropriate for any other process to + * cause that to fail. + */ + if (checkProc == MyProc && + proc->statusFlags & PROC_IN_CONCURRENT_REPACK) + ereport(ERROR, + errcode(ERRCODE_OBJECT_IN_USE), + errmsg("could not wait for concurrent REPACK"), + errdetail("Process %d waits for REPACK running on process %d", + MyProc->pid, proc->pid)); + /* We're done looking at this proclock */ break; } diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h index 1dad125706e..8ad9718f3d6 100644 --- a/src/include/storage/proc.h +++ b/src/include/storage/proc.h @@ -69,10 +69,12 @@ struct XidCache #define PROC_AFFECTS_ALL_HORIZONS 0x20 /* this proc's xmin must be * included in vacuum horizons * in all databases */ +#define PROC_IN_CONCURRENT_REPACK 0x40 /* REPACK (CONCURRENTLY) */ -/* flags reset at EOXact */ +/* flags reset at EOXact. A bit of a misnomer ... */ #define PROC_VACUUM_STATE_MASK \ - (PROC_IN_VACUUM | PROC_IN_SAFE_IC | PROC_VACUUM_FOR_WRAPAROUND) + (PROC_IN_VACUUM | PROC_IN_SAFE_IC | PROC_VACUUM_FOR_WRAPAROUND | \ + PROC_IN_CONCURRENT_REPACK) /* * Xmin-related flags. Make sure any flags that affect how the process' Xmin diff --git a/src/test/modules/injection_points/Makefile b/src/test/modules/injection_points/Makefile index 2cd7d87c533..f7663859fe2 100644 --- a/src/test/modules/injection_points/Makefile +++ b/src/test/modules/injection_points/Makefile @@ -15,6 +15,7 @@ REGRESS_OPTS = --dlpath=$(top_builddir)/src/test/regress ISOLATION = basic \ inplace \ repack \ + repack_deadlock \ repack_toast \ syscache-update-pruned \ heap_lock_update diff --git a/src/test/modules/injection_points/expected/repack_deadlock.out b/src/test/modules/injection_points/expected/repack_deadlock.out new file mode 100644 index 00000000000..a86e4767536 --- /dev/null +++ b/src/test/modules/injection_points/expected/repack_deadlock.out @@ -0,0 +1,63 @@ +Parsed test spec with 2 sessions + +starting permutation: wait_before_lock add_column wakeup_before_lock check1 +injection_points_attach +----------------------- + +(1 row) + +step wait_before_lock: + REPACK (CONCURRENTLY) repack_deadlock USING INDEX repack_deadlock_pkey; + <waiting ...> +step add_column: + alter table repack_deadlock add column noise text; + <waiting ...> +step add_column: <... completed> +ERROR: could not wait for concurrent REPACK +step wakeup_before_lock: + SELECT injection_points_wakeup('repack-concurrently-before-lock'); + +injection_points_wakeup +----------------------- + +(1 row) + +step wait_before_lock: <... completed> +step check1: + INSERT INTO relfilenodes(node) + SELECT relfilenode FROM pg_class WHERE relname='repack_deadlock'; + + SELECT count(DISTINCT node) FROM relfilenodes; + + SELECT i, j FROM repack_deadlock ORDER BY i, j; + + INSERT INTO data_s1(i, j) + SELECT i, j FROM repack_deadlock; + + SELECT count(*) + FROM data_s1 d1 FULL JOIN data_s2 d2 USING (i, j) + WHERE d1.i ISNULL OR d2.i ISNULL; + +count +----- + 1 +(1 row) + +i|j +-+- +1|1 +2|2 +3|3 +4|4 +(4 rows) + +count +----- + 4 +(1 row) + +injection_points_detach +----------------------- + +(1 row) + diff --git a/src/test/modules/injection_points/meson.build b/src/test/modules/injection_points/meson.build index a414abb924b..1cd88d6db65 100644 --- a/src/test/modules/injection_points/meson.build +++ b/src/test/modules/injection_points/meson.build @@ -46,6 +46,7 @@ tests += { 'basic', 'inplace', 'repack', + 'repack_deadlock', 'repack_toast', 'syscache-update-pruned', 'heap_lock_update', diff --git a/src/test/modules/injection_points/specs/repack_deadlock.spec b/src/test/modules/injection_points/specs/repack_deadlock.spec new file mode 100644 index 00000000000..9d23a6588c2 --- /dev/null +++ b/src/test/modules/injection_points/specs/repack_deadlock.spec @@ -0,0 +1,83 @@ +# Test REPACK with a concurrent transaction that would cause a deadlock +setup +{ + CREATE EXTENSION injection_points; + + CREATE TABLE repack_deadlock(i int PRIMARY KEY, j int); + INSERT INTO repack_deadlock(i, j) VALUES (1, 1), (2, 2), (3, 3), (4, 4); + + CREATE TABLE relfilenodes(node oid); + + CREATE TABLE data_s1(i int, j int); + CREATE TABLE data_s2(i int, j int); +} + +teardown +{ + DROP TABLE repack_deadlock; + DROP EXTENSION injection_points; + + DROP TABLE relfilenodes; + DROP TABLE data_s1; + DROP TABLE data_s2; +} + +session s1 +setup +{ + SELECT injection_points_set_local(); + SELECT injection_points_attach('repack-concurrently-before-lock', 'wait'); +} +# Perform the initial load and wait for s2 to do some data changes. +step wait_before_lock +{ + REPACK (CONCURRENTLY) repack_deadlock USING INDEX repack_deadlock_pkey; +} +# Check the table from the perspective of s1. +# +# Besides the contents, we also check that relfilenode has changed. + +# Have each session write the contents into a table and use FULL JOIN to check +# if the outputs are identical. +step check1 +{ + INSERT INTO relfilenodes(node) + SELECT relfilenode FROM pg_class WHERE relname='repack_deadlock'; + + SELECT count(DISTINCT node) FROM relfilenodes; + + SELECT i, j FROM repack_deadlock ORDER BY i, j; + + INSERT INTO data_s1(i, j) + SELECT i, j FROM repack_deadlock; + + SELECT count(*) + FROM data_s1 d1 FULL JOIN data_s2 d2 USING (i, j) + WHERE d1.i ISNULL OR d2.i ISNULL; +} +teardown +{ + SELECT injection_points_detach('repack-concurrently-before-lock'); +} + +session s2 +# Change the existing data. UPDATE changes both key and non-key columns. Also +# update one row twice to test whether tuple version generated by this session +# can be found. +step add_column +{ + alter table repack_deadlock add column noise text; +} + +step wakeup_before_lock +{ + SELECT injection_points_wakeup('repack-concurrently-before-lock'); +} + +# Test if data changes introduced while one session is performing REPACK +# CONCURRENTLY find their way into the table. +permutation + wait_before_lock + add_column + wakeup_before_lock + check1 -- 2.47.3 --brnevsqjnuzpyok4 Content-Type: text/x-diff; charset=utf-8 Content-Disposition: attachment; filename="v50-0007-Introduce-an-option-to-make-logical-replication-.patch" ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-06-16 11:54 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-06-16 11:54 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 221 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 160 insertions(+), 110 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index fa98b8b9247..04d39ad8c86 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -93,40 +93,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -173,22 +139,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -197,6 +160,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2613,18 +2579,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2633,7 +2612,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2682,14 +2661,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2705,7 +2684,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2718,7 +2697,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2726,7 +2705,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2735,6 +2714,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2742,16 +2723,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2763,10 +2743,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2794,8 +2774,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2944,10 +2924,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2958,9 +2939,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2968,13 +2949,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -2997,16 +2978,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3077,7 +3058,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3093,41 +3074,65 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); - chgcxt->cc_rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); - InitResultRelInfo(chgcxt->cc_rri, relation, 0, 0, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); + InitResultRelInfo(dest->rri, relation, 0, 0, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3137,12 +3142,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3161,34 +3166,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index f9eb23e52c9..b4d5abbaca7 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2660,6 +2660,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v01-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-06-16 11:54 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-06-16 11:54 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 221 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 160 insertions(+), 110 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index fa98b8b9247..04d39ad8c86 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -93,40 +93,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -173,22 +139,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -197,6 +160,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2613,18 +2579,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2633,7 +2612,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2682,14 +2661,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2705,7 +2684,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2718,7 +2697,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2726,7 +2705,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2735,6 +2714,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2742,16 +2723,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2763,10 +2743,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2794,8 +2774,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2944,10 +2924,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2958,9 +2939,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2968,13 +2949,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -2997,16 +2978,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3077,7 +3058,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3093,41 +3074,65 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); - chgcxt->cc_rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); - InitResultRelInfo(chgcxt->cc_rri, relation, 0, 0, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); + InitResultRelInfo(dest->rri, relation, 0, 0, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3137,12 +3142,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3161,34 +3166,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index f9eb23e52c9..b4d5abbaca7 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2660,6 +2660,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v01-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-06-16 11:54 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-06-16 11:54 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 221 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 160 insertions(+), 110 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index fa98b8b9247..04d39ad8c86 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -93,40 +93,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -173,22 +139,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -197,6 +160,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2613,18 +2579,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2633,7 +2612,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2682,14 +2661,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2705,7 +2684,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2718,7 +2697,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2726,7 +2705,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2735,6 +2714,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2742,16 +2723,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2763,10 +2743,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2794,8 +2774,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2944,10 +2924,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2958,9 +2939,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2968,13 +2949,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -2997,16 +2978,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3077,7 +3058,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3093,41 +3074,65 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); - chgcxt->cc_rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); - InitResultRelInfo(chgcxt->cc_rri, relation, 0, 0, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); + InitResultRelInfo(dest->rri, relation, 0, 0, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3137,12 +3142,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3161,34 +3166,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index f9eb23e52c9..b4d5abbaca7 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2660,6 +2660,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v01-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-06-16 11:54 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-06-16 11:54 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 221 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 160 insertions(+), 110 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index fa98b8b9247..04d39ad8c86 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -93,40 +93,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -173,22 +139,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -197,6 +160,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2613,18 +2579,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2633,7 +2612,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2682,14 +2661,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2705,7 +2684,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2718,7 +2697,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2726,7 +2705,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2735,6 +2714,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2742,16 +2723,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2763,10 +2743,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2794,8 +2774,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2944,10 +2924,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2958,9 +2939,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2968,13 +2949,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -2997,16 +2978,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3077,7 +3058,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3093,41 +3074,65 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); - chgcxt->cc_rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); - InitResultRelInfo(chgcxt->cc_rri, relation, 0, 0, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); + InitResultRelInfo(dest->rri, relation, 0, 0, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3137,12 +3142,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3161,34 +3166,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index f9eb23e52c9..b4d5abbaca7 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2660,6 +2660,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v01-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-06-16 11:54 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-06-16 11:54 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 221 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 160 insertions(+), 110 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index fa98b8b9247..04d39ad8c86 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -93,40 +93,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -173,22 +139,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -197,6 +160,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2613,18 +2579,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2633,7 +2612,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2682,14 +2661,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2705,7 +2684,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2718,7 +2697,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2726,7 +2705,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2735,6 +2714,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2742,16 +2723,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2763,10 +2743,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2794,8 +2774,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2944,10 +2924,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2958,9 +2939,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2968,13 +2949,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -2997,16 +2978,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3077,7 +3058,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3093,41 +3074,65 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); - chgcxt->cc_rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); - InitResultRelInfo(chgcxt->cc_rri, relation, 0, 0, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); + InitResultRelInfo(dest->rri, relation, 0, 0, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3137,12 +3142,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3161,34 +3166,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index f9eb23e52c9..b4d5abbaca7 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2660,6 +2660,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v01-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-06-16 11:54 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-06-16 11:54 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 221 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 160 insertions(+), 110 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index fa98b8b9247..04d39ad8c86 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -93,40 +93,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -173,22 +139,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -197,6 +160,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2613,18 +2579,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2633,7 +2612,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2682,14 +2661,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2705,7 +2684,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2718,7 +2697,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2726,7 +2705,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2735,6 +2714,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2742,16 +2723,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2763,10 +2743,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2794,8 +2774,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2944,10 +2924,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2958,9 +2939,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2968,13 +2949,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -2997,16 +2978,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3077,7 +3058,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3093,41 +3074,65 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); - chgcxt->cc_rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); - InitResultRelInfo(chgcxt->cc_rri, relation, 0, 0, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); + InitResultRelInfo(dest->rri, relation, 0, 0, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3137,12 +3142,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3161,34 +3166,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index f9eb23e52c9..b4d5abbaca7 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2660,6 +2660,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v01-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-06-16 11:54 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-06-16 11:54 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 221 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 160 insertions(+), 110 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index fa98b8b9247..04d39ad8c86 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -93,40 +93,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -173,22 +139,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -197,6 +160,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2613,18 +2579,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2633,7 +2612,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2682,14 +2661,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2705,7 +2684,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2718,7 +2697,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2726,7 +2705,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2735,6 +2714,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2742,16 +2723,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2763,10 +2743,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2794,8 +2774,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2944,10 +2924,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2958,9 +2939,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2968,13 +2949,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -2997,16 +2978,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3077,7 +3058,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3093,41 +3074,65 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); - chgcxt->cc_rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); - InitResultRelInfo(chgcxt->cc_rri, relation, 0, 0, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); + InitResultRelInfo(dest->rri, relation, 0, 0, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3137,12 +3142,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3161,34 +3166,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index f9eb23e52c9..b4d5abbaca7 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2660,6 +2660,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v01-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-06-16 11:54 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-06-16 11:54 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 221 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 160 insertions(+), 110 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index fa98b8b9247..04d39ad8c86 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -93,40 +93,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -173,22 +139,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -197,6 +160,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2613,18 +2579,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2633,7 +2612,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2682,14 +2661,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2705,7 +2684,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2718,7 +2697,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2726,7 +2705,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2735,6 +2714,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2742,16 +2723,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2763,10 +2743,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2794,8 +2774,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2944,10 +2924,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2958,9 +2939,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2968,13 +2949,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -2997,16 +2978,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3077,7 +3058,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3093,41 +3074,65 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); - chgcxt->cc_rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); - InitResultRelInfo(chgcxt->cc_rri, relation, 0, 0, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); + InitResultRelInfo(dest->rri, relation, 0, 0, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3137,12 +3142,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3161,34 +3166,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index f9eb23e52c9..b4d5abbaca7 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2660,6 +2660,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v01-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-06-16 11:54 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-06-16 11:54 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 221 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 160 insertions(+), 110 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index fa98b8b9247..04d39ad8c86 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -93,40 +93,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -173,22 +139,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -197,6 +160,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2613,18 +2579,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2633,7 +2612,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2682,14 +2661,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2705,7 +2684,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2718,7 +2697,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2726,7 +2705,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2735,6 +2714,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2742,16 +2723,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2763,10 +2743,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2794,8 +2774,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2944,10 +2924,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2958,9 +2939,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2968,13 +2949,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -2997,16 +2978,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3077,7 +3058,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3093,41 +3074,65 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); - chgcxt->cc_rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); - InitResultRelInfo(chgcxt->cc_rri, relation, 0, 0, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); + InitResultRelInfo(dest->rri, relation, 0, 0, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3137,12 +3142,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3161,34 +3166,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index f9eb23e52c9..b4d5abbaca7 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2660,6 +2660,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v01-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-06-16 11:54 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-06-16 11:54 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 221 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 160 insertions(+), 110 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index fa98b8b9247..04d39ad8c86 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -93,40 +93,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -173,22 +139,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -197,6 +160,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2613,18 +2579,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2633,7 +2612,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2682,14 +2661,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2705,7 +2684,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2718,7 +2697,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2726,7 +2705,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2735,6 +2714,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2742,16 +2723,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2763,10 +2743,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2794,8 +2774,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2944,10 +2924,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2958,9 +2939,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2968,13 +2949,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -2997,16 +2978,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3077,7 +3058,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3093,41 +3074,65 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); - chgcxt->cc_rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); - InitResultRelInfo(chgcxt->cc_rri, relation, 0, 0, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); + InitResultRelInfo(dest->rri, relation, 0, 0, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3137,12 +3142,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3161,34 +3166,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index f9eb23e52c9..b4d5abbaca7 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2660,6 +2660,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v01-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-06-16 11:54 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-06-16 11:54 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 221 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 160 insertions(+), 110 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index fa98b8b9247..04d39ad8c86 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -93,40 +93,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -173,22 +139,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -197,6 +160,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2613,18 +2579,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2633,7 +2612,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2682,14 +2661,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2705,7 +2684,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2718,7 +2697,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2726,7 +2705,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2735,6 +2714,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2742,16 +2723,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2763,10 +2743,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2794,8 +2774,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2944,10 +2924,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2958,9 +2939,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2968,13 +2949,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -2997,16 +2978,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3077,7 +3058,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3093,41 +3074,65 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); - chgcxt->cc_rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); - InitResultRelInfo(chgcxt->cc_rri, relation, 0, 0, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); + InitResultRelInfo(dest->rri, relation, 0, 0, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3137,12 +3142,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3161,34 +3166,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index f9eb23e52c9..b4d5abbaca7 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2660,6 +2660,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v01-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-06-16 11:54 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-06-16 11:54 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 221 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 160 insertions(+), 110 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index fa98b8b9247..04d39ad8c86 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -93,40 +93,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -173,22 +139,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -197,6 +160,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2613,18 +2579,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2633,7 +2612,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2682,14 +2661,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2705,7 +2684,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2718,7 +2697,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2726,7 +2705,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2735,6 +2714,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2742,16 +2723,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2763,10 +2743,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2794,8 +2774,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2944,10 +2924,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2958,9 +2939,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2968,13 +2949,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -2997,16 +2978,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3077,7 +3058,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3093,41 +3074,65 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); - chgcxt->cc_rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); - InitResultRelInfo(chgcxt->cc_rri, relation, 0, 0, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); + InitResultRelInfo(dest->rri, relation, 0, 0, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3137,12 +3142,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3161,34 +3166,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index f9eb23e52c9..b4d5abbaca7 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2660,6 +2660,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v01-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-06-16 11:54 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-06-16 11:54 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 221 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 160 insertions(+), 110 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index fa98b8b9247..04d39ad8c86 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -93,40 +93,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -173,22 +139,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -197,6 +160,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2613,18 +2579,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2633,7 +2612,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2682,14 +2661,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2705,7 +2684,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2718,7 +2697,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2726,7 +2705,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2735,6 +2714,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2742,16 +2723,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2763,10 +2743,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2794,8 +2774,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2944,10 +2924,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2958,9 +2939,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2968,13 +2949,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -2997,16 +2978,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3077,7 +3058,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3093,41 +3074,65 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); - chgcxt->cc_rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); - InitResultRelInfo(chgcxt->cc_rri, relation, 0, 0, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); + InitResultRelInfo(dest->rri, relation, 0, 0, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3137,12 +3142,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3161,34 +3166,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index f9eb23e52c9..b4d5abbaca7 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2660,6 +2660,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v01-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-06-16 11:54 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-06-16 11:54 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 221 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 160 insertions(+), 110 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index fa98b8b9247..04d39ad8c86 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -93,40 +93,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -173,22 +139,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -197,6 +160,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2613,18 +2579,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2633,7 +2612,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2682,14 +2661,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2705,7 +2684,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2718,7 +2697,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2726,7 +2705,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2735,6 +2714,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2742,16 +2723,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2763,10 +2743,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2794,8 +2774,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2944,10 +2924,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2958,9 +2939,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2968,13 +2949,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -2997,16 +2978,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3077,7 +3058,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3093,41 +3074,65 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); - chgcxt->cc_rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); - InitResultRelInfo(chgcxt->cc_rri, relation, 0, 0, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); + InitResultRelInfo(dest->rri, relation, 0, 0, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3137,12 +3142,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3161,34 +3166,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index f9eb23e52c9..b4d5abbaca7 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2660,6 +2660,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v01-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-06-16 11:54 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-06-16 11:54 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 221 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 160 insertions(+), 110 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index fa98b8b9247..04d39ad8c86 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -93,40 +93,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -173,22 +139,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -197,6 +160,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2613,18 +2579,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2633,7 +2612,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2682,14 +2661,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2705,7 +2684,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2718,7 +2697,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2726,7 +2705,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2735,6 +2714,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2742,16 +2723,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2763,10 +2743,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2794,8 +2774,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2944,10 +2924,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2958,9 +2939,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2968,13 +2949,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -2997,16 +2978,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3077,7 +3058,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3093,41 +3074,65 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); - chgcxt->cc_rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); - InitResultRelInfo(chgcxt->cc_rri, relation, 0, 0, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); + InitResultRelInfo(dest->rri, relation, 0, 0, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3137,12 +3142,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3161,34 +3166,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index f9eb23e52c9..b4d5abbaca7 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2660,6 +2660,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v01-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-06-16 11:54 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-06-16 11:54 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 221 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 160 insertions(+), 110 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index fa98b8b9247..04d39ad8c86 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -93,40 +93,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -173,22 +139,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -197,6 +160,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2613,18 +2579,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2633,7 +2612,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2682,14 +2661,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2705,7 +2684,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2718,7 +2697,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2726,7 +2705,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2735,6 +2714,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2742,16 +2723,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2763,10 +2743,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2794,8 +2774,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2944,10 +2924,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2958,9 +2939,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2968,13 +2949,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -2997,16 +2978,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3077,7 +3058,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3093,41 +3074,65 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); - chgcxt->cc_rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); - InitResultRelInfo(chgcxt->cc_rri, relation, 0, 0, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); + InitResultRelInfo(dest->rri, relation, 0, 0, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3137,12 +3142,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3161,34 +3166,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index f9eb23e52c9..b4d5abbaca7 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2660,6 +2660,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v01-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-06-16 11:54 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-06-16 11:54 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 221 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 160 insertions(+), 110 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index fa98b8b9247..04d39ad8c86 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -93,40 +93,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -173,22 +139,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -197,6 +160,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2613,18 +2579,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2633,7 +2612,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2682,14 +2661,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2705,7 +2684,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2718,7 +2697,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2726,7 +2705,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2735,6 +2714,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2742,16 +2723,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2763,10 +2743,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2794,8 +2774,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2944,10 +2924,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2958,9 +2939,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2968,13 +2949,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -2997,16 +2978,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3077,7 +3058,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3093,41 +3074,65 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); - chgcxt->cc_rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); - InitResultRelInfo(chgcxt->cc_rri, relation, 0, 0, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); + InitResultRelInfo(dest->rri, relation, 0, 0, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3137,12 +3142,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3161,34 +3166,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index f9eb23e52c9..b4d5abbaca7 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2660,6 +2660,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v01-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-06-16 11:54 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-06-16 11:54 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 221 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 160 insertions(+), 110 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index fa98b8b9247..04d39ad8c86 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -93,40 +93,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -173,22 +139,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -197,6 +160,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2613,18 +2579,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2633,7 +2612,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2682,14 +2661,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2705,7 +2684,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2718,7 +2697,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2726,7 +2705,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2735,6 +2714,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2742,16 +2723,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2763,10 +2743,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2794,8 +2774,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2944,10 +2924,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2958,9 +2939,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2968,13 +2949,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -2997,16 +2978,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3077,7 +3058,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3093,41 +3074,65 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); - chgcxt->cc_rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); - InitResultRelInfo(chgcxt->cc_rri, relation, 0, 0, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); + InitResultRelInfo(dest->rri, relation, 0, 0, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3137,12 +3142,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3161,34 +3166,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index f9eb23e52c9..b4d5abbaca7 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2660,6 +2660,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v01-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-06-16 11:54 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-06-16 11:54 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 221 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 160 insertions(+), 110 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index fa98b8b9247..04d39ad8c86 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -93,40 +93,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -173,22 +139,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -197,6 +160,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2613,18 +2579,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2633,7 +2612,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2682,14 +2661,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2705,7 +2684,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2718,7 +2697,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2726,7 +2705,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2735,6 +2714,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2742,16 +2723,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2763,10 +2743,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2794,8 +2774,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2944,10 +2924,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2958,9 +2939,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2968,13 +2949,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -2997,16 +2978,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3077,7 +3058,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3093,41 +3074,65 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); - chgcxt->cc_rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); - InitResultRelInfo(chgcxt->cc_rri, relation, 0, 0, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); + InitResultRelInfo(dest->rri, relation, 0, 0, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3137,12 +3142,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3161,34 +3166,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index f9eb23e52c9..b4d5abbaca7 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2660,6 +2660,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v01-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-06-16 11:54 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-06-16 11:54 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 221 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 160 insertions(+), 110 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index fa98b8b9247..04d39ad8c86 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -93,40 +93,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -173,22 +139,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -197,6 +160,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2613,18 +2579,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2633,7 +2612,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2682,14 +2661,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2705,7 +2684,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2718,7 +2697,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2726,7 +2705,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2735,6 +2714,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2742,16 +2723,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2763,10 +2743,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2794,8 +2774,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2944,10 +2924,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2958,9 +2939,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2968,13 +2949,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -2997,16 +2978,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3077,7 +3058,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3093,41 +3074,65 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); - chgcxt->cc_rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); - InitResultRelInfo(chgcxt->cc_rri, relation, 0, 0, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); + InitResultRelInfo(dest->rri, relation, 0, 0, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3137,12 +3142,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3161,34 +3166,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index f9eb23e52c9..b4d5abbaca7 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2660,6 +2660,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v01-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-06-16 11:54 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-06-16 11:54 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 221 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 160 insertions(+), 110 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index fa98b8b9247..04d39ad8c86 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -93,40 +93,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -173,22 +139,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -197,6 +160,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2613,18 +2579,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2633,7 +2612,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2682,14 +2661,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2705,7 +2684,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2718,7 +2697,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2726,7 +2705,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2735,6 +2714,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2742,16 +2723,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2763,10 +2743,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2794,8 +2774,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2944,10 +2924,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2958,9 +2939,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2968,13 +2949,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -2997,16 +2978,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3077,7 +3058,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3093,41 +3074,65 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); - chgcxt->cc_rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); - InitResultRelInfo(chgcxt->cc_rri, relation, 0, 0, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); + InitResultRelInfo(dest->rri, relation, 0, 0, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3137,12 +3142,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3161,34 +3166,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index f9eb23e52c9..b4d5abbaca7 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2660,6 +2660,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v01-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-06-16 11:54 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-06-16 11:54 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 221 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 160 insertions(+), 110 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index fa98b8b9247..04d39ad8c86 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -93,40 +93,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -173,22 +139,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -197,6 +160,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2613,18 +2579,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2633,7 +2612,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2682,14 +2661,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2705,7 +2684,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2718,7 +2697,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2726,7 +2705,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2735,6 +2714,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2742,16 +2723,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2763,10 +2743,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2794,8 +2774,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2944,10 +2924,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2958,9 +2939,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2968,13 +2949,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -2997,16 +2978,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3077,7 +3058,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3093,41 +3074,65 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); - chgcxt->cc_rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); - InitResultRelInfo(chgcxt->cc_rri, relation, 0, 0, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); + InitResultRelInfo(dest->rri, relation, 0, 0, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3137,12 +3142,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3161,34 +3166,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index f9eb23e52c9..b4d5abbaca7 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2660,6 +2660,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v01-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-06-16 11:54 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-06-16 11:54 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 221 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 160 insertions(+), 110 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index fa98b8b9247..04d39ad8c86 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -93,40 +93,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -173,22 +139,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -197,6 +160,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2613,18 +2579,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2633,7 +2612,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2682,14 +2661,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2705,7 +2684,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2718,7 +2697,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2726,7 +2705,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2735,6 +2714,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2742,16 +2723,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2763,10 +2743,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2794,8 +2774,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2944,10 +2924,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2958,9 +2939,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2968,13 +2949,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -2997,16 +2978,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3077,7 +3058,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3093,41 +3074,65 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); - chgcxt->cc_rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); - InitResultRelInfo(chgcxt->cc_rri, relation, 0, 0, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); + InitResultRelInfo(dest->rri, relation, 0, 0, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3137,12 +3142,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3161,34 +3166,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index f9eb23e52c9..b4d5abbaca7 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2660,6 +2660,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v01-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-06-16 11:54 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-06-16 11:54 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 221 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 160 insertions(+), 110 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index fa98b8b9247..04d39ad8c86 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -93,40 +93,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -173,22 +139,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -197,6 +160,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2613,18 +2579,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2633,7 +2612,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2682,14 +2661,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2705,7 +2684,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2718,7 +2697,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2726,7 +2705,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2735,6 +2714,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2742,16 +2723,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2763,10 +2743,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2794,8 +2774,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2944,10 +2924,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2958,9 +2939,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2968,13 +2949,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -2997,16 +2978,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3077,7 +3058,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3093,41 +3074,65 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); - chgcxt->cc_rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); - InitResultRelInfo(chgcxt->cc_rri, relation, 0, 0, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); + InitResultRelInfo(dest->rri, relation, 0, 0, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3137,12 +3142,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3161,34 +3166,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index f9eb23e52c9..b4d5abbaca7 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2660,6 +2660,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v01-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-06-16 11:54 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-06-16 11:54 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 221 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 160 insertions(+), 110 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index fa98b8b9247..04d39ad8c86 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -93,40 +93,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -173,22 +139,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -197,6 +160,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2613,18 +2579,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2633,7 +2612,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2682,14 +2661,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2705,7 +2684,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2718,7 +2697,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2726,7 +2705,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2735,6 +2714,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2742,16 +2723,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2763,10 +2743,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2794,8 +2774,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2944,10 +2924,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2958,9 +2939,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2968,13 +2949,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -2997,16 +2978,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3077,7 +3058,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3093,41 +3074,65 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); - chgcxt->cc_rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); - InitResultRelInfo(chgcxt->cc_rri, relation, 0, 0, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); + InitResultRelInfo(dest->rri, relation, 0, 0, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3137,12 +3142,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3161,34 +3166,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index f9eb23e52c9..b4d5abbaca7 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2660,6 +2660,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v01-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-06-16 11:54 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-06-16 11:54 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 221 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 160 insertions(+), 110 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index fa98b8b9247..04d39ad8c86 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -93,40 +93,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -173,22 +139,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -197,6 +160,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2613,18 +2579,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2633,7 +2612,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2682,14 +2661,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2705,7 +2684,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2718,7 +2697,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2726,7 +2705,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2735,6 +2714,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2742,16 +2723,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2763,10 +2743,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2794,8 +2774,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2944,10 +2924,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2958,9 +2939,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2968,13 +2949,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -2997,16 +2978,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3077,7 +3058,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3093,41 +3074,65 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); - chgcxt->cc_rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); - InitResultRelInfo(chgcxt->cc_rri, relation, 0, 0, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); + InitResultRelInfo(dest->rri, relation, 0, 0, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3137,12 +3142,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3161,34 +3166,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index f9eb23e52c9..b4d5abbaca7 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2660,6 +2660,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v01-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-06-16 11:54 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-06-16 11:54 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 221 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 160 insertions(+), 110 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index fa98b8b9247..04d39ad8c86 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -93,40 +93,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -173,22 +139,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -197,6 +160,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2613,18 +2579,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2633,7 +2612,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2682,14 +2661,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2705,7 +2684,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2718,7 +2697,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2726,7 +2705,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2735,6 +2714,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2742,16 +2723,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2763,10 +2743,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2794,8 +2774,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2944,10 +2924,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2958,9 +2939,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2968,13 +2949,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -2997,16 +2978,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3077,7 +3058,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3093,41 +3074,65 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); - chgcxt->cc_rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); - InitResultRelInfo(chgcxt->cc_rri, relation, 0, 0, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); + InitResultRelInfo(dest->rri, relation, 0, 0, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3137,12 +3142,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3161,34 +3166,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index f9eb23e52c9..b4d5abbaca7 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2660,6 +2660,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v01-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-06-16 11:54 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-06-16 11:54 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 221 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 160 insertions(+), 110 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index fa98b8b9247..04d39ad8c86 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -93,40 +93,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -173,22 +139,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -197,6 +160,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2613,18 +2579,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2633,7 +2612,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2682,14 +2661,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2705,7 +2684,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2718,7 +2697,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2726,7 +2705,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2735,6 +2714,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2742,16 +2723,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2763,10 +2743,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2794,8 +2774,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2944,10 +2924,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2958,9 +2939,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2968,13 +2949,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -2997,16 +2978,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3077,7 +3058,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3093,41 +3074,65 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); - chgcxt->cc_rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); - InitResultRelInfo(chgcxt->cc_rri, relation, 0, 0, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); + InitResultRelInfo(dest->rri, relation, 0, 0, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3137,12 +3142,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3161,34 +3166,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index f9eb23e52c9..b4d5abbaca7 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2660,6 +2660,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v01-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-06-16 11:54 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-06-16 11:54 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 221 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 160 insertions(+), 110 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index fa98b8b9247..04d39ad8c86 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -93,40 +93,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -173,22 +139,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -197,6 +160,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2613,18 +2579,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2633,7 +2612,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2682,14 +2661,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2705,7 +2684,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2718,7 +2697,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2726,7 +2705,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2735,6 +2714,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2742,16 +2723,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2763,10 +2743,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2794,8 +2774,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2944,10 +2924,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2958,9 +2939,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2968,13 +2949,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -2997,16 +2978,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3077,7 +3058,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3093,41 +3074,65 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); - chgcxt->cc_rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); - InitResultRelInfo(chgcxt->cc_rri, relation, 0, 0, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); + InitResultRelInfo(dest->rri, relation, 0, 0, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3137,12 +3142,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3161,34 +3166,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index f9eb23e52c9..b4d5abbaca7 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2660,6 +2660,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v01-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-06-16 11:54 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-06-16 11:54 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 221 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 160 insertions(+), 110 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index fa98b8b9247..04d39ad8c86 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -93,40 +93,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -173,22 +139,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -197,6 +160,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2613,18 +2579,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2633,7 +2612,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2682,14 +2661,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2705,7 +2684,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2718,7 +2697,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2726,7 +2705,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2735,6 +2714,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2742,16 +2723,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2763,10 +2743,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2794,8 +2774,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2944,10 +2924,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2958,9 +2939,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2968,13 +2949,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -2997,16 +2978,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3077,7 +3058,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3093,41 +3074,65 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); - chgcxt->cc_rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); - InitResultRelInfo(chgcxt->cc_rri, relation, 0, 0, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); + InitResultRelInfo(dest->rri, relation, 0, 0, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3137,12 +3142,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3161,34 +3166,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index f9eb23e52c9..b4d5abbaca7 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2660,6 +2660,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v01-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-06-16 11:54 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-06-16 11:54 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 221 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 160 insertions(+), 110 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index fa98b8b9247..04d39ad8c86 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -93,40 +93,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -173,22 +139,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -197,6 +160,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2613,18 +2579,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2633,7 +2612,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2682,14 +2661,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2705,7 +2684,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2718,7 +2697,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2726,7 +2705,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2735,6 +2714,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2742,16 +2723,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2763,10 +2743,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2794,8 +2774,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2944,10 +2924,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2958,9 +2939,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2968,13 +2949,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -2997,16 +2978,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3077,7 +3058,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3093,41 +3074,65 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); - chgcxt->cc_rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); - InitResultRelInfo(chgcxt->cc_rri, relation, 0, 0, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); + InitResultRelInfo(dest->rri, relation, 0, 0, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3137,12 +3142,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3161,34 +3166,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index f9eb23e52c9..b4d5abbaca7 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2660,6 +2660,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v01-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-06-16 11:54 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-06-16 11:54 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 221 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 160 insertions(+), 110 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index fa98b8b9247..04d39ad8c86 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -93,40 +93,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -173,22 +139,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -197,6 +160,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2613,18 +2579,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2633,7 +2612,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2682,14 +2661,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2705,7 +2684,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2718,7 +2697,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2726,7 +2705,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2735,6 +2714,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2742,16 +2723,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2763,10 +2743,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2794,8 +2774,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2944,10 +2924,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2958,9 +2939,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2968,13 +2949,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -2997,16 +2978,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3077,7 +3058,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3093,41 +3074,65 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); - chgcxt->cc_rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); - InitResultRelInfo(chgcxt->cc_rri, relation, 0, 0, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); + InitResultRelInfo(dest->rri, relation, 0, 0, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3137,12 +3142,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3161,34 +3166,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index f9eb23e52c9..b4d5abbaca7 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2660,6 +2660,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v01-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-06-16 11:54 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-06-16 11:54 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 221 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 160 insertions(+), 110 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index fa98b8b9247..04d39ad8c86 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -93,40 +93,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -173,22 +139,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -197,6 +160,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2613,18 +2579,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2633,7 +2612,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2682,14 +2661,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2705,7 +2684,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2718,7 +2697,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2726,7 +2705,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2735,6 +2714,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2742,16 +2723,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2763,10 +2743,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2794,8 +2774,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2944,10 +2924,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2958,9 +2939,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2968,13 +2949,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -2997,16 +2978,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3077,7 +3058,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3093,41 +3074,65 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); - chgcxt->cc_rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); - InitResultRelInfo(chgcxt->cc_rri, relation, 0, 0, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); + InitResultRelInfo(dest->rri, relation, 0, 0, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3137,12 +3142,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3161,34 +3166,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index f9eb23e52c9..b4d5abbaca7 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2660,6 +2660,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v01-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-06-16 11:54 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-06-16 11:54 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 221 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 160 insertions(+), 110 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index fa98b8b9247..04d39ad8c86 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -93,40 +93,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -173,22 +139,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -197,6 +160,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2613,18 +2579,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2633,7 +2612,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2682,14 +2661,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2705,7 +2684,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2718,7 +2697,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2726,7 +2705,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2735,6 +2714,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2742,16 +2723,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2763,10 +2743,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2794,8 +2774,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2944,10 +2924,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2958,9 +2939,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2968,13 +2949,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -2997,16 +2978,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3077,7 +3058,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3093,41 +3074,65 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); - chgcxt->cc_rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); - InitResultRelInfo(chgcxt->cc_rri, relation, 0, 0, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); + InitResultRelInfo(dest->rri, relation, 0, 0, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3137,12 +3142,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3161,34 +3166,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index f9eb23e52c9..b4d5abbaca7 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2660,6 +2660,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v01-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-06-16 11:54 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-06-16 11:54 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 221 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 160 insertions(+), 110 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index fa98b8b9247..04d39ad8c86 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -93,40 +93,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -173,22 +139,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -197,6 +160,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2613,18 +2579,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2633,7 +2612,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2682,14 +2661,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2705,7 +2684,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2718,7 +2697,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2726,7 +2705,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2735,6 +2714,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2742,16 +2723,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2763,10 +2743,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2794,8 +2774,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2944,10 +2924,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2958,9 +2939,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2968,13 +2949,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -2997,16 +2978,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3077,7 +3058,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3093,41 +3074,65 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); - chgcxt->cc_rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); - InitResultRelInfo(chgcxt->cc_rri, relation, 0, 0, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); + InitResultRelInfo(dest->rri, relation, 0, 0, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3137,12 +3142,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3161,34 +3166,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index f9eb23e52c9..b4d5abbaca7 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2660,6 +2660,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v01-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-06-16 11:54 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-06-16 11:54 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 221 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 160 insertions(+), 110 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index fa98b8b9247..04d39ad8c86 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -93,40 +93,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -173,22 +139,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -197,6 +160,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2613,18 +2579,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2633,7 +2612,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2682,14 +2661,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2705,7 +2684,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2718,7 +2697,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2726,7 +2705,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2735,6 +2714,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2742,16 +2723,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2763,10 +2743,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2794,8 +2774,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2944,10 +2924,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2958,9 +2939,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2968,13 +2949,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -2997,16 +2978,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3077,7 +3058,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3093,41 +3074,65 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); - chgcxt->cc_rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); - InitResultRelInfo(chgcxt->cc_rri, relation, 0, 0, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); + InitResultRelInfo(dest->rri, relation, 0, 0, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3137,12 +3142,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3161,34 +3166,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index f9eb23e52c9..b4d5abbaca7 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2660,6 +2660,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v01-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-06-16 11:54 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-06-16 11:54 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 221 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 160 insertions(+), 110 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index fa98b8b9247..04d39ad8c86 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -93,40 +93,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -173,22 +139,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -197,6 +160,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2613,18 +2579,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2633,7 +2612,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2682,14 +2661,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2705,7 +2684,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2718,7 +2697,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2726,7 +2705,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2735,6 +2714,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2742,16 +2723,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2763,10 +2743,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2794,8 +2774,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2944,10 +2924,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2958,9 +2939,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2968,13 +2949,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -2997,16 +2978,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3077,7 +3058,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3093,41 +3074,65 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); - chgcxt->cc_rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); - InitResultRelInfo(chgcxt->cc_rri, relation, 0, 0, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); + InitResultRelInfo(dest->rri, relation, 0, 0, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3137,12 +3142,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3161,34 +3166,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index f9eb23e52c9..b4d5abbaca7 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2660,6 +2660,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v01-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-06-16 11:54 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-06-16 11:54 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 221 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 160 insertions(+), 110 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index fa98b8b9247..04d39ad8c86 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -93,40 +93,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -173,22 +139,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -197,6 +160,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2613,18 +2579,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2633,7 +2612,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2682,14 +2661,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2705,7 +2684,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2718,7 +2697,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2726,7 +2705,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2735,6 +2714,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2742,16 +2723,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2763,10 +2743,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2794,8 +2774,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2944,10 +2924,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2958,9 +2939,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2968,13 +2949,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -2997,16 +2978,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3077,7 +3058,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3093,41 +3074,65 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); - chgcxt->cc_rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); - InitResultRelInfo(chgcxt->cc_rri, relation, 0, 0, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); + InitResultRelInfo(dest->rri, relation, 0, 0, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3137,12 +3142,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3161,34 +3166,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index f9eb23e52c9..b4d5abbaca7 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2660,6 +2660,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v01-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-06-16 11:54 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-06-16 11:54 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 221 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 160 insertions(+), 110 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index fa98b8b9247..04d39ad8c86 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -93,40 +93,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -173,22 +139,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -197,6 +160,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2613,18 +2579,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2633,7 +2612,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2682,14 +2661,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2705,7 +2684,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2718,7 +2697,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2726,7 +2705,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2735,6 +2714,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2742,16 +2723,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2763,10 +2743,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2794,8 +2774,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2944,10 +2924,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2958,9 +2939,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2968,13 +2949,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -2997,16 +2978,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3077,7 +3058,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3093,41 +3074,65 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); - chgcxt->cc_rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); - InitResultRelInfo(chgcxt->cc_rri, relation, 0, 0, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); + InitResultRelInfo(dest->rri, relation, 0, 0, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3137,12 +3142,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3161,34 +3166,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index f9eb23e52c9..b4d5abbaca7 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2660,6 +2660,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v01-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-06-16 11:54 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-06-16 11:54 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 221 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 160 insertions(+), 110 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index fa98b8b9247..04d39ad8c86 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -93,40 +93,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -173,22 +139,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -197,6 +160,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2613,18 +2579,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2633,7 +2612,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2682,14 +2661,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2705,7 +2684,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2718,7 +2697,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2726,7 +2705,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2735,6 +2714,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2742,16 +2723,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2763,10 +2743,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2794,8 +2774,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2944,10 +2924,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2958,9 +2939,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2968,13 +2949,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -2997,16 +2978,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3077,7 +3058,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3093,41 +3074,65 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); - chgcxt->cc_rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); - InitResultRelInfo(chgcxt->cc_rri, relation, 0, 0, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); + InitResultRelInfo(dest->rri, relation, 0, 0, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3137,12 +3142,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3161,34 +3166,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index f9eb23e52c9..b4d5abbaca7 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2660,6 +2660,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v01-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-06-16 11:54 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-06-16 11:54 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 221 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 160 insertions(+), 110 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index fa98b8b9247..04d39ad8c86 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -93,40 +93,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -173,22 +139,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -197,6 +160,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2613,18 +2579,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2633,7 +2612,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2682,14 +2661,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2705,7 +2684,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2718,7 +2697,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2726,7 +2705,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2735,6 +2714,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2742,16 +2723,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2763,10 +2743,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2794,8 +2774,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2944,10 +2924,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2958,9 +2939,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2968,13 +2949,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -2997,16 +2978,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3077,7 +3058,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3093,41 +3074,65 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); - chgcxt->cc_rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); - InitResultRelInfo(chgcxt->cc_rri, relation, 0, 0, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); + InitResultRelInfo(dest->rri, relation, 0, 0, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3137,12 +3142,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3161,34 +3166,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index f9eb23e52c9..b4d5abbaca7 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2660,6 +2660,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v01-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-06-16 11:54 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-06-16 11:54 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 221 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 160 insertions(+), 110 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index fa98b8b9247..04d39ad8c86 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -93,40 +93,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -173,22 +139,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -197,6 +160,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2613,18 +2579,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2633,7 +2612,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2682,14 +2661,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2705,7 +2684,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2718,7 +2697,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2726,7 +2705,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2735,6 +2714,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2742,16 +2723,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2763,10 +2743,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2794,8 +2774,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2944,10 +2924,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2958,9 +2939,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2968,13 +2949,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -2997,16 +2978,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3077,7 +3058,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3093,41 +3074,65 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); - chgcxt->cc_rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); - InitResultRelInfo(chgcxt->cc_rri, relation, 0, 0, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); + InitResultRelInfo(dest->rri, relation, 0, 0, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3137,12 +3142,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3161,34 +3166,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index f9eb23e52c9..b4d5abbaca7 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2660,6 +2660,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v01-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-06-16 11:54 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-06-16 11:54 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 221 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 160 insertions(+), 110 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index fa98b8b9247..04d39ad8c86 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -93,40 +93,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -173,22 +139,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -197,6 +160,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2613,18 +2579,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2633,7 +2612,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2682,14 +2661,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2705,7 +2684,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2718,7 +2697,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2726,7 +2705,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2735,6 +2714,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2742,16 +2723,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2763,10 +2743,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2794,8 +2774,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2944,10 +2924,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2958,9 +2939,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2968,13 +2949,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -2997,16 +2978,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3077,7 +3058,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3093,41 +3074,65 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); - chgcxt->cc_rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); - InitResultRelInfo(chgcxt->cc_rri, relation, 0, 0, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); + InitResultRelInfo(dest->rri, relation, 0, 0, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3137,12 +3142,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3161,34 +3166,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index f9eb23e52c9..b4d5abbaca7 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2660,6 +2660,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v01-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-06-16 11:54 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-06-16 11:54 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 221 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 160 insertions(+), 110 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index fa98b8b9247..04d39ad8c86 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -93,40 +93,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -173,22 +139,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -197,6 +160,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2613,18 +2579,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2633,7 +2612,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2682,14 +2661,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2705,7 +2684,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2718,7 +2697,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2726,7 +2705,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2735,6 +2714,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2742,16 +2723,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2763,10 +2743,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2794,8 +2774,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2944,10 +2924,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2958,9 +2939,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2968,13 +2949,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -2997,16 +2978,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3077,7 +3058,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3093,41 +3074,65 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); - chgcxt->cc_rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); - InitResultRelInfo(chgcxt->cc_rri, relation, 0, 0, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); + InitResultRelInfo(dest->rri, relation, 0, 0, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3137,12 +3142,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3161,34 +3166,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index f9eb23e52c9..b4d5abbaca7 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2660,6 +2660,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v01-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-06-16 11:54 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-06-16 11:54 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 221 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 160 insertions(+), 110 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index fa98b8b9247..04d39ad8c86 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -93,40 +93,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -173,22 +139,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -197,6 +160,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2613,18 +2579,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2633,7 +2612,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2682,14 +2661,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2705,7 +2684,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2718,7 +2697,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2726,7 +2705,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2735,6 +2714,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2742,16 +2723,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2763,10 +2743,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2794,8 +2774,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2944,10 +2924,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2958,9 +2939,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2968,13 +2949,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -2997,16 +2978,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3077,7 +3058,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3093,41 +3074,65 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); - chgcxt->cc_rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); - InitResultRelInfo(chgcxt->cc_rri, relation, 0, 0, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); + InitResultRelInfo(dest->rri, relation, 0, 0, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3137,12 +3142,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3161,34 +3166,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index f9eb23e52c9..b4d5abbaca7 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2660,6 +2660,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v01-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-06-16 11:54 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-06-16 11:54 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 221 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 160 insertions(+), 110 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index fa98b8b9247..04d39ad8c86 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -93,40 +93,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -173,22 +139,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -197,6 +160,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2613,18 +2579,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2633,7 +2612,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2682,14 +2661,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2705,7 +2684,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2718,7 +2697,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2726,7 +2705,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2735,6 +2714,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2742,16 +2723,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2763,10 +2743,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2794,8 +2774,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2944,10 +2924,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2958,9 +2939,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2968,13 +2949,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -2997,16 +2978,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3077,7 +3058,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3093,41 +3074,65 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); - chgcxt->cc_rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); - InitResultRelInfo(chgcxt->cc_rri, relation, 0, 0, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); + InitResultRelInfo(dest->rri, relation, 0, 0, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3137,12 +3142,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3161,34 +3166,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index f9eb23e52c9..b4d5abbaca7 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2660,6 +2660,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v01-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-06-16 11:54 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-06-16 11:54 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 221 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 160 insertions(+), 110 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index fa98b8b9247..04d39ad8c86 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -93,40 +93,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -173,22 +139,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -197,6 +160,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2613,18 +2579,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2633,7 +2612,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2682,14 +2661,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2705,7 +2684,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2718,7 +2697,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2726,7 +2705,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2735,6 +2714,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2742,16 +2723,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2763,10 +2743,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2794,8 +2774,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2944,10 +2924,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2958,9 +2939,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2968,13 +2949,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -2997,16 +2978,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3077,7 +3058,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3093,41 +3074,65 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); - chgcxt->cc_rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); - InitResultRelInfo(chgcxt->cc_rri, relation, 0, 0, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); + InitResultRelInfo(dest->rri, relation, 0, 0, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3137,12 +3142,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3161,34 +3166,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index f9eb23e52c9..b4d5abbaca7 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2660,6 +2660,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v01-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-06-16 11:54 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-06-16 11:54 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 221 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 160 insertions(+), 110 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index fa98b8b9247..04d39ad8c86 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -93,40 +93,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -173,22 +139,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -197,6 +160,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2613,18 +2579,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2633,7 +2612,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2682,14 +2661,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2705,7 +2684,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2718,7 +2697,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2726,7 +2705,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2735,6 +2714,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2742,16 +2723,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2763,10 +2743,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2794,8 +2774,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2944,10 +2924,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2958,9 +2939,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2968,13 +2949,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -2997,16 +2978,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3077,7 +3058,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3093,41 +3074,65 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); - chgcxt->cc_rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); - InitResultRelInfo(chgcxt->cc_rri, relation, 0, 0, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); + InitResultRelInfo(dest->rri, relation, 0, 0, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3137,12 +3142,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3161,34 +3166,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index f9eb23e52c9..b4d5abbaca7 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2660,6 +2660,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v01-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-06-16 11:54 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-06-16 11:54 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 221 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 160 insertions(+), 110 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index fa98b8b9247..04d39ad8c86 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -93,40 +93,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -173,22 +139,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -197,6 +160,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2613,18 +2579,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2633,7 +2612,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2682,14 +2661,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2705,7 +2684,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2718,7 +2697,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2726,7 +2705,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2735,6 +2714,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2742,16 +2723,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2763,10 +2743,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2794,8 +2774,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2944,10 +2924,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2958,9 +2939,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2968,13 +2949,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -2997,16 +2978,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3077,7 +3058,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3093,41 +3074,65 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); - chgcxt->cc_rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); - InitResultRelInfo(chgcxt->cc_rri, relation, 0, 0, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = (ResultRelInfo *) palloc(sizeof(ResultRelInfo)); + InitResultRelInfo(dest->rri, relation, 0, 0, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3137,12 +3142,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3161,34 +3166,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index f9eb23e52c9..b4d5abbaca7 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2660,6 +2660,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v01-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-07-15 08:37 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-07-15 08:37 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 223 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 161 insertions(+), 111 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index 19927c15bf3..392332b4b2b 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -95,40 +95,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -175,22 +141,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -199,6 +162,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2614,18 +2580,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2634,7 +2613,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2683,14 +2662,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2706,7 +2685,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2719,7 +2698,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2727,7 +2706,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2736,6 +2715,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2743,16 +2724,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2764,10 +2744,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2795,8 +2775,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2948,10 +2928,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2962,9 +2943,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2972,13 +2953,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -3001,16 +2982,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3081,7 +3062,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3097,10 +3078,34 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); /* * Set up a range table for the executor, containing our repacked table as @@ -3149,41 +3154,41 @@ initialize_change_context(ChangeContext *chgcxt, perminfo->updatedCols = updatedCols; /* finally we can initialize the range table proper */ - ExecInitRangeTable(chgcxt->cc_estate, list_make1(rte), perminfos, + ExecInitRangeTable(dest->estate, list_make1(rte), perminfos, bms_make_singleton(1)); } /* Set up our ResultRelInfo to use for index updates */ - chgcxt->cc_rri = makeNode(ResultRelInfo); - InitResultRelInfo(chgcxt->cc_rri, relation, 1, NULL, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = makeNode(ResultRelInfo); + InitResultRelInfo(dest->rri, relation, 1, NULL, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3193,12 +3198,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3217,34 +3222,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index 56c1f997f88..25ac7079099 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2664,6 +2664,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v02-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-07-15 08:37 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-07-15 08:37 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 223 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 161 insertions(+), 111 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index 19927c15bf3..392332b4b2b 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -95,40 +95,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -175,22 +141,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -199,6 +162,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2614,18 +2580,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2634,7 +2613,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2683,14 +2662,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2706,7 +2685,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2719,7 +2698,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2727,7 +2706,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2736,6 +2715,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2743,16 +2724,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2764,10 +2744,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2795,8 +2775,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2948,10 +2928,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2962,9 +2943,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2972,13 +2953,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -3001,16 +2982,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3081,7 +3062,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3097,10 +3078,34 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); /* * Set up a range table for the executor, containing our repacked table as @@ -3149,41 +3154,41 @@ initialize_change_context(ChangeContext *chgcxt, perminfo->updatedCols = updatedCols; /* finally we can initialize the range table proper */ - ExecInitRangeTable(chgcxt->cc_estate, list_make1(rte), perminfos, + ExecInitRangeTable(dest->estate, list_make1(rte), perminfos, bms_make_singleton(1)); } /* Set up our ResultRelInfo to use for index updates */ - chgcxt->cc_rri = makeNode(ResultRelInfo); - InitResultRelInfo(chgcxt->cc_rri, relation, 1, NULL, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = makeNode(ResultRelInfo); + InitResultRelInfo(dest->rri, relation, 1, NULL, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3193,12 +3198,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3217,34 +3222,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index 56c1f997f88..25ac7079099 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2664,6 +2664,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v02-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-07-15 08:37 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-07-15 08:37 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 223 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 161 insertions(+), 111 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index 19927c15bf3..392332b4b2b 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -95,40 +95,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -175,22 +141,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -199,6 +162,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2614,18 +2580,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2634,7 +2613,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2683,14 +2662,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2706,7 +2685,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2719,7 +2698,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2727,7 +2706,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2736,6 +2715,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2743,16 +2724,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2764,10 +2744,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2795,8 +2775,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2948,10 +2928,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2962,9 +2943,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2972,13 +2953,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -3001,16 +2982,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3081,7 +3062,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3097,10 +3078,34 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); /* * Set up a range table for the executor, containing our repacked table as @@ -3149,41 +3154,41 @@ initialize_change_context(ChangeContext *chgcxt, perminfo->updatedCols = updatedCols; /* finally we can initialize the range table proper */ - ExecInitRangeTable(chgcxt->cc_estate, list_make1(rte), perminfos, + ExecInitRangeTable(dest->estate, list_make1(rte), perminfos, bms_make_singleton(1)); } /* Set up our ResultRelInfo to use for index updates */ - chgcxt->cc_rri = makeNode(ResultRelInfo); - InitResultRelInfo(chgcxt->cc_rri, relation, 1, NULL, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = makeNode(ResultRelInfo); + InitResultRelInfo(dest->rri, relation, 1, NULL, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3193,12 +3198,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3217,34 +3222,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index 56c1f997f88..25ac7079099 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2664,6 +2664,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v02-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-07-15 08:37 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-07-15 08:37 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 223 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 161 insertions(+), 111 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index 19927c15bf3..392332b4b2b 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -95,40 +95,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -175,22 +141,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -199,6 +162,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2614,18 +2580,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2634,7 +2613,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2683,14 +2662,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2706,7 +2685,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2719,7 +2698,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2727,7 +2706,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2736,6 +2715,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2743,16 +2724,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2764,10 +2744,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2795,8 +2775,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2948,10 +2928,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2962,9 +2943,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2972,13 +2953,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -3001,16 +2982,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3081,7 +3062,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3097,10 +3078,34 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); /* * Set up a range table for the executor, containing our repacked table as @@ -3149,41 +3154,41 @@ initialize_change_context(ChangeContext *chgcxt, perminfo->updatedCols = updatedCols; /* finally we can initialize the range table proper */ - ExecInitRangeTable(chgcxt->cc_estate, list_make1(rte), perminfos, + ExecInitRangeTable(dest->estate, list_make1(rte), perminfos, bms_make_singleton(1)); } /* Set up our ResultRelInfo to use for index updates */ - chgcxt->cc_rri = makeNode(ResultRelInfo); - InitResultRelInfo(chgcxt->cc_rri, relation, 1, NULL, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = makeNode(ResultRelInfo); + InitResultRelInfo(dest->rri, relation, 1, NULL, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3193,12 +3198,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3217,34 +3222,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index 56c1f997f88..25ac7079099 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2664,6 +2664,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v02-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-07-15 08:37 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-07-15 08:37 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 223 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 161 insertions(+), 111 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index 19927c15bf3..392332b4b2b 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -95,40 +95,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -175,22 +141,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -199,6 +162,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2614,18 +2580,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2634,7 +2613,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2683,14 +2662,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2706,7 +2685,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2719,7 +2698,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2727,7 +2706,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2736,6 +2715,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2743,16 +2724,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2764,10 +2744,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2795,8 +2775,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2948,10 +2928,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2962,9 +2943,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2972,13 +2953,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -3001,16 +2982,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3081,7 +3062,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3097,10 +3078,34 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); /* * Set up a range table for the executor, containing our repacked table as @@ -3149,41 +3154,41 @@ initialize_change_context(ChangeContext *chgcxt, perminfo->updatedCols = updatedCols; /* finally we can initialize the range table proper */ - ExecInitRangeTable(chgcxt->cc_estate, list_make1(rte), perminfos, + ExecInitRangeTable(dest->estate, list_make1(rte), perminfos, bms_make_singleton(1)); } /* Set up our ResultRelInfo to use for index updates */ - chgcxt->cc_rri = makeNode(ResultRelInfo); - InitResultRelInfo(chgcxt->cc_rri, relation, 1, NULL, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = makeNode(ResultRelInfo); + InitResultRelInfo(dest->rri, relation, 1, NULL, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3193,12 +3198,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3217,34 +3222,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index 56c1f997f88..25ac7079099 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2664,6 +2664,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v02-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-07-15 08:37 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-07-15 08:37 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 223 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 161 insertions(+), 111 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index 19927c15bf3..392332b4b2b 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -95,40 +95,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -175,22 +141,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -199,6 +162,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2614,18 +2580,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2634,7 +2613,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2683,14 +2662,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2706,7 +2685,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2719,7 +2698,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2727,7 +2706,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2736,6 +2715,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2743,16 +2724,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2764,10 +2744,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2795,8 +2775,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2948,10 +2928,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2962,9 +2943,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2972,13 +2953,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -3001,16 +2982,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3081,7 +3062,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3097,10 +3078,34 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); /* * Set up a range table for the executor, containing our repacked table as @@ -3149,41 +3154,41 @@ initialize_change_context(ChangeContext *chgcxt, perminfo->updatedCols = updatedCols; /* finally we can initialize the range table proper */ - ExecInitRangeTable(chgcxt->cc_estate, list_make1(rte), perminfos, + ExecInitRangeTable(dest->estate, list_make1(rte), perminfos, bms_make_singleton(1)); } /* Set up our ResultRelInfo to use for index updates */ - chgcxt->cc_rri = makeNode(ResultRelInfo); - InitResultRelInfo(chgcxt->cc_rri, relation, 1, NULL, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = makeNode(ResultRelInfo); + InitResultRelInfo(dest->rri, relation, 1, NULL, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3193,12 +3198,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3217,34 +3222,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index 56c1f997f88..25ac7079099 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2664,6 +2664,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v02-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-07-15 08:37 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-07-15 08:37 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 223 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 161 insertions(+), 111 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index 19927c15bf3..392332b4b2b 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -95,40 +95,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -175,22 +141,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -199,6 +162,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2614,18 +2580,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2634,7 +2613,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2683,14 +2662,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2706,7 +2685,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2719,7 +2698,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2727,7 +2706,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2736,6 +2715,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2743,16 +2724,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2764,10 +2744,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2795,8 +2775,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2948,10 +2928,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2962,9 +2943,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2972,13 +2953,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -3001,16 +2982,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3081,7 +3062,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3097,10 +3078,34 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); /* * Set up a range table for the executor, containing our repacked table as @@ -3149,41 +3154,41 @@ initialize_change_context(ChangeContext *chgcxt, perminfo->updatedCols = updatedCols; /* finally we can initialize the range table proper */ - ExecInitRangeTable(chgcxt->cc_estate, list_make1(rte), perminfos, + ExecInitRangeTable(dest->estate, list_make1(rte), perminfos, bms_make_singleton(1)); } /* Set up our ResultRelInfo to use for index updates */ - chgcxt->cc_rri = makeNode(ResultRelInfo); - InitResultRelInfo(chgcxt->cc_rri, relation, 1, NULL, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = makeNode(ResultRelInfo); + InitResultRelInfo(dest->rri, relation, 1, NULL, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3193,12 +3198,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3217,34 +3222,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index 56c1f997f88..25ac7079099 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2664,6 +2664,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v02-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-07-15 08:37 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-07-15 08:37 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 223 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 161 insertions(+), 111 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index 19927c15bf3..392332b4b2b 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -95,40 +95,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -175,22 +141,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -199,6 +162,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2614,18 +2580,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2634,7 +2613,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2683,14 +2662,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2706,7 +2685,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2719,7 +2698,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2727,7 +2706,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2736,6 +2715,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2743,16 +2724,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2764,10 +2744,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2795,8 +2775,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2948,10 +2928,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2962,9 +2943,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2972,13 +2953,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -3001,16 +2982,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3081,7 +3062,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3097,10 +3078,34 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); /* * Set up a range table for the executor, containing our repacked table as @@ -3149,41 +3154,41 @@ initialize_change_context(ChangeContext *chgcxt, perminfo->updatedCols = updatedCols; /* finally we can initialize the range table proper */ - ExecInitRangeTable(chgcxt->cc_estate, list_make1(rte), perminfos, + ExecInitRangeTable(dest->estate, list_make1(rte), perminfos, bms_make_singleton(1)); } /* Set up our ResultRelInfo to use for index updates */ - chgcxt->cc_rri = makeNode(ResultRelInfo); - InitResultRelInfo(chgcxt->cc_rri, relation, 1, NULL, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = makeNode(ResultRelInfo); + InitResultRelInfo(dest->rri, relation, 1, NULL, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3193,12 +3198,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3217,34 +3222,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index 56c1f997f88..25ac7079099 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2664,6 +2664,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v02-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-07-15 08:37 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-07-15 08:37 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 223 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 161 insertions(+), 111 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index 19927c15bf3..392332b4b2b 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -95,40 +95,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -175,22 +141,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -199,6 +162,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2614,18 +2580,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2634,7 +2613,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2683,14 +2662,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2706,7 +2685,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2719,7 +2698,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2727,7 +2706,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2736,6 +2715,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2743,16 +2724,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2764,10 +2744,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2795,8 +2775,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2948,10 +2928,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2962,9 +2943,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2972,13 +2953,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -3001,16 +2982,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3081,7 +3062,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3097,10 +3078,34 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); /* * Set up a range table for the executor, containing our repacked table as @@ -3149,41 +3154,41 @@ initialize_change_context(ChangeContext *chgcxt, perminfo->updatedCols = updatedCols; /* finally we can initialize the range table proper */ - ExecInitRangeTable(chgcxt->cc_estate, list_make1(rte), perminfos, + ExecInitRangeTable(dest->estate, list_make1(rte), perminfos, bms_make_singleton(1)); } /* Set up our ResultRelInfo to use for index updates */ - chgcxt->cc_rri = makeNode(ResultRelInfo); - InitResultRelInfo(chgcxt->cc_rri, relation, 1, NULL, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = makeNode(ResultRelInfo); + InitResultRelInfo(dest->rri, relation, 1, NULL, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3193,12 +3198,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3217,34 +3222,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index 56c1f997f88..25ac7079099 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2664,6 +2664,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v02-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-07-15 08:37 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-07-15 08:37 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 223 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 161 insertions(+), 111 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index 19927c15bf3..392332b4b2b 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -95,40 +95,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -175,22 +141,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -199,6 +162,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2614,18 +2580,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2634,7 +2613,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2683,14 +2662,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2706,7 +2685,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2719,7 +2698,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2727,7 +2706,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2736,6 +2715,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2743,16 +2724,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2764,10 +2744,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2795,8 +2775,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2948,10 +2928,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2962,9 +2943,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2972,13 +2953,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -3001,16 +2982,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3081,7 +3062,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3097,10 +3078,34 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); /* * Set up a range table for the executor, containing our repacked table as @@ -3149,41 +3154,41 @@ initialize_change_context(ChangeContext *chgcxt, perminfo->updatedCols = updatedCols; /* finally we can initialize the range table proper */ - ExecInitRangeTable(chgcxt->cc_estate, list_make1(rte), perminfos, + ExecInitRangeTable(dest->estate, list_make1(rte), perminfos, bms_make_singleton(1)); } /* Set up our ResultRelInfo to use for index updates */ - chgcxt->cc_rri = makeNode(ResultRelInfo); - InitResultRelInfo(chgcxt->cc_rri, relation, 1, NULL, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = makeNode(ResultRelInfo); + InitResultRelInfo(dest->rri, relation, 1, NULL, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3193,12 +3198,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3217,34 +3222,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index 56c1f997f88..25ac7079099 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2664,6 +2664,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v02-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-07-15 08:37 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-07-15 08:37 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 223 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 161 insertions(+), 111 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index 19927c15bf3..392332b4b2b 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -95,40 +95,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -175,22 +141,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -199,6 +162,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2614,18 +2580,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2634,7 +2613,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2683,14 +2662,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2706,7 +2685,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2719,7 +2698,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2727,7 +2706,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2736,6 +2715,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2743,16 +2724,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2764,10 +2744,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2795,8 +2775,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2948,10 +2928,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2962,9 +2943,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2972,13 +2953,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -3001,16 +2982,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3081,7 +3062,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3097,10 +3078,34 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); /* * Set up a range table for the executor, containing our repacked table as @@ -3149,41 +3154,41 @@ initialize_change_context(ChangeContext *chgcxt, perminfo->updatedCols = updatedCols; /* finally we can initialize the range table proper */ - ExecInitRangeTable(chgcxt->cc_estate, list_make1(rte), perminfos, + ExecInitRangeTable(dest->estate, list_make1(rte), perminfos, bms_make_singleton(1)); } /* Set up our ResultRelInfo to use for index updates */ - chgcxt->cc_rri = makeNode(ResultRelInfo); - InitResultRelInfo(chgcxt->cc_rri, relation, 1, NULL, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = makeNode(ResultRelInfo); + InitResultRelInfo(dest->rri, relation, 1, NULL, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3193,12 +3198,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3217,34 +3222,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index 56c1f997f88..25ac7079099 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2664,6 +2664,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v02-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-07-15 08:37 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-07-15 08:37 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 223 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 161 insertions(+), 111 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index 19927c15bf3..392332b4b2b 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -95,40 +95,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -175,22 +141,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -199,6 +162,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2614,18 +2580,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2634,7 +2613,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2683,14 +2662,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2706,7 +2685,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2719,7 +2698,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2727,7 +2706,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2736,6 +2715,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2743,16 +2724,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2764,10 +2744,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2795,8 +2775,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2948,10 +2928,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2962,9 +2943,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2972,13 +2953,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -3001,16 +2982,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3081,7 +3062,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3097,10 +3078,34 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); /* * Set up a range table for the executor, containing our repacked table as @@ -3149,41 +3154,41 @@ initialize_change_context(ChangeContext *chgcxt, perminfo->updatedCols = updatedCols; /* finally we can initialize the range table proper */ - ExecInitRangeTable(chgcxt->cc_estate, list_make1(rte), perminfos, + ExecInitRangeTable(dest->estate, list_make1(rte), perminfos, bms_make_singleton(1)); } /* Set up our ResultRelInfo to use for index updates */ - chgcxt->cc_rri = makeNode(ResultRelInfo); - InitResultRelInfo(chgcxt->cc_rri, relation, 1, NULL, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = makeNode(ResultRelInfo); + InitResultRelInfo(dest->rri, relation, 1, NULL, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3193,12 +3198,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3217,34 +3222,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index 56c1f997f88..25ac7079099 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2664,6 +2664,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v02-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-07-15 08:37 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-07-15 08:37 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 223 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 161 insertions(+), 111 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index 19927c15bf3..392332b4b2b 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -95,40 +95,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -175,22 +141,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -199,6 +162,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2614,18 +2580,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2634,7 +2613,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2683,14 +2662,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2706,7 +2685,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2719,7 +2698,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2727,7 +2706,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2736,6 +2715,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2743,16 +2724,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2764,10 +2744,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2795,8 +2775,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2948,10 +2928,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2962,9 +2943,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2972,13 +2953,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -3001,16 +2982,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3081,7 +3062,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3097,10 +3078,34 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); /* * Set up a range table for the executor, containing our repacked table as @@ -3149,41 +3154,41 @@ initialize_change_context(ChangeContext *chgcxt, perminfo->updatedCols = updatedCols; /* finally we can initialize the range table proper */ - ExecInitRangeTable(chgcxt->cc_estate, list_make1(rte), perminfos, + ExecInitRangeTable(dest->estate, list_make1(rte), perminfos, bms_make_singleton(1)); } /* Set up our ResultRelInfo to use for index updates */ - chgcxt->cc_rri = makeNode(ResultRelInfo); - InitResultRelInfo(chgcxt->cc_rri, relation, 1, NULL, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = makeNode(ResultRelInfo); + InitResultRelInfo(dest->rri, relation, 1, NULL, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3193,12 +3198,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3217,34 +3222,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index 56c1f997f88..25ac7079099 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2664,6 +2664,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v02-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-07-15 08:37 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-07-15 08:37 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 223 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 161 insertions(+), 111 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index 19927c15bf3..392332b4b2b 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -95,40 +95,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -175,22 +141,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -199,6 +162,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2614,18 +2580,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2634,7 +2613,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2683,14 +2662,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2706,7 +2685,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2719,7 +2698,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2727,7 +2706,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2736,6 +2715,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2743,16 +2724,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2764,10 +2744,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2795,8 +2775,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2948,10 +2928,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2962,9 +2943,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2972,13 +2953,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -3001,16 +2982,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3081,7 +3062,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3097,10 +3078,34 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); /* * Set up a range table for the executor, containing our repacked table as @@ -3149,41 +3154,41 @@ initialize_change_context(ChangeContext *chgcxt, perminfo->updatedCols = updatedCols; /* finally we can initialize the range table proper */ - ExecInitRangeTable(chgcxt->cc_estate, list_make1(rte), perminfos, + ExecInitRangeTable(dest->estate, list_make1(rte), perminfos, bms_make_singleton(1)); } /* Set up our ResultRelInfo to use for index updates */ - chgcxt->cc_rri = makeNode(ResultRelInfo); - InitResultRelInfo(chgcxt->cc_rri, relation, 1, NULL, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = makeNode(ResultRelInfo); + InitResultRelInfo(dest->rri, relation, 1, NULL, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3193,12 +3198,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3217,34 +3222,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index 56c1f997f88..25ac7079099 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2664,6 +2664,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v02-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-07-15 08:37 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-07-15 08:37 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 223 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 161 insertions(+), 111 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index 19927c15bf3..392332b4b2b 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -95,40 +95,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -175,22 +141,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -199,6 +162,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2614,18 +2580,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2634,7 +2613,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2683,14 +2662,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2706,7 +2685,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2719,7 +2698,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2727,7 +2706,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2736,6 +2715,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2743,16 +2724,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2764,10 +2744,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2795,8 +2775,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2948,10 +2928,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2962,9 +2943,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2972,13 +2953,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -3001,16 +2982,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3081,7 +3062,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3097,10 +3078,34 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); /* * Set up a range table for the executor, containing our repacked table as @@ -3149,41 +3154,41 @@ initialize_change_context(ChangeContext *chgcxt, perminfo->updatedCols = updatedCols; /* finally we can initialize the range table proper */ - ExecInitRangeTable(chgcxt->cc_estate, list_make1(rte), perminfos, + ExecInitRangeTable(dest->estate, list_make1(rte), perminfos, bms_make_singleton(1)); } /* Set up our ResultRelInfo to use for index updates */ - chgcxt->cc_rri = makeNode(ResultRelInfo); - InitResultRelInfo(chgcxt->cc_rri, relation, 1, NULL, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = makeNode(ResultRelInfo); + InitResultRelInfo(dest->rri, relation, 1, NULL, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3193,12 +3198,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3217,34 +3222,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index 56c1f997f88..25ac7079099 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2664,6 +2664,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v02-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-07-15 08:37 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-07-15 08:37 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 223 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 161 insertions(+), 111 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index 19927c15bf3..392332b4b2b 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -95,40 +95,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -175,22 +141,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -199,6 +162,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2614,18 +2580,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2634,7 +2613,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2683,14 +2662,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2706,7 +2685,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2719,7 +2698,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2727,7 +2706,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2736,6 +2715,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2743,16 +2724,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2764,10 +2744,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2795,8 +2775,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2948,10 +2928,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2962,9 +2943,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2972,13 +2953,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -3001,16 +2982,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3081,7 +3062,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3097,10 +3078,34 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); /* * Set up a range table for the executor, containing our repacked table as @@ -3149,41 +3154,41 @@ initialize_change_context(ChangeContext *chgcxt, perminfo->updatedCols = updatedCols; /* finally we can initialize the range table proper */ - ExecInitRangeTable(chgcxt->cc_estate, list_make1(rte), perminfos, + ExecInitRangeTable(dest->estate, list_make1(rte), perminfos, bms_make_singleton(1)); } /* Set up our ResultRelInfo to use for index updates */ - chgcxt->cc_rri = makeNode(ResultRelInfo); - InitResultRelInfo(chgcxt->cc_rri, relation, 1, NULL, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = makeNode(ResultRelInfo); + InitResultRelInfo(dest->rri, relation, 1, NULL, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3193,12 +3198,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3217,34 +3222,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index 56c1f997f88..25ac7079099 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2664,6 +2664,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v02-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-07-15 08:37 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-07-15 08:37 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 223 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 161 insertions(+), 111 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index 19927c15bf3..392332b4b2b 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -95,40 +95,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -175,22 +141,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -199,6 +162,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2614,18 +2580,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2634,7 +2613,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2683,14 +2662,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2706,7 +2685,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2719,7 +2698,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2727,7 +2706,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2736,6 +2715,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2743,16 +2724,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2764,10 +2744,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2795,8 +2775,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2948,10 +2928,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2962,9 +2943,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2972,13 +2953,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -3001,16 +2982,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3081,7 +3062,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3097,10 +3078,34 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); /* * Set up a range table for the executor, containing our repacked table as @@ -3149,41 +3154,41 @@ initialize_change_context(ChangeContext *chgcxt, perminfo->updatedCols = updatedCols; /* finally we can initialize the range table proper */ - ExecInitRangeTable(chgcxt->cc_estate, list_make1(rte), perminfos, + ExecInitRangeTable(dest->estate, list_make1(rte), perminfos, bms_make_singleton(1)); } /* Set up our ResultRelInfo to use for index updates */ - chgcxt->cc_rri = makeNode(ResultRelInfo); - InitResultRelInfo(chgcxt->cc_rri, relation, 1, NULL, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = makeNode(ResultRelInfo); + InitResultRelInfo(dest->rri, relation, 1, NULL, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3193,12 +3198,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3217,34 +3222,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index 56c1f997f88..25ac7079099 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2664,6 +2664,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v02-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-07-15 08:37 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-07-15 08:37 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 223 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 161 insertions(+), 111 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index 19927c15bf3..392332b4b2b 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -95,40 +95,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -175,22 +141,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -199,6 +162,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2614,18 +2580,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2634,7 +2613,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2683,14 +2662,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2706,7 +2685,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2719,7 +2698,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2727,7 +2706,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2736,6 +2715,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2743,16 +2724,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2764,10 +2744,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2795,8 +2775,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2948,10 +2928,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2962,9 +2943,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2972,13 +2953,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -3001,16 +2982,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3081,7 +3062,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3097,10 +3078,34 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); /* * Set up a range table for the executor, containing our repacked table as @@ -3149,41 +3154,41 @@ initialize_change_context(ChangeContext *chgcxt, perminfo->updatedCols = updatedCols; /* finally we can initialize the range table proper */ - ExecInitRangeTable(chgcxt->cc_estate, list_make1(rte), perminfos, + ExecInitRangeTable(dest->estate, list_make1(rte), perminfos, bms_make_singleton(1)); } /* Set up our ResultRelInfo to use for index updates */ - chgcxt->cc_rri = makeNode(ResultRelInfo); - InitResultRelInfo(chgcxt->cc_rri, relation, 1, NULL, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = makeNode(ResultRelInfo); + InitResultRelInfo(dest->rri, relation, 1, NULL, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3193,12 +3198,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3217,34 +3222,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index 56c1f997f88..25ac7079099 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2664,6 +2664,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v02-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-07-15 08:37 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-07-15 08:37 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 223 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 161 insertions(+), 111 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index 19927c15bf3..392332b4b2b 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -95,40 +95,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -175,22 +141,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -199,6 +162,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2614,18 +2580,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2634,7 +2613,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2683,14 +2662,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2706,7 +2685,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2719,7 +2698,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2727,7 +2706,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2736,6 +2715,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2743,16 +2724,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2764,10 +2744,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2795,8 +2775,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2948,10 +2928,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2962,9 +2943,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2972,13 +2953,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -3001,16 +2982,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3081,7 +3062,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3097,10 +3078,34 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); /* * Set up a range table for the executor, containing our repacked table as @@ -3149,41 +3154,41 @@ initialize_change_context(ChangeContext *chgcxt, perminfo->updatedCols = updatedCols; /* finally we can initialize the range table proper */ - ExecInitRangeTable(chgcxt->cc_estate, list_make1(rte), perminfos, + ExecInitRangeTable(dest->estate, list_make1(rte), perminfos, bms_make_singleton(1)); } /* Set up our ResultRelInfo to use for index updates */ - chgcxt->cc_rri = makeNode(ResultRelInfo); - InitResultRelInfo(chgcxt->cc_rri, relation, 1, NULL, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = makeNode(ResultRelInfo); + InitResultRelInfo(dest->rri, relation, 1, NULL, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3193,12 +3198,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3217,34 +3222,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index 56c1f997f88..25ac7079099 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2664,6 +2664,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v02-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-07-15 08:37 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-07-15 08:37 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 223 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 161 insertions(+), 111 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index 19927c15bf3..392332b4b2b 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -95,40 +95,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -175,22 +141,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -199,6 +162,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2614,18 +2580,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2634,7 +2613,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2683,14 +2662,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2706,7 +2685,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2719,7 +2698,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2727,7 +2706,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2736,6 +2715,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2743,16 +2724,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2764,10 +2744,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2795,8 +2775,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2948,10 +2928,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2962,9 +2943,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2972,13 +2953,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -3001,16 +2982,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3081,7 +3062,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3097,10 +3078,34 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); /* * Set up a range table for the executor, containing our repacked table as @@ -3149,41 +3154,41 @@ initialize_change_context(ChangeContext *chgcxt, perminfo->updatedCols = updatedCols; /* finally we can initialize the range table proper */ - ExecInitRangeTable(chgcxt->cc_estate, list_make1(rte), perminfos, + ExecInitRangeTable(dest->estate, list_make1(rte), perminfos, bms_make_singleton(1)); } /* Set up our ResultRelInfo to use for index updates */ - chgcxt->cc_rri = makeNode(ResultRelInfo); - InitResultRelInfo(chgcxt->cc_rri, relation, 1, NULL, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = makeNode(ResultRelInfo); + InitResultRelInfo(dest->rri, relation, 1, NULL, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3193,12 +3198,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3217,34 +3222,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index 56c1f997f88..25ac7079099 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2664,6 +2664,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v02-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-07-15 08:37 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-07-15 08:37 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 223 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 161 insertions(+), 111 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index 19927c15bf3..392332b4b2b 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -95,40 +95,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -175,22 +141,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -199,6 +162,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2614,18 +2580,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2634,7 +2613,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2683,14 +2662,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2706,7 +2685,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2719,7 +2698,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2727,7 +2706,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2736,6 +2715,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2743,16 +2724,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2764,10 +2744,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2795,8 +2775,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2948,10 +2928,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2962,9 +2943,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2972,13 +2953,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -3001,16 +2982,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3081,7 +3062,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3097,10 +3078,34 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); /* * Set up a range table for the executor, containing our repacked table as @@ -3149,41 +3154,41 @@ initialize_change_context(ChangeContext *chgcxt, perminfo->updatedCols = updatedCols; /* finally we can initialize the range table proper */ - ExecInitRangeTable(chgcxt->cc_estate, list_make1(rte), perminfos, + ExecInitRangeTable(dest->estate, list_make1(rte), perminfos, bms_make_singleton(1)); } /* Set up our ResultRelInfo to use for index updates */ - chgcxt->cc_rri = makeNode(ResultRelInfo); - InitResultRelInfo(chgcxt->cc_rri, relation, 1, NULL, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = makeNode(ResultRelInfo); + InitResultRelInfo(dest->rri, relation, 1, NULL, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3193,12 +3198,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3217,34 +3222,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index 56c1f997f88..25ac7079099 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2664,6 +2664,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v02-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-07-15 08:37 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-07-15 08:37 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 223 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 161 insertions(+), 111 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index 19927c15bf3..392332b4b2b 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -95,40 +95,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -175,22 +141,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -199,6 +162,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2614,18 +2580,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2634,7 +2613,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2683,14 +2662,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2706,7 +2685,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2719,7 +2698,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2727,7 +2706,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2736,6 +2715,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2743,16 +2724,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2764,10 +2744,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2795,8 +2775,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2948,10 +2928,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2962,9 +2943,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2972,13 +2953,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -3001,16 +2982,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3081,7 +3062,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3097,10 +3078,34 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); /* * Set up a range table for the executor, containing our repacked table as @@ -3149,41 +3154,41 @@ initialize_change_context(ChangeContext *chgcxt, perminfo->updatedCols = updatedCols; /* finally we can initialize the range table proper */ - ExecInitRangeTable(chgcxt->cc_estate, list_make1(rte), perminfos, + ExecInitRangeTable(dest->estate, list_make1(rte), perminfos, bms_make_singleton(1)); } /* Set up our ResultRelInfo to use for index updates */ - chgcxt->cc_rri = makeNode(ResultRelInfo); - InitResultRelInfo(chgcxt->cc_rri, relation, 1, NULL, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = makeNode(ResultRelInfo); + InitResultRelInfo(dest->rri, relation, 1, NULL, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3193,12 +3198,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3217,34 +3222,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index 56c1f997f88..25ac7079099 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2664,6 +2664,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v02-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-07-15 08:37 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-07-15 08:37 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 223 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 161 insertions(+), 111 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index 19927c15bf3..392332b4b2b 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -95,40 +95,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -175,22 +141,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -199,6 +162,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2614,18 +2580,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2634,7 +2613,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2683,14 +2662,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2706,7 +2685,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2719,7 +2698,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2727,7 +2706,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2736,6 +2715,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2743,16 +2724,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2764,10 +2744,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2795,8 +2775,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2948,10 +2928,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2962,9 +2943,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2972,13 +2953,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -3001,16 +2982,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3081,7 +3062,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3097,10 +3078,34 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); /* * Set up a range table for the executor, containing our repacked table as @@ -3149,41 +3154,41 @@ initialize_change_context(ChangeContext *chgcxt, perminfo->updatedCols = updatedCols; /* finally we can initialize the range table proper */ - ExecInitRangeTable(chgcxt->cc_estate, list_make1(rte), perminfos, + ExecInitRangeTable(dest->estate, list_make1(rte), perminfos, bms_make_singleton(1)); } /* Set up our ResultRelInfo to use for index updates */ - chgcxt->cc_rri = makeNode(ResultRelInfo); - InitResultRelInfo(chgcxt->cc_rri, relation, 1, NULL, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = makeNode(ResultRelInfo); + InitResultRelInfo(dest->rri, relation, 1, NULL, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3193,12 +3198,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3217,34 +3222,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index 56c1f997f88..25ac7079099 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2664,6 +2664,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v02-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-07-15 08:37 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-07-15 08:37 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 223 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 161 insertions(+), 111 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index 19927c15bf3..392332b4b2b 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -95,40 +95,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -175,22 +141,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -199,6 +162,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2614,18 +2580,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2634,7 +2613,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2683,14 +2662,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2706,7 +2685,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2719,7 +2698,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2727,7 +2706,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2736,6 +2715,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2743,16 +2724,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2764,10 +2744,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2795,8 +2775,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2948,10 +2928,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2962,9 +2943,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2972,13 +2953,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -3001,16 +2982,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3081,7 +3062,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3097,10 +3078,34 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); /* * Set up a range table for the executor, containing our repacked table as @@ -3149,41 +3154,41 @@ initialize_change_context(ChangeContext *chgcxt, perminfo->updatedCols = updatedCols; /* finally we can initialize the range table proper */ - ExecInitRangeTable(chgcxt->cc_estate, list_make1(rte), perminfos, + ExecInitRangeTable(dest->estate, list_make1(rte), perminfos, bms_make_singleton(1)); } /* Set up our ResultRelInfo to use for index updates */ - chgcxt->cc_rri = makeNode(ResultRelInfo); - InitResultRelInfo(chgcxt->cc_rri, relation, 1, NULL, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = makeNode(ResultRelInfo); + InitResultRelInfo(dest->rri, relation, 1, NULL, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3193,12 +3198,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3217,34 +3222,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index 56c1f997f88..25ac7079099 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2664,6 +2664,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v02-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-07-15 08:37 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-07-15 08:37 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 223 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 161 insertions(+), 111 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index 19927c15bf3..392332b4b2b 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -95,40 +95,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -175,22 +141,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -199,6 +162,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2614,18 +2580,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2634,7 +2613,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2683,14 +2662,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2706,7 +2685,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2719,7 +2698,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2727,7 +2706,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2736,6 +2715,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2743,16 +2724,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2764,10 +2744,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2795,8 +2775,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2948,10 +2928,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2962,9 +2943,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2972,13 +2953,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -3001,16 +2982,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3081,7 +3062,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3097,10 +3078,34 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); /* * Set up a range table for the executor, containing our repacked table as @@ -3149,41 +3154,41 @@ initialize_change_context(ChangeContext *chgcxt, perminfo->updatedCols = updatedCols; /* finally we can initialize the range table proper */ - ExecInitRangeTable(chgcxt->cc_estate, list_make1(rte), perminfos, + ExecInitRangeTable(dest->estate, list_make1(rte), perminfos, bms_make_singleton(1)); } /* Set up our ResultRelInfo to use for index updates */ - chgcxt->cc_rri = makeNode(ResultRelInfo); - InitResultRelInfo(chgcxt->cc_rri, relation, 1, NULL, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = makeNode(ResultRelInfo); + InitResultRelInfo(dest->rri, relation, 1, NULL, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3193,12 +3198,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3217,34 +3222,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index 56c1f997f88..25ac7079099 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2664,6 +2664,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v02-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-07-15 08:37 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-07-15 08:37 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 223 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 161 insertions(+), 111 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index 19927c15bf3..392332b4b2b 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -95,40 +95,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -175,22 +141,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -199,6 +162,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2614,18 +2580,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2634,7 +2613,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2683,14 +2662,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2706,7 +2685,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2719,7 +2698,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2727,7 +2706,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2736,6 +2715,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2743,16 +2724,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2764,10 +2744,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2795,8 +2775,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2948,10 +2928,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2962,9 +2943,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2972,13 +2953,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -3001,16 +2982,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3081,7 +3062,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3097,10 +3078,34 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); /* * Set up a range table for the executor, containing our repacked table as @@ -3149,41 +3154,41 @@ initialize_change_context(ChangeContext *chgcxt, perminfo->updatedCols = updatedCols; /* finally we can initialize the range table proper */ - ExecInitRangeTable(chgcxt->cc_estate, list_make1(rte), perminfos, + ExecInitRangeTable(dest->estate, list_make1(rte), perminfos, bms_make_singleton(1)); } /* Set up our ResultRelInfo to use for index updates */ - chgcxt->cc_rri = makeNode(ResultRelInfo); - InitResultRelInfo(chgcxt->cc_rri, relation, 1, NULL, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = makeNode(ResultRelInfo); + InitResultRelInfo(dest->rri, relation, 1, NULL, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3193,12 +3198,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3217,34 +3222,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index 56c1f997f88..25ac7079099 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2664,6 +2664,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v02-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-07-15 08:37 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-07-15 08:37 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 223 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 161 insertions(+), 111 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index 19927c15bf3..392332b4b2b 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -95,40 +95,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -175,22 +141,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -199,6 +162,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2614,18 +2580,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2634,7 +2613,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2683,14 +2662,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2706,7 +2685,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2719,7 +2698,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2727,7 +2706,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2736,6 +2715,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2743,16 +2724,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2764,10 +2744,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2795,8 +2775,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2948,10 +2928,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2962,9 +2943,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2972,13 +2953,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -3001,16 +2982,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3081,7 +3062,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3097,10 +3078,34 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); /* * Set up a range table for the executor, containing our repacked table as @@ -3149,41 +3154,41 @@ initialize_change_context(ChangeContext *chgcxt, perminfo->updatedCols = updatedCols; /* finally we can initialize the range table proper */ - ExecInitRangeTable(chgcxt->cc_estate, list_make1(rte), perminfos, + ExecInitRangeTable(dest->estate, list_make1(rte), perminfos, bms_make_singleton(1)); } /* Set up our ResultRelInfo to use for index updates */ - chgcxt->cc_rri = makeNode(ResultRelInfo); - InitResultRelInfo(chgcxt->cc_rri, relation, 1, NULL, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = makeNode(ResultRelInfo); + InitResultRelInfo(dest->rri, relation, 1, NULL, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3193,12 +3198,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3217,34 +3222,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index 56c1f997f88..25ac7079099 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2664,6 +2664,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v02-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-07-15 08:37 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-07-15 08:37 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 223 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 161 insertions(+), 111 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index 19927c15bf3..392332b4b2b 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -95,40 +95,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -175,22 +141,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -199,6 +162,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2614,18 +2580,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2634,7 +2613,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2683,14 +2662,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2706,7 +2685,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2719,7 +2698,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2727,7 +2706,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2736,6 +2715,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2743,16 +2724,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2764,10 +2744,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2795,8 +2775,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2948,10 +2928,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2962,9 +2943,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2972,13 +2953,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -3001,16 +2982,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3081,7 +3062,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3097,10 +3078,34 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); /* * Set up a range table for the executor, containing our repacked table as @@ -3149,41 +3154,41 @@ initialize_change_context(ChangeContext *chgcxt, perminfo->updatedCols = updatedCols; /* finally we can initialize the range table proper */ - ExecInitRangeTable(chgcxt->cc_estate, list_make1(rte), perminfos, + ExecInitRangeTable(dest->estate, list_make1(rte), perminfos, bms_make_singleton(1)); } /* Set up our ResultRelInfo to use for index updates */ - chgcxt->cc_rri = makeNode(ResultRelInfo); - InitResultRelInfo(chgcxt->cc_rri, relation, 1, NULL, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = makeNode(ResultRelInfo); + InitResultRelInfo(dest->rri, relation, 1, NULL, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3193,12 +3198,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3217,34 +3222,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index 56c1f997f88..25ac7079099 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2664,6 +2664,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v02-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-07-15 08:37 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-07-15 08:37 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 223 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 161 insertions(+), 111 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index 19927c15bf3..392332b4b2b 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -95,40 +95,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -175,22 +141,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -199,6 +162,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2614,18 +2580,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2634,7 +2613,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2683,14 +2662,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2706,7 +2685,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2719,7 +2698,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2727,7 +2706,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2736,6 +2715,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2743,16 +2724,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2764,10 +2744,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2795,8 +2775,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2948,10 +2928,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2962,9 +2943,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2972,13 +2953,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -3001,16 +2982,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3081,7 +3062,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3097,10 +3078,34 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); /* * Set up a range table for the executor, containing our repacked table as @@ -3149,41 +3154,41 @@ initialize_change_context(ChangeContext *chgcxt, perminfo->updatedCols = updatedCols; /* finally we can initialize the range table proper */ - ExecInitRangeTable(chgcxt->cc_estate, list_make1(rte), perminfos, + ExecInitRangeTable(dest->estate, list_make1(rte), perminfos, bms_make_singleton(1)); } /* Set up our ResultRelInfo to use for index updates */ - chgcxt->cc_rri = makeNode(ResultRelInfo); - InitResultRelInfo(chgcxt->cc_rri, relation, 1, NULL, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = makeNode(ResultRelInfo); + InitResultRelInfo(dest->rri, relation, 1, NULL, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3193,12 +3198,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3217,34 +3222,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index 56c1f997f88..25ac7079099 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2664,6 +2664,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v02-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-07-15 08:37 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-07-15 08:37 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 223 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 161 insertions(+), 111 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index 19927c15bf3..392332b4b2b 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -95,40 +95,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -175,22 +141,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -199,6 +162,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2614,18 +2580,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2634,7 +2613,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2683,14 +2662,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2706,7 +2685,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2719,7 +2698,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2727,7 +2706,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2736,6 +2715,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2743,16 +2724,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2764,10 +2744,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2795,8 +2775,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2948,10 +2928,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2962,9 +2943,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2972,13 +2953,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -3001,16 +2982,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3081,7 +3062,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3097,10 +3078,34 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); /* * Set up a range table for the executor, containing our repacked table as @@ -3149,41 +3154,41 @@ initialize_change_context(ChangeContext *chgcxt, perminfo->updatedCols = updatedCols; /* finally we can initialize the range table proper */ - ExecInitRangeTable(chgcxt->cc_estate, list_make1(rte), perminfos, + ExecInitRangeTable(dest->estate, list_make1(rte), perminfos, bms_make_singleton(1)); } /* Set up our ResultRelInfo to use for index updates */ - chgcxt->cc_rri = makeNode(ResultRelInfo); - InitResultRelInfo(chgcxt->cc_rri, relation, 1, NULL, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = makeNode(ResultRelInfo); + InitResultRelInfo(dest->rri, relation, 1, NULL, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3193,12 +3198,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3217,34 +3222,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index 56c1f997f88..25ac7079099 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2664,6 +2664,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v02-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-07-15 08:37 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-07-15 08:37 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 223 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 161 insertions(+), 111 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index 19927c15bf3..392332b4b2b 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -95,40 +95,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -175,22 +141,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -199,6 +162,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2614,18 +2580,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2634,7 +2613,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2683,14 +2662,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2706,7 +2685,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2719,7 +2698,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2727,7 +2706,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2736,6 +2715,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2743,16 +2724,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2764,10 +2744,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2795,8 +2775,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2948,10 +2928,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2962,9 +2943,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2972,13 +2953,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -3001,16 +2982,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3081,7 +3062,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3097,10 +3078,34 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); /* * Set up a range table for the executor, containing our repacked table as @@ -3149,41 +3154,41 @@ initialize_change_context(ChangeContext *chgcxt, perminfo->updatedCols = updatedCols; /* finally we can initialize the range table proper */ - ExecInitRangeTable(chgcxt->cc_estate, list_make1(rte), perminfos, + ExecInitRangeTable(dest->estate, list_make1(rte), perminfos, bms_make_singleton(1)); } /* Set up our ResultRelInfo to use for index updates */ - chgcxt->cc_rri = makeNode(ResultRelInfo); - InitResultRelInfo(chgcxt->cc_rri, relation, 1, NULL, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = makeNode(ResultRelInfo); + InitResultRelInfo(dest->rri, relation, 1, NULL, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3193,12 +3198,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3217,34 +3222,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index 56c1f997f88..25ac7079099 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2664,6 +2664,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v02-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-07-15 08:37 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-07-15 08:37 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 223 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 161 insertions(+), 111 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index 19927c15bf3..392332b4b2b 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -95,40 +95,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -175,22 +141,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -199,6 +162,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2614,18 +2580,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2634,7 +2613,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2683,14 +2662,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2706,7 +2685,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2719,7 +2698,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2727,7 +2706,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2736,6 +2715,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2743,16 +2724,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2764,10 +2744,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2795,8 +2775,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2948,10 +2928,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2962,9 +2943,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2972,13 +2953,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -3001,16 +2982,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3081,7 +3062,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3097,10 +3078,34 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); /* * Set up a range table for the executor, containing our repacked table as @@ -3149,41 +3154,41 @@ initialize_change_context(ChangeContext *chgcxt, perminfo->updatedCols = updatedCols; /* finally we can initialize the range table proper */ - ExecInitRangeTable(chgcxt->cc_estate, list_make1(rte), perminfos, + ExecInitRangeTable(dest->estate, list_make1(rte), perminfos, bms_make_singleton(1)); } /* Set up our ResultRelInfo to use for index updates */ - chgcxt->cc_rri = makeNode(ResultRelInfo); - InitResultRelInfo(chgcxt->cc_rri, relation, 1, NULL, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = makeNode(ResultRelInfo); + InitResultRelInfo(dest->rri, relation, 1, NULL, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3193,12 +3198,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3217,34 +3222,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index 56c1f997f88..25ac7079099 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2664,6 +2664,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v02-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-07-15 08:37 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-07-15 08:37 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 223 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 161 insertions(+), 111 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index 19927c15bf3..392332b4b2b 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -95,40 +95,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -175,22 +141,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -199,6 +162,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2614,18 +2580,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2634,7 +2613,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2683,14 +2662,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2706,7 +2685,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2719,7 +2698,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2727,7 +2706,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2736,6 +2715,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2743,16 +2724,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2764,10 +2744,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2795,8 +2775,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2948,10 +2928,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2962,9 +2943,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2972,13 +2953,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -3001,16 +2982,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3081,7 +3062,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3097,10 +3078,34 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); /* * Set up a range table for the executor, containing our repacked table as @@ -3149,41 +3154,41 @@ initialize_change_context(ChangeContext *chgcxt, perminfo->updatedCols = updatedCols; /* finally we can initialize the range table proper */ - ExecInitRangeTable(chgcxt->cc_estate, list_make1(rte), perminfos, + ExecInitRangeTable(dest->estate, list_make1(rte), perminfos, bms_make_singleton(1)); } /* Set up our ResultRelInfo to use for index updates */ - chgcxt->cc_rri = makeNode(ResultRelInfo); - InitResultRelInfo(chgcxt->cc_rri, relation, 1, NULL, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = makeNode(ResultRelInfo); + InitResultRelInfo(dest->rri, relation, 1, NULL, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3193,12 +3198,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3217,34 +3222,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index 56c1f997f88..25ac7079099 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2664,6 +2664,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v02-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-07-15 08:37 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-07-15 08:37 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 223 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 161 insertions(+), 111 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index 19927c15bf3..392332b4b2b 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -95,40 +95,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -175,22 +141,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -199,6 +162,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2614,18 +2580,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2634,7 +2613,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2683,14 +2662,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2706,7 +2685,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2719,7 +2698,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2727,7 +2706,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2736,6 +2715,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2743,16 +2724,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2764,10 +2744,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2795,8 +2775,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2948,10 +2928,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2962,9 +2943,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2972,13 +2953,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -3001,16 +2982,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3081,7 +3062,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3097,10 +3078,34 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); /* * Set up a range table for the executor, containing our repacked table as @@ -3149,41 +3154,41 @@ initialize_change_context(ChangeContext *chgcxt, perminfo->updatedCols = updatedCols; /* finally we can initialize the range table proper */ - ExecInitRangeTable(chgcxt->cc_estate, list_make1(rte), perminfos, + ExecInitRangeTable(dest->estate, list_make1(rte), perminfos, bms_make_singleton(1)); } /* Set up our ResultRelInfo to use for index updates */ - chgcxt->cc_rri = makeNode(ResultRelInfo); - InitResultRelInfo(chgcxt->cc_rri, relation, 1, NULL, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = makeNode(ResultRelInfo); + InitResultRelInfo(dest->rri, relation, 1, NULL, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3193,12 +3198,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3217,34 +3222,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index 56c1f997f88..25ac7079099 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2664,6 +2664,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v02-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-07-15 08:37 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-07-15 08:37 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 223 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 161 insertions(+), 111 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index 19927c15bf3..392332b4b2b 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -95,40 +95,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -175,22 +141,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -199,6 +162,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2614,18 +2580,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2634,7 +2613,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2683,14 +2662,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2706,7 +2685,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2719,7 +2698,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2727,7 +2706,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2736,6 +2715,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2743,16 +2724,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2764,10 +2744,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2795,8 +2775,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2948,10 +2928,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2962,9 +2943,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2972,13 +2953,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -3001,16 +2982,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3081,7 +3062,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3097,10 +3078,34 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); /* * Set up a range table for the executor, containing our repacked table as @@ -3149,41 +3154,41 @@ initialize_change_context(ChangeContext *chgcxt, perminfo->updatedCols = updatedCols; /* finally we can initialize the range table proper */ - ExecInitRangeTable(chgcxt->cc_estate, list_make1(rte), perminfos, + ExecInitRangeTable(dest->estate, list_make1(rte), perminfos, bms_make_singleton(1)); } /* Set up our ResultRelInfo to use for index updates */ - chgcxt->cc_rri = makeNode(ResultRelInfo); - InitResultRelInfo(chgcxt->cc_rri, relation, 1, NULL, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = makeNode(ResultRelInfo); + InitResultRelInfo(dest->rri, relation, 1, NULL, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3193,12 +3198,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3217,34 +3222,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index 56c1f997f88..25ac7079099 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2664,6 +2664,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v02-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-07-15 08:37 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-07-15 08:37 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 223 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 161 insertions(+), 111 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index 19927c15bf3..392332b4b2b 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -95,40 +95,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -175,22 +141,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -199,6 +162,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2614,18 +2580,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2634,7 +2613,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2683,14 +2662,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2706,7 +2685,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2719,7 +2698,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2727,7 +2706,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2736,6 +2715,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2743,16 +2724,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2764,10 +2744,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2795,8 +2775,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2948,10 +2928,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2962,9 +2943,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2972,13 +2953,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -3001,16 +2982,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3081,7 +3062,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3097,10 +3078,34 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); /* * Set up a range table for the executor, containing our repacked table as @@ -3149,41 +3154,41 @@ initialize_change_context(ChangeContext *chgcxt, perminfo->updatedCols = updatedCols; /* finally we can initialize the range table proper */ - ExecInitRangeTable(chgcxt->cc_estate, list_make1(rte), perminfos, + ExecInitRangeTable(dest->estate, list_make1(rte), perminfos, bms_make_singleton(1)); } /* Set up our ResultRelInfo to use for index updates */ - chgcxt->cc_rri = makeNode(ResultRelInfo); - InitResultRelInfo(chgcxt->cc_rri, relation, 1, NULL, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = makeNode(ResultRelInfo); + InitResultRelInfo(dest->rri, relation, 1, NULL, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3193,12 +3198,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3217,34 +3222,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index 56c1f997f88..25ac7079099 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2664,6 +2664,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v02-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-07-15 08:37 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-07-15 08:37 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 223 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 161 insertions(+), 111 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index 19927c15bf3..392332b4b2b 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -95,40 +95,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -175,22 +141,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -199,6 +162,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2614,18 +2580,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2634,7 +2613,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2683,14 +2662,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2706,7 +2685,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2719,7 +2698,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2727,7 +2706,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2736,6 +2715,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2743,16 +2724,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2764,10 +2744,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2795,8 +2775,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2948,10 +2928,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2962,9 +2943,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2972,13 +2953,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -3001,16 +2982,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3081,7 +3062,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3097,10 +3078,34 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); /* * Set up a range table for the executor, containing our repacked table as @@ -3149,41 +3154,41 @@ initialize_change_context(ChangeContext *chgcxt, perminfo->updatedCols = updatedCols; /* finally we can initialize the range table proper */ - ExecInitRangeTable(chgcxt->cc_estate, list_make1(rte), perminfos, + ExecInitRangeTable(dest->estate, list_make1(rte), perminfos, bms_make_singleton(1)); } /* Set up our ResultRelInfo to use for index updates */ - chgcxt->cc_rri = makeNode(ResultRelInfo); - InitResultRelInfo(chgcxt->cc_rri, relation, 1, NULL, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = makeNode(ResultRelInfo); + InitResultRelInfo(dest->rri, relation, 1, NULL, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3193,12 +3198,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3217,34 +3222,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index 56c1f997f88..25ac7079099 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2664,6 +2664,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v02-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-07-15 08:37 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-07-15 08:37 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 223 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 161 insertions(+), 111 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index 19927c15bf3..392332b4b2b 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -95,40 +95,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -175,22 +141,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -199,6 +162,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2614,18 +2580,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2634,7 +2613,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2683,14 +2662,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2706,7 +2685,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2719,7 +2698,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2727,7 +2706,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2736,6 +2715,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2743,16 +2724,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2764,10 +2744,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2795,8 +2775,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2948,10 +2928,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2962,9 +2943,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2972,13 +2953,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -3001,16 +2982,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3081,7 +3062,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3097,10 +3078,34 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); /* * Set up a range table for the executor, containing our repacked table as @@ -3149,41 +3154,41 @@ initialize_change_context(ChangeContext *chgcxt, perminfo->updatedCols = updatedCols; /* finally we can initialize the range table proper */ - ExecInitRangeTable(chgcxt->cc_estate, list_make1(rte), perminfos, + ExecInitRangeTable(dest->estate, list_make1(rte), perminfos, bms_make_singleton(1)); } /* Set up our ResultRelInfo to use for index updates */ - chgcxt->cc_rri = makeNode(ResultRelInfo); - InitResultRelInfo(chgcxt->cc_rri, relation, 1, NULL, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = makeNode(ResultRelInfo); + InitResultRelInfo(dest->rri, relation, 1, NULL, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3193,12 +3198,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3217,34 +3222,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index 56c1f997f88..25ac7079099 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2664,6 +2664,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v02-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-07-15 08:37 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-07-15 08:37 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 223 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 161 insertions(+), 111 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index 19927c15bf3..392332b4b2b 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -95,40 +95,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -175,22 +141,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -199,6 +162,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2614,18 +2580,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2634,7 +2613,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2683,14 +2662,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2706,7 +2685,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2719,7 +2698,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2727,7 +2706,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2736,6 +2715,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2743,16 +2724,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2764,10 +2744,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2795,8 +2775,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2948,10 +2928,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2962,9 +2943,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2972,13 +2953,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -3001,16 +2982,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3081,7 +3062,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3097,10 +3078,34 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); /* * Set up a range table for the executor, containing our repacked table as @@ -3149,41 +3154,41 @@ initialize_change_context(ChangeContext *chgcxt, perminfo->updatedCols = updatedCols; /* finally we can initialize the range table proper */ - ExecInitRangeTable(chgcxt->cc_estate, list_make1(rte), perminfos, + ExecInitRangeTable(dest->estate, list_make1(rte), perminfos, bms_make_singleton(1)); } /* Set up our ResultRelInfo to use for index updates */ - chgcxt->cc_rri = makeNode(ResultRelInfo); - InitResultRelInfo(chgcxt->cc_rri, relation, 1, NULL, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = makeNode(ResultRelInfo); + InitResultRelInfo(dest->rri, relation, 1, NULL, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3193,12 +3198,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3217,34 +3222,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index 56c1f997f88..25ac7079099 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2664,6 +2664,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v02-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-07-15 08:37 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-07-15 08:37 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 223 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 161 insertions(+), 111 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index 19927c15bf3..392332b4b2b 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -95,40 +95,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -175,22 +141,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -199,6 +162,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2614,18 +2580,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2634,7 +2613,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2683,14 +2662,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2706,7 +2685,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2719,7 +2698,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2727,7 +2706,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2736,6 +2715,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2743,16 +2724,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2764,10 +2744,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2795,8 +2775,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2948,10 +2928,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2962,9 +2943,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2972,13 +2953,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -3001,16 +2982,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3081,7 +3062,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3097,10 +3078,34 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); /* * Set up a range table for the executor, containing our repacked table as @@ -3149,41 +3154,41 @@ initialize_change_context(ChangeContext *chgcxt, perminfo->updatedCols = updatedCols; /* finally we can initialize the range table proper */ - ExecInitRangeTable(chgcxt->cc_estate, list_make1(rte), perminfos, + ExecInitRangeTable(dest->estate, list_make1(rte), perminfos, bms_make_singleton(1)); } /* Set up our ResultRelInfo to use for index updates */ - chgcxt->cc_rri = makeNode(ResultRelInfo); - InitResultRelInfo(chgcxt->cc_rri, relation, 1, NULL, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = makeNode(ResultRelInfo); + InitResultRelInfo(dest->rri, relation, 1, NULL, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3193,12 +3198,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3217,34 +3222,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index 56c1f997f88..25ac7079099 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2664,6 +2664,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v02-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-07-15 08:37 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-07-15 08:37 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 223 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 161 insertions(+), 111 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index 19927c15bf3..392332b4b2b 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -95,40 +95,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -175,22 +141,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -199,6 +162,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2614,18 +2580,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2634,7 +2613,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2683,14 +2662,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2706,7 +2685,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2719,7 +2698,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2727,7 +2706,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2736,6 +2715,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2743,16 +2724,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2764,10 +2744,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2795,8 +2775,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2948,10 +2928,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2962,9 +2943,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2972,13 +2953,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -3001,16 +2982,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3081,7 +3062,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3097,10 +3078,34 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); /* * Set up a range table for the executor, containing our repacked table as @@ -3149,41 +3154,41 @@ initialize_change_context(ChangeContext *chgcxt, perminfo->updatedCols = updatedCols; /* finally we can initialize the range table proper */ - ExecInitRangeTable(chgcxt->cc_estate, list_make1(rte), perminfos, + ExecInitRangeTable(dest->estate, list_make1(rte), perminfos, bms_make_singleton(1)); } /* Set up our ResultRelInfo to use for index updates */ - chgcxt->cc_rri = makeNode(ResultRelInfo); - InitResultRelInfo(chgcxt->cc_rri, relation, 1, NULL, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = makeNode(ResultRelInfo); + InitResultRelInfo(dest->rri, relation, 1, NULL, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3193,12 +3198,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3217,34 +3222,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index 56c1f997f88..25ac7079099 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2664,6 +2664,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v02-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-07-15 08:37 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-07-15 08:37 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 223 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 161 insertions(+), 111 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index 19927c15bf3..392332b4b2b 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -95,40 +95,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -175,22 +141,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -199,6 +162,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2614,18 +2580,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2634,7 +2613,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2683,14 +2662,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2706,7 +2685,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2719,7 +2698,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2727,7 +2706,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2736,6 +2715,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2743,16 +2724,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2764,10 +2744,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2795,8 +2775,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2948,10 +2928,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2962,9 +2943,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2972,13 +2953,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -3001,16 +2982,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3081,7 +3062,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3097,10 +3078,34 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); /* * Set up a range table for the executor, containing our repacked table as @@ -3149,41 +3154,41 @@ initialize_change_context(ChangeContext *chgcxt, perminfo->updatedCols = updatedCols; /* finally we can initialize the range table proper */ - ExecInitRangeTable(chgcxt->cc_estate, list_make1(rte), perminfos, + ExecInitRangeTable(dest->estate, list_make1(rte), perminfos, bms_make_singleton(1)); } /* Set up our ResultRelInfo to use for index updates */ - chgcxt->cc_rri = makeNode(ResultRelInfo); - InitResultRelInfo(chgcxt->cc_rri, relation, 1, NULL, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = makeNode(ResultRelInfo); + InitResultRelInfo(dest->rri, relation, 1, NULL, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3193,12 +3198,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3217,34 +3222,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index 56c1f997f88..25ac7079099 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2664,6 +2664,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v02-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-07-15 08:37 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-07-15 08:37 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 223 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 161 insertions(+), 111 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index 19927c15bf3..392332b4b2b 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -95,40 +95,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -175,22 +141,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -199,6 +162,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2614,18 +2580,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2634,7 +2613,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2683,14 +2662,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2706,7 +2685,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2719,7 +2698,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2727,7 +2706,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2736,6 +2715,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2743,16 +2724,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2764,10 +2744,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2795,8 +2775,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2948,10 +2928,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2962,9 +2943,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2972,13 +2953,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -3001,16 +2982,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3081,7 +3062,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3097,10 +3078,34 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); /* * Set up a range table for the executor, containing our repacked table as @@ -3149,41 +3154,41 @@ initialize_change_context(ChangeContext *chgcxt, perminfo->updatedCols = updatedCols; /* finally we can initialize the range table proper */ - ExecInitRangeTable(chgcxt->cc_estate, list_make1(rte), perminfos, + ExecInitRangeTable(dest->estate, list_make1(rte), perminfos, bms_make_singleton(1)); } /* Set up our ResultRelInfo to use for index updates */ - chgcxt->cc_rri = makeNode(ResultRelInfo); - InitResultRelInfo(chgcxt->cc_rri, relation, 1, NULL, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = makeNode(ResultRelInfo); + InitResultRelInfo(dest->rri, relation, 1, NULL, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3193,12 +3198,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3217,34 +3222,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index 56c1f997f88..25ac7079099 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2664,6 +2664,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v02-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-07-15 08:37 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-07-15 08:37 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 223 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 161 insertions(+), 111 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index 19927c15bf3..392332b4b2b 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -95,40 +95,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -175,22 +141,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -199,6 +162,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2614,18 +2580,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2634,7 +2613,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2683,14 +2662,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2706,7 +2685,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2719,7 +2698,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2727,7 +2706,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2736,6 +2715,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2743,16 +2724,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2764,10 +2744,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2795,8 +2775,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2948,10 +2928,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2962,9 +2943,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2972,13 +2953,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -3001,16 +2982,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3081,7 +3062,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3097,10 +3078,34 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); /* * Set up a range table for the executor, containing our repacked table as @@ -3149,41 +3154,41 @@ initialize_change_context(ChangeContext *chgcxt, perminfo->updatedCols = updatedCols; /* finally we can initialize the range table proper */ - ExecInitRangeTable(chgcxt->cc_estate, list_make1(rte), perminfos, + ExecInitRangeTable(dest->estate, list_make1(rte), perminfos, bms_make_singleton(1)); } /* Set up our ResultRelInfo to use for index updates */ - chgcxt->cc_rri = makeNode(ResultRelInfo); - InitResultRelInfo(chgcxt->cc_rri, relation, 1, NULL, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = makeNode(ResultRelInfo); + InitResultRelInfo(dest->rri, relation, 1, NULL, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3193,12 +3198,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3217,34 +3222,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index 56c1f997f88..25ac7079099 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2664,6 +2664,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v02-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-07-15 08:37 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-07-15 08:37 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 223 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 161 insertions(+), 111 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index 19927c15bf3..392332b4b2b 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -95,40 +95,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -175,22 +141,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -199,6 +162,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2614,18 +2580,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2634,7 +2613,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2683,14 +2662,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2706,7 +2685,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2719,7 +2698,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2727,7 +2706,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2736,6 +2715,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2743,16 +2724,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2764,10 +2744,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2795,8 +2775,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2948,10 +2928,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2962,9 +2943,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2972,13 +2953,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -3001,16 +2982,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3081,7 +3062,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3097,10 +3078,34 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); /* * Set up a range table for the executor, containing our repacked table as @@ -3149,41 +3154,41 @@ initialize_change_context(ChangeContext *chgcxt, perminfo->updatedCols = updatedCols; /* finally we can initialize the range table proper */ - ExecInitRangeTable(chgcxt->cc_estate, list_make1(rte), perminfos, + ExecInitRangeTable(dest->estate, list_make1(rte), perminfos, bms_make_singleton(1)); } /* Set up our ResultRelInfo to use for index updates */ - chgcxt->cc_rri = makeNode(ResultRelInfo); - InitResultRelInfo(chgcxt->cc_rri, relation, 1, NULL, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = makeNode(ResultRelInfo); + InitResultRelInfo(dest->rri, relation, 1, NULL, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3193,12 +3198,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3217,34 +3222,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index 56c1f997f88..25ac7079099 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2664,6 +2664,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v02-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-07-15 08:37 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-07-15 08:37 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 223 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 161 insertions(+), 111 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index 19927c15bf3..392332b4b2b 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -95,40 +95,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -175,22 +141,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -199,6 +162,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2614,18 +2580,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2634,7 +2613,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2683,14 +2662,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2706,7 +2685,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2719,7 +2698,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2727,7 +2706,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2736,6 +2715,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2743,16 +2724,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2764,10 +2744,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2795,8 +2775,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2948,10 +2928,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2962,9 +2943,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2972,13 +2953,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -3001,16 +2982,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3081,7 +3062,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3097,10 +3078,34 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); /* * Set up a range table for the executor, containing our repacked table as @@ -3149,41 +3154,41 @@ initialize_change_context(ChangeContext *chgcxt, perminfo->updatedCols = updatedCols; /* finally we can initialize the range table proper */ - ExecInitRangeTable(chgcxt->cc_estate, list_make1(rte), perminfos, + ExecInitRangeTable(dest->estate, list_make1(rte), perminfos, bms_make_singleton(1)); } /* Set up our ResultRelInfo to use for index updates */ - chgcxt->cc_rri = makeNode(ResultRelInfo); - InitResultRelInfo(chgcxt->cc_rri, relation, 1, NULL, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = makeNode(ResultRelInfo); + InitResultRelInfo(dest->rri, relation, 1, NULL, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3193,12 +3198,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3217,34 +3222,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index 56c1f997f88..25ac7079099 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2664,6 +2664,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v02-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-07-15 08:37 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-07-15 08:37 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 223 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 161 insertions(+), 111 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index 19927c15bf3..392332b4b2b 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -95,40 +95,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -175,22 +141,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -199,6 +162,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2614,18 +2580,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2634,7 +2613,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2683,14 +2662,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2706,7 +2685,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2719,7 +2698,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2727,7 +2706,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2736,6 +2715,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2743,16 +2724,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2764,10 +2744,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2795,8 +2775,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2948,10 +2928,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2962,9 +2943,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2972,13 +2953,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -3001,16 +2982,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3081,7 +3062,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3097,10 +3078,34 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); /* * Set up a range table for the executor, containing our repacked table as @@ -3149,41 +3154,41 @@ initialize_change_context(ChangeContext *chgcxt, perminfo->updatedCols = updatedCols; /* finally we can initialize the range table proper */ - ExecInitRangeTable(chgcxt->cc_estate, list_make1(rte), perminfos, + ExecInitRangeTable(dest->estate, list_make1(rte), perminfos, bms_make_singleton(1)); } /* Set up our ResultRelInfo to use for index updates */ - chgcxt->cc_rri = makeNode(ResultRelInfo); - InitResultRelInfo(chgcxt->cc_rri, relation, 1, NULL, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = makeNode(ResultRelInfo); + InitResultRelInfo(dest->rri, relation, 1, NULL, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3193,12 +3198,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3217,34 +3222,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index 56c1f997f88..25ac7079099 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2664,6 +2664,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v02-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
* [PATCH 3/8] Introduce RepackDest structure. @ 2026-07-15 08:37 Antonin Houska <[email protected]> 0 siblings, 0 replies; 98+ messages in thread From: Antonin Houska @ 2026-07-15 08:37 UTC (permalink / raw) This is for ChangeContext to handle insertions into two relations: besides the new relation (whose file will eventually be used by the REPACKed relation), an "auxiliary relation" is needed sometimes, in order to get the data sorted. The concept is introduced and explained later in the patch series. --- src/backend/commands/repack.c | 223 ++++++++++++++++--------------- src/include/commands/repack.h | 48 +++++++ src/tools/pgindent/typedefs.list | 1 + 3 files changed, 161 insertions(+), 111 deletions(-) diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c index 19927c15bf3..392332b4b2b 100644 --- a/src/backend/commands/repack.c +++ b/src/backend/commands/repack.c @@ -95,40 +95,6 @@ typedef struct Oid indexOid; } RelToCluster; -/* - * The first file exported by the decoding worker must contain a snapshot, the - * following ones contain the data changes. - */ -#define WORKER_FILE_SNAPSHOT 0 - -/* - * Information needed to apply concurrent data changes. - */ -typedef struct ChangeContext -{ - /* The relation the changes are applied to. */ - Relation cc_rel; - - /* Needed to update indexes of cc_rel. */ - ResultRelInfo *cc_rri; - EState *cc_estate; - - /* - * Existing tuples to UPDATE and DELETE are located via this index. We - * keep the scankey in partially initialized state to avoid repeated work. - * sk_argument is completed on the fly. - */ - Relation cc_ident_index; - ScanKey cc_ident_key; - int cc_ident_key_nentries; - - /* The latest column we need to deform to have the tuple identity */ - AttrNumber cc_last_key_attno; - - /* Sequential number of the file containing the changes. */ - int cc_file_seq; -} ChangeContext; - /* * Backend-local information to control the decoding worker. */ @@ -175,22 +141,19 @@ static List *get_tables_to_repack_partitioned(RepackCommand cmd, static bool repack_is_permitted_for_relation(RepackCommand cmd, Oid relid, Oid userid); -static void apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt); -static void apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt); -static void apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt); +static void apply_concurrent_changes(ChangeContext *chgcxt); +static void apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot); +static void apply_concurrent_update(RepackDest *dest, + TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple); static void apply_concurrent_delete(Relation rel, TupleTableSlot *slot); static void restore_tuple(BufFile *file, Relation relation, TupleTableSlot *slot); static void adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *src); -static bool find_target_tuple(Relation rel, ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved); -static bool identity_key_equal(ChangeContext *chgcxt, - TupleTableSlot *locator, +static bool identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate); static void process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, @@ -199,6 +162,9 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id); static void release_change_context(ChangeContext *chgcxt); +static void initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id); +static void release_change_dest(RepackDest *dest); static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHeap, Oid identIdx, TransactionId frozenXid, @@ -2614,18 +2580,31 @@ RepackCommandAsString(RepackCommand cmd) } /* - * Apply all the changes stored in 'file'. + * Apply all the changes provided by decoding worker. */ static void -apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) +apply_concurrent_changes(ChangeContext *chgcxt) { ConcurrentChangeKind kind = '\0'; - Relation rel = chgcxt->cc_rel; + RepackDest *dest; + Relation rel; TupleTableSlot *spilled_tuple; TupleTableSlot *old_update_tuple; TupleTableSlot *ondisk_tuple; bool have_old_tuple = false; MemoryContext oldcxt; + DecodingWorkerShared *shared; + char fname[MAXPGPATH]; + BufFile *file; + + dest = &chgcxt->cc_dest; + rel = dest->rel; + + shared = (DecodingWorkerShared *) dsm_segment_address(decoding_worker->seg); + + /* Open the file containing the changes. */ + DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); + file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); spilled_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); @@ -2634,7 +2613,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) old_update_tuple = MakeSingleTupleTableSlot(RelationGetDescr(rel), &TTSOpsVirtual); - oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(chgcxt->cc_estate)); + oldcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(dest->estate)); while (true) { @@ -2683,14 +2662,14 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) if (kind == CHANGE_INSERT) { - apply_concurrent_insert(rel, spilled_tuple, chgcxt); + apply_concurrent_insert(dest, spilled_tuple); } else if (kind == CHANGE_DELETE) { bool found; /* Find the tuple to be deleted */ - found = find_target_tuple(rel, chgcxt, spilled_tuple, ondisk_tuple); + found = find_target_tuple(dest, spilled_tuple, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); apply_concurrent_delete(rel, ondisk_tuple); @@ -2706,7 +2685,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) key = spilled_tuple; /* Find the tuple to be updated or deleted. */ - found = find_target_tuple(rel, chgcxt, key, ondisk_tuple); + found = find_target_tuple(dest, key, ondisk_tuple); if (!found) elog(ERROR, "could not find target tuple"); @@ -2719,7 +2698,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) */ adjust_toast_pointers(rel, spilled_tuple, ondisk_tuple); - apply_concurrent_update(rel, spilled_tuple, ondisk_tuple, chgcxt); + apply_concurrent_update(dest, spilled_tuple, ondisk_tuple); ExecClearTuple(old_update_tuple); have_old_tuple = false; @@ -2727,7 +2706,7 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) else elog(ERROR, "unrecognized kind of change: %d", kind); - ResetPerTupleExprContext(chgcxt->cc_estate); + ResetPerTupleExprContext(dest->estate); } /* Cleanup. */ @@ -2736,6 +2715,8 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) ExecDropSingleTupleTableSlot(old_update_tuple); MemoryContextSwitchTo(oldcxt); + + BufFileClose(file); } /* @@ -2743,16 +2724,15 @@ apply_concurrent_changes(BufFile *file, ChangeContext *chgcxt) * table. */ static void -apply_concurrent_insert(Relation rel, TupleTableSlot *slot, - ChangeContext *chgcxt) +apply_concurrent_insert(RepackDest *dest, TupleTableSlot *slot) { /* Put the tuple in the table, but make sure it won't be decoded */ - table_tuple_insert(rel, slot, GetCurrentCommandId(true), + table_tuple_insert(dest->rel, slot, GetCurrentCommandId(true), TABLE_INSERT_NO_LOGICAL, NULL); /* Update indexes with this new tuple. */ - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, 0, slot, NIL, NULL); @@ -2764,10 +2744,10 @@ apply_concurrent_insert(Relation rel, TupleTableSlot *slot, * table. */ static void -apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, - TupleTableSlot *ondisk_tuple, - ChangeContext *chgcxt) +apply_concurrent_update(RepackDest *dest, TupleTableSlot *spilled_tuple, + TupleTableSlot *ondisk_tuple) { + Relation rel = dest->rel; LockTupleMode lockmode; TM_FailureData tmfd; TU_UpdateIndexes update_indexes; @@ -2795,8 +2775,8 @@ apply_concurrent_update(Relation rel, TupleTableSlot *spilled_tuple, if (update_indexes == TU_Summarizing) flags |= EIIT_ONLY_SUMMARIZING; - ExecInsertIndexTuples(chgcxt->cc_rri, - chgcxt->cc_estate, + ExecInsertIndexTuples(dest->rri, + dest->estate, flags, spilled_tuple, NIL, NULL); @@ -2948,10 +2928,11 @@ adjust_toast_pointers(Relation relation, TupleTableSlot *dest, TupleTableSlot *s * not found, return false. */ static bool -find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, +find_target_tuple(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *retrieved) { - Form_pg_index idx = chgcxt->cc_ident_index->rd_index; + Relation rel = dest->rel; + Form_pg_index idx = dest->ident_index->rd_index; IndexScanDesc scan; bool retval = false; @@ -2962,9 +2943,9 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * * Use the incoming tuple to finalize the scan key. */ - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; + ScanKey entry = &dest->ident_key[i]; AttrNumber attno = idx->indkey.values[i]; entry->sk_argument = locator->tts_values[attno - 1]; @@ -2972,13 +2953,13 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, } /* XXX no instrumentation for now */ - scan = index_beginscan(rel, chgcxt->cc_ident_index, GetActiveSnapshot(), - NULL, chgcxt->cc_ident_key_nentries, 0, 0); - index_rescan(scan, chgcxt->cc_ident_key, chgcxt->cc_ident_key_nentries, NULL, 0); + scan = index_beginscan(rel, dest->ident_index, GetActiveSnapshot(), + NULL, dest->ident_key_nentries, 0, 0); + index_rescan(scan, dest->ident_key, dest->ident_key_nentries, NULL, 0); while (index_getnext_slot(scan, ForwardScanDirection, retrieved)) { /* Be wary of temporal constraints */ - if (scan->xs_recheck && !identity_key_equal(chgcxt, locator, retrieved)) + if (scan->xs_recheck && !identity_key_equal(dest, locator, retrieved)) { CHECK_FOR_INTERRUPTS(); continue; @@ -3001,16 +2982,16 @@ find_target_tuple(Relation rel, ChangeContext *chgcxt, TupleTableSlot *locator, * used for temporal constraints. */ static bool -identity_key_equal(ChangeContext *chgcxt, TupleTableSlot *locator, +identity_key_equal(RepackDest *dest, TupleTableSlot *locator, TupleTableSlot *candidate) { - slot_getsomeattrs(locator, chgcxt->cc_last_key_attno); - slot_getsomeattrs(candidate, chgcxt->cc_last_key_attno); + slot_getsomeattrs(locator, dest->last_key_attno); + slot_getsomeattrs(candidate, dest->last_key_attno); - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + for (int i = 0; i < dest->ident_key_nentries; i++) { - ScanKey entry = &chgcxt->cc_ident_key[i]; - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + ScanKey entry = &dest->ident_key[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); @@ -3081,7 +3062,7 @@ process_concurrent_changes(XLogRecPtr end_of_wal, ChangeContext *chgcxt, bool do /* Open the file. */ DecodingWorkerFileName(fname, shared->relid, chgcxt->cc_file_seq); file = BufFileOpenFileSet(&shared->sfs.fs, fname, O_RDONLY, false); - apply_concurrent_changes(file, chgcxt); + apply_concurrent_changes(chgcxt); BufFileClose(file); @@ -3097,10 +3078,34 @@ static void initialize_change_context(ChangeContext *chgcxt, Relation relation, Oid ident_index_id) { - chgcxt->cc_rel = relation; + initialize_change_dest(&chgcxt->cc_dest, relation, ident_index_id); + + chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; +} + +/* + * Free up resources taken by a ChangeContext. + */ +static void +release_change_context(ChangeContext *chgcxt) +{ + release_change_dest(&chgcxt->cc_dest); +} + +/* + * Initialize the RepackDest struct for the given relation, with the given + * index as identity index. InvalidOid can be specified to only make the + * relation ready for insertions. + */ +static void +initialize_change_dest(RepackDest *dest, Relation relation, + Oid ident_index_id) +{ + dest->rel = relation; + dest->bistate = GetBulkInsertState(); /* Only initialize fields needed by ExecInsertIndexTuples(). */ - chgcxt->cc_estate = CreateExecutorState(); + dest->estate = CreateExecutorState(); /* * Set up a range table for the executor, containing our repacked table as @@ -3149,41 +3154,41 @@ initialize_change_context(ChangeContext *chgcxt, perminfo->updatedCols = updatedCols; /* finally we can initialize the range table proper */ - ExecInitRangeTable(chgcxt->cc_estate, list_make1(rte), perminfos, + ExecInitRangeTable(dest->estate, list_make1(rte), perminfos, bms_make_singleton(1)); } /* Set up our ResultRelInfo to use for index updates */ - chgcxt->cc_rri = makeNode(ResultRelInfo); - InitResultRelInfo(chgcxt->cc_rri, relation, 1, NULL, 0); - ExecOpenIndices(chgcxt->cc_rri, false); + dest->rri = makeNode(ResultRelInfo); + InitResultRelInfo(dest->rri, relation, 1, NULL, 0); + ExecOpenIndices(dest->rri, false); /* * The table's relcache entry already has the relcache entry for the * identity index; find that. */ - chgcxt->cc_ident_index = NULL; - for (int i = 0; i < chgcxt->cc_rri->ri_NumIndices; i++) + dest->ident_index = NULL; + for (int i = 0; i < dest->rri->ri_NumIndices; i++) { Relation ind_rel; - ind_rel = chgcxt->cc_rri->ri_IndexRelationDescs[i]; + ind_rel = dest->rri->ri_IndexRelationDescs[i]; if (ind_rel->rd_id == ident_index_id) { - chgcxt->cc_ident_index = ind_rel; + dest->ident_index = ind_rel; break; } } - if (chgcxt->cc_ident_index == NULL) + if (dest->ident_index == NULL) elog(ERROR, "could not find identity index"); /* Set up for scanning said identity index */ { Form_pg_index indexForm; - indexForm = chgcxt->cc_ident_index->rd_index; - chgcxt->cc_ident_key_nentries = indexForm->indnkeyatts; - chgcxt->cc_ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); + indexForm = dest->ident_index->rd_index; + dest->ident_key_nentries = indexForm->indnkeyatts; + dest->ident_key = (ScanKey) palloc_array(ScanKeyData, indexForm->indnkeyatts); for (int i = 0; i < indexForm->indnkeyatts; i++) { ScanKey entry; @@ -3193,12 +3198,12 @@ initialize_change_context(ChangeContext *chgcxt, opcode; StrategyNumber eq_strategy; - entry = &chgcxt->cc_ident_key[i]; + entry = &dest->ident_key[i]; - opfamily = chgcxt->cc_ident_index->rd_opfamily[i]; - opcintype = chgcxt->cc_ident_index->rd_opcintype[i]; + opfamily = dest->ident_index->rd_opfamily[i]; + opcintype = dest->ident_index->rd_opcintype[i]; eq_strategy = IndexAmTranslateCompareType(COMPARE_EQ, - chgcxt->cc_ident_index->rd_rel->relam, + dest->ident_index->rd_rel->relam, opfamily, false); if (eq_strategy == InvalidStrategy) elog(ERROR, "could not find equality strategy for index operator family %u for type %u", @@ -3217,34 +3222,30 @@ initialize_change_context(ChangeContext *chgcxt, i + 1, eq_strategy, opcode, (Datum) 0); - entry->sk_collation = chgcxt->cc_ident_index->rd_indcollation[i]; + entry->sk_collation = dest->ident_index->rd_indcollation[i]; } } /* Determine the last column we must deform to read the identity */ - chgcxt->cc_last_key_attno = InvalidAttrNumber; - for (int i = 0; i < chgcxt->cc_ident_key_nentries; i++) + dest->last_key_attno = InvalidAttrNumber; + for (int i = 0; i < dest->ident_key_nentries; i++) { - AttrNumber attno = chgcxt->cc_ident_index->rd_index->indkey.values[i]; + AttrNumber attno = dest->ident_index->rd_index->indkey.values[i]; Assert(attno > 0); - chgcxt->cc_last_key_attno = Max(chgcxt->cc_last_key_attno, attno); + dest->last_key_attno = Max(dest->last_key_attno, attno); } - - chgcxt->cc_file_seq = WORKER_FILE_SNAPSHOT + 1; } -/* - * Free up resources taken by a ChangeContext. - */ static void -release_change_context(ChangeContext *chgcxt) +release_change_dest(RepackDest *dest) { - ExecCloseIndices(chgcxt->cc_rri); - FreeExecutorState(chgcxt->cc_estate); + FreeBulkInsertState(dest->bistate); + ExecCloseIndices(dest->rri); + FreeExecutorState(dest->estate); /* XXX are these pfrees necessary? */ - pfree(chgcxt->cc_rri); - pfree(chgcxt->cc_ident_key); + pfree(dest->rri); + pfree(dest->ident_key); } /* diff --git a/src/include/commands/repack.h b/src/include/commands/repack.h index 27105c10591..07f887e99f6 100644 --- a/src/include/commands/repack.h +++ b/src/include/commands/repack.h @@ -16,6 +16,7 @@ #include <signal.h> #include "access/hio.h" +#include "access/skey.h" #include "nodes/execnodes.h" #include "nodes/parsenodes.h" #include "parser/parse_node.h" @@ -39,6 +40,53 @@ typedef struct ClusterParams extern PGDLLIMPORT volatile sig_atomic_t RepackMessagePending; +/* + * Table to apply concurrent data changes to. + */ +typedef struct RepackDest +{ + /* The relation the changes are applied to. */ + Relation rel; + + BulkInsertStateData *bistate; + + /* Needed to update indexes of cc_rel. */ + ResultRelInfo *rri; + EState *estate; + + /* + * Existing tuples to UPDATE and DELETE are located via this index. We + * keep the scankey in partially initialized state to avoid repeated work. + * sk_argument is completed on the fly. + */ + Relation ident_index; + ScanKey ident_key; + + int ident_key_nentries; + + /* The latest column we need to deform to have the tuple identity */ + AttrNumber last_key_attno; +} RepackDest; + +/* + * The first file exported by the decoding worker must contain a snapshot, the + * following ones contain the data changes. + */ +#define WORKER_FILE_SNAPSHOT 0 + +/* + * Information needed to apply concurrent data changes. + * + * XXX Now that it's in *.h file, rename to RepackChangeContext? + */ +typedef struct ChangeContext +{ + /* The destination table. */ + RepackDest cc_dest; + + /* Sequential number of the file containing the changes. */ + int cc_file_seq; +} ChangeContext; extern void ExecRepack(ParseState *pstate, RepackStmt *stmt, bool isTopLevel); diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index 56c1f997f88..25ac7079099 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -2664,6 +2664,7 @@ ReorderBufferTupleCidKey ReorderBufferUpdateProgressTxnCB ReorderTuple RepackCommand +RepackDest RepackDecodingState RepackStmt ReparameterizeForeignPathByChild_function -- 2.52.0 --=-=-= Content-Type: text/plain Content-Disposition: attachment; filename=v02-0004-Use-multiple-snapshots-to-copy-the-data.patch ^ permalink raw reply [nested|flat] 98+ messages in thread
end of thread, other threads:[~2026-07-15 08:37 UTC | newest] Thread overview: 98+ messages (download: mbox mbox.gz follow: Atom feed) -- links below jump to the message on this page -- 2026-04-01 15:35 [PATCH v50 6/8] Error out any process that would block at REPACK Antonin Houska <[email protected]> 2026-06-16 11:54 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-06-16 11:54 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-06-16 11:54 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-06-16 11:54 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-06-16 11:54 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-06-16 11:54 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-06-16 11:54 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-06-16 11:54 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-06-16 11:54 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-06-16 11:54 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-06-16 11:54 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-06-16 11:54 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-06-16 11:54 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-06-16 11:54 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-06-16 11:54 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-06-16 11:54 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-06-16 11:54 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-06-16 11:54 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-06-16 11:54 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-06-16 11:54 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-06-16 11:54 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-06-16 11:54 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-06-16 11:54 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-06-16 11:54 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-06-16 11:54 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-06-16 11:54 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-06-16 11:54 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-06-16 11:54 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-06-16 11:54 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-06-16 11:54 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-06-16 11:54 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-06-16 11:54 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-06-16 11:54 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-06-16 11:54 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-06-16 11:54 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-06-16 11:54 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-06-16 11:54 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-06-16 11:54 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-06-16 11:54 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-06-16 11:54 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-06-16 11:54 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-06-16 11:54 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-06-16 11:54 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-06-16 11:54 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-06-16 11:54 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-06-16 11:54 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-06-16 11:54 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-06-16 11:54 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-06-16 11:54 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-07-15 08:37 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-07-15 08:37 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-07-15 08:37 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-07-15 08:37 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-07-15 08:37 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-07-15 08:37 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-07-15 08:37 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-07-15 08:37 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-07-15 08:37 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-07-15 08:37 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-07-15 08:37 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-07-15 08:37 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-07-15 08:37 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-07-15 08:37 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-07-15 08:37 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-07-15 08:37 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-07-15 08:37 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-07-15 08:37 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-07-15 08:37 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-07-15 08:37 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-07-15 08:37 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-07-15 08:37 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-07-15 08:37 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-07-15 08:37 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-07-15 08:37 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-07-15 08:37 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-07-15 08:37 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-07-15 08:37 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-07-15 08:37 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-07-15 08:37 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-07-15 08:37 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-07-15 08:37 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-07-15 08:37 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-07-15 08:37 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-07-15 08:37 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-07-15 08:37 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-07-15 08:37 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-07-15 08:37 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-07-15 08:37 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-07-15 08:37 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-07-15 08:37 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-07-15 08:37 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-07-15 08:37 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-07-15 08:37 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-07-15 08:37 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-07-15 08:37 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-07-15 08:37 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]> 2026-07-15 08:37 [PATCH 3/8] Introduce RepackDest structure. Antonin Houska <[email protected]>
This inbox is served by agora; see mirroring instructions for how to clone and mirror all data and code used for this inbox