agora inbox for [email protected]
help / color / mirror / Atom feed[PATCH v51 02/10] Rename cluster.c/h -> repack.c/h
5+ messages / 2 participants
[nested] [flat]
* [PATCH v51 02/10] Rename cluster.c/h -> repack.c/h
@ 2026-03-31 16:55 Álvaro Herrera <[email protected]>
0 siblings, 0 replies; 5+ messages in thread
From: Álvaro Herrera @ 2026-03-31 16:55 UTC (permalink / raw)
---
src/backend/commands/Makefile | 2 +-
src/backend/commands/matview.c | 2 +-
src/backend/commands/meson.build | 2 +-
src/backend/commands/{cluster.c => repack.c} | 6 +++---
src/backend/commands/tablecmds.c | 2 +-
src/backend/commands/vacuum.c | 6 +++---
src/backend/storage/ipc/procsignal.c | 1 +
src/backend/tcop/postgres.c | 1 +
src/backend/tcop/utility.c | 2 +-
src/include/commands/{cluster.h => repack.h} | 12 ++++++------
10 files changed, 19 insertions(+), 17 deletions(-)
rename src/backend/commands/{cluster.c => repack.c} (99%)
rename src/include/commands/{cluster.h => repack.h} (90%)
diff --git a/src/backend/commands/Makefile b/src/backend/commands/Makefile
index c10fdba2bbb..fe1bba3a9b9 100644
--- a/src/backend/commands/Makefile
+++ b/src/backend/commands/Makefile
@@ -18,7 +18,6 @@ OBJS = \
amcmds.o \
analyze.o \
async.o \
- cluster.o \
collationcmds.o \
comment.o \
constraint.o \
@@ -51,6 +50,7 @@ OBJS = \
proclang.o \
propgraphcmds.o \
publicationcmds.o \
+ repack.o \
schemacmds.o \
seclabel.o \
sequence.o \
diff --git a/src/backend/commands/matview.c b/src/backend/commands/matview.c
index d3be8939011..5db4fe75dce 100644
--- a/src/backend/commands/matview.c
+++ b/src/backend/commands/matview.c
@@ -24,8 +24,8 @@
#include "catalog/namespace.h"
#include "catalog/pg_am.h"
#include "catalog/pg_opclass.h"
-#include "commands/cluster.h"
#include "commands/matview.h"
+#include "commands/repack.h"
#include "commands/tablecmds.h"
#include "commands/tablespace.h"
#include "executor/executor.h"
diff --git a/src/backend/commands/meson.build b/src/backend/commands/meson.build
index 90c7e37a429..f624aae74af 100644
--- a/src/backend/commands/meson.build
+++ b/src/backend/commands/meson.build
@@ -6,7 +6,6 @@ backend_sources += files(
'amcmds.c',
'analyze.c',
'async.c',
- 'cluster.c',
'collationcmds.c',
'comment.c',
'constraint.c',
@@ -39,6 +38,7 @@ backend_sources += files(
'proclang.c',
'propgraphcmds.c',
'publicationcmds.c',
+ 'repack.c',
'schemacmds.c',
'seclabel.c',
'sequence.c',
diff --git a/src/backend/commands/cluster.c b/src/backend/commands/repack.c
similarity index 99%
rename from src/backend/commands/cluster.c
rename to src/backend/commands/repack.c
index f241e18b153..20f0a572236 100644
--- a/src/backend/commands/cluster.c
+++ b/src/backend/commands/repack.c
@@ -1,6 +1,6 @@
/*-------------------------------------------------------------------------
*
- * cluster.c
+ * repack.c
* REPACK a table; formerly known as CLUSTER. VACUUM FULL also uses
* parts of this code.
*
@@ -10,7 +10,7 @@
*
*
* IDENTIFICATION
- * src/backend/commands/cluster.c
+ * src/backend/commands/repack.c
*
*-------------------------------------------------------------------------
*/
@@ -33,9 +33,9 @@
#include "catalog/pg_am.h"
#include "catalog/pg_inherits.h"
#include "catalog/toasting.h"
-#include "commands/cluster.h"
#include "commands/defrem.h"
#include "commands/progress.h"
+#include "commands/repack.h"
#include "commands/tablecmds.h"
#include "commands/vacuum.h"
#include "miscadmin.h"
diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c
index 0ce2e81f9c2..e2882a50b3b 100644
--- a/src/backend/commands/tablecmds.c
+++ b/src/backend/commands/tablecmds.c
@@ -57,10 +57,10 @@
#include "catalog/storage.h"
#include "catalog/storage_xlog.h"
#include "catalog/toasting.h"
-#include "commands/cluster.h"
#include "commands/comment.h"
#include "commands/defrem.h"
#include "commands/event_trigger.h"
+#include "commands/repack.h"
#include "commands/sequence.h"
#include "commands/tablecmds.h"
#include "commands/tablespace.h"
diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index 0ed363d1c85..b179b62b5c8 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -9,7 +9,7 @@
*
* VACUUM for heap AM is implemented in vacuumlazy.c, parallel vacuum in
* vacuumparallel.c, ANALYZE in analyze.c, and VACUUM FULL is a variant of
- * CLUSTER, handled in cluster.c.
+ * REPACK, handled in repack.c.
*
*
* Portions Copyright (c) 1996-2026, PostgreSQL Global Development Group
@@ -38,9 +38,9 @@
#include "catalog/pg_database.h"
#include "catalog/pg_inherits.h"
#include "commands/async.h"
-#include "commands/cluster.h"
#include "commands/defrem.h"
#include "commands/progress.h"
+#include "commands/repack.h"
#include "commands/vacuum.h"
#include "miscadmin.h"
#include "nodes/makefuncs.h"
@@ -2293,7 +2293,7 @@ vacuum_rel(Oid relid, RangeVar *relation, VacuumParams params,
if ((params.options & VACOPT_VERBOSE) != 0)
cluster_params.options |= CLUOPT_VERBOSE;
- /* VACUUM FULL is a variant of REPACK; see cluster.c */
+ /* VACUUM FULL is a variant of REPACK; see repack.c */
cluster_rel(REPACK_COMMAND_VACUUMFULL, rel, InvalidOid,
&cluster_params);
/* cluster_rel closes the relation, but keeps lock */
diff --git a/src/backend/storage/ipc/procsignal.c b/src/backend/storage/ipc/procsignal.c
index 7e017c8d53b..7cef6e43661 100644
--- a/src/backend/storage/ipc/procsignal.c
+++ b/src/backend/storage/ipc/procsignal.c
@@ -19,6 +19,7 @@
#include "access/parallel.h"
#include "commands/async.h"
+#include "commands/repack.h"
#include "miscadmin.h"
#include "pgstat.h"
#include "port/pg_bitutils.h"
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index 10be60011ad..9fbaa5c00f0 100644
--- a/src/backend/tcop/postgres.c
+++ b/src/backend/tcop/postgres.c
@@ -39,6 +39,7 @@
#include "commands/event_trigger.h"
#include "commands/explain_state.h"
#include "commands/prepare.h"
+#include "commands/repack.h"
#include "common/pg_prng.h"
#include "jit/jit.h"
#include "libpq/libpq.h"
diff --git a/src/backend/tcop/utility.c b/src/backend/tcop/utility.c
index 2b609bfc824..5f8c766c4be 100644
--- a/src/backend/tcop/utility.c
+++ b/src/backend/tcop/utility.c
@@ -26,7 +26,6 @@
#include "catalog/toasting.h"
#include "commands/alter.h"
#include "commands/async.h"
-#include "commands/cluster.h"
#include "commands/collationcmds.h"
#include "commands/comment.h"
#include "commands/conversioncmds.h"
@@ -46,6 +45,7 @@
#include "commands/proclang.h"
#include "commands/propgraphcmds.h"
#include "commands/publicationcmds.h"
+#include "commands/repack.h"
#include "commands/schemacmds.h"
#include "commands/seclabel.h"
#include "commands/sequence.h"
diff --git a/src/include/commands/cluster.h b/src/include/commands/repack.h
similarity index 90%
rename from src/include/commands/cluster.h
rename to src/include/commands/repack.h
index d6b62c747e8..85061158b0c 100644
--- a/src/include/commands/cluster.h
+++ b/src/include/commands/repack.h
@@ -1,17 +1,17 @@
/*-------------------------------------------------------------------------
*
- * cluster.h
- * header file for postgres cluster command stuff
+ * repack.h
+ * header file for the REPACK command
*
* Portions Copyright (c) 1996-2026, PostgreSQL Global Development Group
* Portions Copyright (c) 1994-5, Regents of the University of California
*
- * src/include/commands/cluster.h
+ * src/include/commands/repack.h
*
*-------------------------------------------------------------------------
*/
-#ifndef CLUSTER_H
-#define CLUSTER_H
+#ifndef REPACK_H
+#define REPACK_H
#include "nodes/parsenodes.h"
#include "parser/parse_node.h"
@@ -52,4 +52,4 @@ extern void finish_heap_swap(Oid OIDOldHeap, Oid OIDNewHeap,
MultiXactId cutoffMulti,
char newrelpersistence);
-#endif /* CLUSTER_H */
+#endif /* REPACK_H */
--
2.47.3
--r2slln3zpmilwu22
Content-Type: text/x-diff; charset=utf-8
Content-Disposition: attachment;
filename="v51-0003-Add-CONCURRENTLY-option-to-REPACK-command.patch"
^ permalink raw reply [nested|flat] 5+ messages in thread
* [PATCH] Copy the relevant pg_attrdef catalog entries for the transient relation.
@ 2026-06-22 07:34 Antonin Houska <[email protected]>
0 siblings, 0 replies; 5+ messages in thread
From: Antonin Houska @ 2026-06-22 07:34 UTC (permalink / raw)
The default values may be needed by the executor when processing the
concurrent data changes. In particular, ExecInsertIndexTuples() needs it when
determining the value of the 'indexUnchanged' hint for the index AM.
Like in copy_index_constraints(), we make the new catalog entries dependent on
the transient relation, so they are dropped along with it automatically.
---
src/backend/commands/repack.c | 97 +++++++++++++++++++
.../injection_points/specs/repack.spec | 3 +-
2 files changed, 99 insertions(+), 1 deletion(-)
diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c
index 4d177c868bb..725efa236bc 100644
--- a/src/backend/commands/repack.c
+++ b/src/backend/commands/repack.c
@@ -48,6 +48,7 @@
#include "catalog/namespace.h"
#include "catalog/objectaccess.h"
#include "catalog/pg_am.h"
+#include "catalog/pg_attrdef.h"
#include "catalog/pg_constraint.h"
#include "catalog/pg_inherits.h"
#include "catalog/toasting.h"
@@ -204,6 +205,7 @@ static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHea
static List *build_new_indexes(Relation NewHeap, Relation OldHeap, List *OldIndexes);
static void copy_index_constraints(Relation old_index, Oid new_index_id,
Oid new_heap_id);
+static void copy_attribute_defaults(Relation old_heap, Relation new_heap);
static Relation process_single_relation(RepackStmt *stmt,
LOCKMODE lockmode,
bool isTopLevel,
@@ -1083,6 +1085,13 @@ rebuild_relation(Relation OldHeap, Relation index, bool verbose,
Assert(CheckRelationOidLockedByMe(OIDNewHeap, AccessExclusiveLock, false));
NewHeap = table_open(OIDNewHeap, NoLock);
+ /*
+ * Copy attribute defaults - the executor may need them, in order to
+ * process the concurrent data changes. In particular, this is related to
+ * ExecInsertIndexTuples().
+ */
+ copy_attribute_defaults(OldHeap, NewHeap);
+
/* Copy the heap data into the new table in the desired order */
copy_table_data(NewHeap, OldHeap, index, snapshot, verbose,
&swap_toast_by_content, &frozenXid, &cutoffMulti);
@@ -3434,6 +3443,94 @@ copy_index_constraints(Relation old_index, Oid new_index_id, Oid new_heap_id)
CommandCounterIncrement();
}
+/*
+ * Create a transient copy of attribute defaults for the transient table.
+ *
+ * Like above, the executor needs information on attribute defaults. Once the
+ * repacking is finished, the catalog entries we create here are dropped.
+ */
+static void
+copy_attribute_defaults(Relation old_heap, Relation new_heap)
+{
+ Oid old_heap_id = RelationGetRelid(old_heap);
+ Oid new_heap_id = RelationGetRelid(new_heap);
+ ScanKeyData skey;
+ Relation rel;
+ Relation att_rel = NULL;
+ TupleDesc desc;
+ SysScanDesc scan;
+ HeapTuple tup;
+ ObjectAddress objrel;
+
+ rel = table_open(AttrDefaultRelationId, RowExclusiveLock);
+ ObjectAddressSet(objrel, RelationRelationId, new_heap_id);
+
+ ScanKeyInit(&skey,
+ Anum_pg_attrdef_adrelid,
+ BTEqualStrategyNumber, F_OIDEQ,
+ ObjectIdGetDatum(old_heap_id));
+ scan = systable_beginscan(rel, AttrDefaultIndexId, true,
+ NULL, 1, &skey);
+ desc = RelationGetDescr(rel);
+ while (HeapTupleIsValid(tup = systable_getnext(scan)))
+ {
+ Form_pg_attrdef adform;
+ Oid oid;
+ Datum values[Natts_pg_attrdef] = {0};
+ bool nulls[Natts_pg_attrdef] = {0};
+ bool replaces[Natts_pg_attrdef] = {0};
+ HeapTuple new_tup, att_tup, att_new_tup;
+ ObjectAddress objad;
+ Datum att_values[Natts_pg_attribute] = {0};
+ bool att_nulls[Natts_pg_attribute] = {0};
+ bool att_replaces[Natts_pg_attribute] = {0};
+
+ adform = (Form_pg_attrdef) GETSTRUCT(tup);
+ Assert(adform->adrelid == old_heap_id);
+
+ oid = GetNewOidWithIndex(rel, AttrDefaultOidIndexId,
+ Anum_pg_attrdef_oid);
+ values[Anum_pg_attrdef_oid - 1] = ObjectIdGetDatum(oid);
+ replaces[Anum_pg_attrdef_oid - 1] = true;
+ values[Anum_pg_attrdef_adrelid - 1] = ObjectIdGetDatum(new_heap_id);
+ replaces[Anum_pg_attrdef_adrelid - 1] = true;
+
+ new_tup = heap_modify_tuple(tup, desc, values, nulls, replaces);
+
+ /* Insert it into the catalog. */
+ CatalogTupleInsert(rel, new_tup);
+
+ /* Create a dependency so it's removed when we drop the new heap. */
+ ObjectAddressSet(objad, AttrDefaultRelationId, oid);
+ recordDependencyOn(&objad, &objrel, DEPENDENCY_AUTO);
+
+ /* Set atthasdef - new heap has it cleared. */
+ att_tup = SearchSysCache2(ATTNUM,
+ ObjectIdGetDatum(new_heap_id),
+ ObjectIdGetDatum(adform->adnum));
+ if (!HeapTupleIsValid(att_tup))
+ elog(ERROR, "cache lookup failed for attribute %d of relation %u",
+ adform->adnum, new_heap_id);
+
+ att_values[Anum_pg_attribute_atthasdef - 1] = BoolGetDatum(true);
+ att_replaces[Anum_pg_attribute_atthasdef - 1] = true;
+
+ if (att_rel == NULL)
+ att_rel = table_open(AttributeRelationId, RowExclusiveLock);
+ att_new_tup = heap_modify_tuple(att_tup, RelationGetDescr(att_rel),
+ att_values, att_nulls, att_replaces);
+ ReleaseSysCache(att_tup);
+ CatalogTupleUpdate(att_rel, &att_new_tup->t_self, att_new_tup);
+ }
+ systable_endscan(scan);
+
+ table_close(rel, RowExclusiveLock);
+ if (att_rel)
+ table_close(att_rel, RowExclusiveLock);
+
+ CommandCounterIncrement();
+}
+
/*
* Try to start a background worker to perform logical decoding of data
* changes applied to relation while REPACK CONCURRENTLY is copying its
diff --git a/src/test/modules/injection_points/specs/repack.spec b/src/test/modules/injection_points/specs/repack.spec
index d727a9b056b..7896d1456ad 100644
--- a/src/test/modules/injection_points/specs/repack.spec
+++ b/src/test/modules/injection_points/specs/repack.spec
@@ -3,7 +3,8 @@ setup
{
CREATE EXTENSION injection_points;
- CREATE TABLE repack_test(i int PRIMARY KEY, j int);
+ CREATE TABLE repack_test(i int PRIMARY KEY, j int,
+ k int GENERATED ALWAYS AS (j * 2) STORED);
INSERT INTO repack_test(i, j) VALUES (1, 1), (2, 2), (3, 3), (4, 4);
CREATE TABLE relfilenodes(node oid);
--
2.52.0
--=-=-=--
^ permalink raw reply [nested|flat] 5+ messages in thread
* [PATCH] Copy the relevant pg_attrdef catalog entries for the transient relation.
@ 2026-06-22 07:34 Antonin Houska <[email protected]>
0 siblings, 0 replies; 5+ messages in thread
From: Antonin Houska @ 2026-06-22 07:34 UTC (permalink / raw)
The default values may be needed by the executor when processing the
concurrent data changes. In particular, ExecInsertIndexTuples() needs it when
determining the value of the 'indexUnchanged' hint for the index AM.
Like in copy_index_constraints(), we make the new catalog entries dependent on
the transient relation, so they are dropped along with it automatically.
---
src/backend/commands/repack.c | 97 +++++++++++++++++++
.../injection_points/specs/repack.spec | 3 +-
2 files changed, 99 insertions(+), 1 deletion(-)
diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c
index 4d177c868bb..725efa236bc 100644
--- a/src/backend/commands/repack.c
+++ b/src/backend/commands/repack.c
@@ -48,6 +48,7 @@
#include "catalog/namespace.h"
#include "catalog/objectaccess.h"
#include "catalog/pg_am.h"
+#include "catalog/pg_attrdef.h"
#include "catalog/pg_constraint.h"
#include "catalog/pg_inherits.h"
#include "catalog/toasting.h"
@@ -204,6 +205,7 @@ static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHea
static List *build_new_indexes(Relation NewHeap, Relation OldHeap, List *OldIndexes);
static void copy_index_constraints(Relation old_index, Oid new_index_id,
Oid new_heap_id);
+static void copy_attribute_defaults(Relation old_heap, Relation new_heap);
static Relation process_single_relation(RepackStmt *stmt,
LOCKMODE lockmode,
bool isTopLevel,
@@ -1083,6 +1085,13 @@ rebuild_relation(Relation OldHeap, Relation index, bool verbose,
Assert(CheckRelationOidLockedByMe(OIDNewHeap, AccessExclusiveLock, false));
NewHeap = table_open(OIDNewHeap, NoLock);
+ /*
+ * Copy attribute defaults - the executor may need them, in order to
+ * process the concurrent data changes. In particular, this is related to
+ * ExecInsertIndexTuples().
+ */
+ copy_attribute_defaults(OldHeap, NewHeap);
+
/* Copy the heap data into the new table in the desired order */
copy_table_data(NewHeap, OldHeap, index, snapshot, verbose,
&swap_toast_by_content, &frozenXid, &cutoffMulti);
@@ -3434,6 +3443,94 @@ copy_index_constraints(Relation old_index, Oid new_index_id, Oid new_heap_id)
CommandCounterIncrement();
}
+/*
+ * Create a transient copy of attribute defaults for the transient table.
+ *
+ * Like above, the executor needs information on attribute defaults. Once the
+ * repacking is finished, the catalog entries we create here are dropped.
+ */
+static void
+copy_attribute_defaults(Relation old_heap, Relation new_heap)
+{
+ Oid old_heap_id = RelationGetRelid(old_heap);
+ Oid new_heap_id = RelationGetRelid(new_heap);
+ ScanKeyData skey;
+ Relation rel;
+ Relation att_rel = NULL;
+ TupleDesc desc;
+ SysScanDesc scan;
+ HeapTuple tup;
+ ObjectAddress objrel;
+
+ rel = table_open(AttrDefaultRelationId, RowExclusiveLock);
+ ObjectAddressSet(objrel, RelationRelationId, new_heap_id);
+
+ ScanKeyInit(&skey,
+ Anum_pg_attrdef_adrelid,
+ BTEqualStrategyNumber, F_OIDEQ,
+ ObjectIdGetDatum(old_heap_id));
+ scan = systable_beginscan(rel, AttrDefaultIndexId, true,
+ NULL, 1, &skey);
+ desc = RelationGetDescr(rel);
+ while (HeapTupleIsValid(tup = systable_getnext(scan)))
+ {
+ Form_pg_attrdef adform;
+ Oid oid;
+ Datum values[Natts_pg_attrdef] = {0};
+ bool nulls[Natts_pg_attrdef] = {0};
+ bool replaces[Natts_pg_attrdef] = {0};
+ HeapTuple new_tup, att_tup, att_new_tup;
+ ObjectAddress objad;
+ Datum att_values[Natts_pg_attribute] = {0};
+ bool att_nulls[Natts_pg_attribute] = {0};
+ bool att_replaces[Natts_pg_attribute] = {0};
+
+ adform = (Form_pg_attrdef) GETSTRUCT(tup);
+ Assert(adform->adrelid == old_heap_id);
+
+ oid = GetNewOidWithIndex(rel, AttrDefaultOidIndexId,
+ Anum_pg_attrdef_oid);
+ values[Anum_pg_attrdef_oid - 1] = ObjectIdGetDatum(oid);
+ replaces[Anum_pg_attrdef_oid - 1] = true;
+ values[Anum_pg_attrdef_adrelid - 1] = ObjectIdGetDatum(new_heap_id);
+ replaces[Anum_pg_attrdef_adrelid - 1] = true;
+
+ new_tup = heap_modify_tuple(tup, desc, values, nulls, replaces);
+
+ /* Insert it into the catalog. */
+ CatalogTupleInsert(rel, new_tup);
+
+ /* Create a dependency so it's removed when we drop the new heap. */
+ ObjectAddressSet(objad, AttrDefaultRelationId, oid);
+ recordDependencyOn(&objad, &objrel, DEPENDENCY_AUTO);
+
+ /* Set atthasdef - new heap has it cleared. */
+ att_tup = SearchSysCache2(ATTNUM,
+ ObjectIdGetDatum(new_heap_id),
+ ObjectIdGetDatum(adform->adnum));
+ if (!HeapTupleIsValid(att_tup))
+ elog(ERROR, "cache lookup failed for attribute %d of relation %u",
+ adform->adnum, new_heap_id);
+
+ att_values[Anum_pg_attribute_atthasdef - 1] = BoolGetDatum(true);
+ att_replaces[Anum_pg_attribute_atthasdef - 1] = true;
+
+ if (att_rel == NULL)
+ att_rel = table_open(AttributeRelationId, RowExclusiveLock);
+ att_new_tup = heap_modify_tuple(att_tup, RelationGetDescr(att_rel),
+ att_values, att_nulls, att_replaces);
+ ReleaseSysCache(att_tup);
+ CatalogTupleUpdate(att_rel, &att_new_tup->t_self, att_new_tup);
+ }
+ systable_endscan(scan);
+
+ table_close(rel, RowExclusiveLock);
+ if (att_rel)
+ table_close(att_rel, RowExclusiveLock);
+
+ CommandCounterIncrement();
+}
+
/*
* Try to start a background worker to perform logical decoding of data
* changes applied to relation while REPACK CONCURRENTLY is copying its
diff --git a/src/test/modules/injection_points/specs/repack.spec b/src/test/modules/injection_points/specs/repack.spec
index d727a9b056b..7896d1456ad 100644
--- a/src/test/modules/injection_points/specs/repack.spec
+++ b/src/test/modules/injection_points/specs/repack.spec
@@ -3,7 +3,8 @@ setup
{
CREATE EXTENSION injection_points;
- CREATE TABLE repack_test(i int PRIMARY KEY, j int);
+ CREATE TABLE repack_test(i int PRIMARY KEY, j int,
+ k int GENERATED ALWAYS AS (j * 2) STORED);
INSERT INTO repack_test(i, j) VALUES (1, 1), (2, 2), (3, 3), (4, 4);
CREATE TABLE relfilenodes(node oid);
--
2.52.0
--=-=-=--
^ permalink raw reply [nested|flat] 5+ messages in thread
* [PATCH] Copy the relevant pg_attrdef catalog entries for the transient relation.
@ 2026-06-22 07:34 Antonin Houska <[email protected]>
0 siblings, 0 replies; 5+ messages in thread
From: Antonin Houska @ 2026-06-22 07:34 UTC (permalink / raw)
The default values may be needed by the executor when processing the
concurrent data changes. In particular, ExecInsertIndexTuples() needs it when
determining the value of the 'indexUnchanged' hint for the index AM.
Like in copy_index_constraints(), we make the new catalog entries dependent on
the transient relation, so they are dropped along with it automatically.
---
src/backend/commands/repack.c | 97 +++++++++++++++++++
.../injection_points/specs/repack.spec | 3 +-
2 files changed, 99 insertions(+), 1 deletion(-)
diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c
index 4d177c868bb..725efa236bc 100644
--- a/src/backend/commands/repack.c
+++ b/src/backend/commands/repack.c
@@ -48,6 +48,7 @@
#include "catalog/namespace.h"
#include "catalog/objectaccess.h"
#include "catalog/pg_am.h"
+#include "catalog/pg_attrdef.h"
#include "catalog/pg_constraint.h"
#include "catalog/pg_inherits.h"
#include "catalog/toasting.h"
@@ -204,6 +205,7 @@ static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHea
static List *build_new_indexes(Relation NewHeap, Relation OldHeap, List *OldIndexes);
static void copy_index_constraints(Relation old_index, Oid new_index_id,
Oid new_heap_id);
+static void copy_attribute_defaults(Relation old_heap, Relation new_heap);
static Relation process_single_relation(RepackStmt *stmt,
LOCKMODE lockmode,
bool isTopLevel,
@@ -1083,6 +1085,13 @@ rebuild_relation(Relation OldHeap, Relation index, bool verbose,
Assert(CheckRelationOidLockedByMe(OIDNewHeap, AccessExclusiveLock, false));
NewHeap = table_open(OIDNewHeap, NoLock);
+ /*
+ * Copy attribute defaults - the executor may need them, in order to
+ * process the concurrent data changes. In particular, this is related to
+ * ExecInsertIndexTuples().
+ */
+ copy_attribute_defaults(OldHeap, NewHeap);
+
/* Copy the heap data into the new table in the desired order */
copy_table_data(NewHeap, OldHeap, index, snapshot, verbose,
&swap_toast_by_content, &frozenXid, &cutoffMulti);
@@ -3434,6 +3443,94 @@ copy_index_constraints(Relation old_index, Oid new_index_id, Oid new_heap_id)
CommandCounterIncrement();
}
+/*
+ * Create a transient copy of attribute defaults for the transient table.
+ *
+ * Like above, the executor needs information on attribute defaults. Once the
+ * repacking is finished, the catalog entries we create here are dropped.
+ */
+static void
+copy_attribute_defaults(Relation old_heap, Relation new_heap)
+{
+ Oid old_heap_id = RelationGetRelid(old_heap);
+ Oid new_heap_id = RelationGetRelid(new_heap);
+ ScanKeyData skey;
+ Relation rel;
+ Relation att_rel = NULL;
+ TupleDesc desc;
+ SysScanDesc scan;
+ HeapTuple tup;
+ ObjectAddress objrel;
+
+ rel = table_open(AttrDefaultRelationId, RowExclusiveLock);
+ ObjectAddressSet(objrel, RelationRelationId, new_heap_id);
+
+ ScanKeyInit(&skey,
+ Anum_pg_attrdef_adrelid,
+ BTEqualStrategyNumber, F_OIDEQ,
+ ObjectIdGetDatum(old_heap_id));
+ scan = systable_beginscan(rel, AttrDefaultIndexId, true,
+ NULL, 1, &skey);
+ desc = RelationGetDescr(rel);
+ while (HeapTupleIsValid(tup = systable_getnext(scan)))
+ {
+ Form_pg_attrdef adform;
+ Oid oid;
+ Datum values[Natts_pg_attrdef] = {0};
+ bool nulls[Natts_pg_attrdef] = {0};
+ bool replaces[Natts_pg_attrdef] = {0};
+ HeapTuple new_tup, att_tup, att_new_tup;
+ ObjectAddress objad;
+ Datum att_values[Natts_pg_attribute] = {0};
+ bool att_nulls[Natts_pg_attribute] = {0};
+ bool att_replaces[Natts_pg_attribute] = {0};
+
+ adform = (Form_pg_attrdef) GETSTRUCT(tup);
+ Assert(adform->adrelid == old_heap_id);
+
+ oid = GetNewOidWithIndex(rel, AttrDefaultOidIndexId,
+ Anum_pg_attrdef_oid);
+ values[Anum_pg_attrdef_oid - 1] = ObjectIdGetDatum(oid);
+ replaces[Anum_pg_attrdef_oid - 1] = true;
+ values[Anum_pg_attrdef_adrelid - 1] = ObjectIdGetDatum(new_heap_id);
+ replaces[Anum_pg_attrdef_adrelid - 1] = true;
+
+ new_tup = heap_modify_tuple(tup, desc, values, nulls, replaces);
+
+ /* Insert it into the catalog. */
+ CatalogTupleInsert(rel, new_tup);
+
+ /* Create a dependency so it's removed when we drop the new heap. */
+ ObjectAddressSet(objad, AttrDefaultRelationId, oid);
+ recordDependencyOn(&objad, &objrel, DEPENDENCY_AUTO);
+
+ /* Set atthasdef - new heap has it cleared. */
+ att_tup = SearchSysCache2(ATTNUM,
+ ObjectIdGetDatum(new_heap_id),
+ ObjectIdGetDatum(adform->adnum));
+ if (!HeapTupleIsValid(att_tup))
+ elog(ERROR, "cache lookup failed for attribute %d of relation %u",
+ adform->adnum, new_heap_id);
+
+ att_values[Anum_pg_attribute_atthasdef - 1] = BoolGetDatum(true);
+ att_replaces[Anum_pg_attribute_atthasdef - 1] = true;
+
+ if (att_rel == NULL)
+ att_rel = table_open(AttributeRelationId, RowExclusiveLock);
+ att_new_tup = heap_modify_tuple(att_tup, RelationGetDescr(att_rel),
+ att_values, att_nulls, att_replaces);
+ ReleaseSysCache(att_tup);
+ CatalogTupleUpdate(att_rel, &att_new_tup->t_self, att_new_tup);
+ }
+ systable_endscan(scan);
+
+ table_close(rel, RowExclusiveLock);
+ if (att_rel)
+ table_close(att_rel, RowExclusiveLock);
+
+ CommandCounterIncrement();
+}
+
/*
* Try to start a background worker to perform logical decoding of data
* changes applied to relation while REPACK CONCURRENTLY is copying its
diff --git a/src/test/modules/injection_points/specs/repack.spec b/src/test/modules/injection_points/specs/repack.spec
index d727a9b056b..7896d1456ad 100644
--- a/src/test/modules/injection_points/specs/repack.spec
+++ b/src/test/modules/injection_points/specs/repack.spec
@@ -3,7 +3,8 @@ setup
{
CREATE EXTENSION injection_points;
- CREATE TABLE repack_test(i int PRIMARY KEY, j int);
+ CREATE TABLE repack_test(i int PRIMARY KEY, j int,
+ k int GENERATED ALWAYS AS (j * 2) STORED);
INSERT INTO repack_test(i, j) VALUES (1, 1), (2, 2), (3, 3), (4, 4);
CREATE TABLE relfilenodes(node oid);
--
2.52.0
--=-=-=--
^ permalink raw reply [nested|flat] 5+ messages in thread
* [PATCH] Copy the relevant pg_attrdef catalog entries for the transient relation.
@ 2026-06-22 07:34 Antonin Houska <[email protected]>
0 siblings, 0 replies; 5+ messages in thread
From: Antonin Houska @ 2026-06-22 07:34 UTC (permalink / raw)
The default values may be needed by the executor when processing the
concurrent data changes. In particular, ExecInsertIndexTuples() needs it when
determining the value of the 'indexUnchanged' hint for the index AM.
Like in copy_index_constraints(), we make the new catalog entries dependent on
the transient relation, so they are dropped along with it automatically.
---
src/backend/commands/repack.c | 97 +++++++++++++++++++
.../injection_points/specs/repack.spec | 3 +-
2 files changed, 99 insertions(+), 1 deletion(-)
diff --git a/src/backend/commands/repack.c b/src/backend/commands/repack.c
index 4d177c868bb..725efa236bc 100644
--- a/src/backend/commands/repack.c
+++ b/src/backend/commands/repack.c
@@ -48,6 +48,7 @@
#include "catalog/namespace.h"
#include "catalog/objectaccess.h"
#include "catalog/pg_am.h"
+#include "catalog/pg_attrdef.h"
#include "catalog/pg_constraint.h"
#include "catalog/pg_inherits.h"
#include "catalog/toasting.h"
@@ -204,6 +205,7 @@ static void rebuild_relation_finish_concurrent(Relation NewHeap, Relation OldHea
static List *build_new_indexes(Relation NewHeap, Relation OldHeap, List *OldIndexes);
static void copy_index_constraints(Relation old_index, Oid new_index_id,
Oid new_heap_id);
+static void copy_attribute_defaults(Relation old_heap, Relation new_heap);
static Relation process_single_relation(RepackStmt *stmt,
LOCKMODE lockmode,
bool isTopLevel,
@@ -1083,6 +1085,13 @@ rebuild_relation(Relation OldHeap, Relation index, bool verbose,
Assert(CheckRelationOidLockedByMe(OIDNewHeap, AccessExclusiveLock, false));
NewHeap = table_open(OIDNewHeap, NoLock);
+ /*
+ * Copy attribute defaults - the executor may need them, in order to
+ * process the concurrent data changes. In particular, this is related to
+ * ExecInsertIndexTuples().
+ */
+ copy_attribute_defaults(OldHeap, NewHeap);
+
/* Copy the heap data into the new table in the desired order */
copy_table_data(NewHeap, OldHeap, index, snapshot, verbose,
&swap_toast_by_content, &frozenXid, &cutoffMulti);
@@ -3434,6 +3443,94 @@ copy_index_constraints(Relation old_index, Oid new_index_id, Oid new_heap_id)
CommandCounterIncrement();
}
+/*
+ * Create a transient copy of attribute defaults for the transient table.
+ *
+ * Like above, the executor needs information on attribute defaults. Once the
+ * repacking is finished, the catalog entries we create here are dropped.
+ */
+static void
+copy_attribute_defaults(Relation old_heap, Relation new_heap)
+{
+ Oid old_heap_id = RelationGetRelid(old_heap);
+ Oid new_heap_id = RelationGetRelid(new_heap);
+ ScanKeyData skey;
+ Relation rel;
+ Relation att_rel = NULL;
+ TupleDesc desc;
+ SysScanDesc scan;
+ HeapTuple tup;
+ ObjectAddress objrel;
+
+ rel = table_open(AttrDefaultRelationId, RowExclusiveLock);
+ ObjectAddressSet(objrel, RelationRelationId, new_heap_id);
+
+ ScanKeyInit(&skey,
+ Anum_pg_attrdef_adrelid,
+ BTEqualStrategyNumber, F_OIDEQ,
+ ObjectIdGetDatum(old_heap_id));
+ scan = systable_beginscan(rel, AttrDefaultIndexId, true,
+ NULL, 1, &skey);
+ desc = RelationGetDescr(rel);
+ while (HeapTupleIsValid(tup = systable_getnext(scan)))
+ {
+ Form_pg_attrdef adform;
+ Oid oid;
+ Datum values[Natts_pg_attrdef] = {0};
+ bool nulls[Natts_pg_attrdef] = {0};
+ bool replaces[Natts_pg_attrdef] = {0};
+ HeapTuple new_tup, att_tup, att_new_tup;
+ ObjectAddress objad;
+ Datum att_values[Natts_pg_attribute] = {0};
+ bool att_nulls[Natts_pg_attribute] = {0};
+ bool att_replaces[Natts_pg_attribute] = {0};
+
+ adform = (Form_pg_attrdef) GETSTRUCT(tup);
+ Assert(adform->adrelid == old_heap_id);
+
+ oid = GetNewOidWithIndex(rel, AttrDefaultOidIndexId,
+ Anum_pg_attrdef_oid);
+ values[Anum_pg_attrdef_oid - 1] = ObjectIdGetDatum(oid);
+ replaces[Anum_pg_attrdef_oid - 1] = true;
+ values[Anum_pg_attrdef_adrelid - 1] = ObjectIdGetDatum(new_heap_id);
+ replaces[Anum_pg_attrdef_adrelid - 1] = true;
+
+ new_tup = heap_modify_tuple(tup, desc, values, nulls, replaces);
+
+ /* Insert it into the catalog. */
+ CatalogTupleInsert(rel, new_tup);
+
+ /* Create a dependency so it's removed when we drop the new heap. */
+ ObjectAddressSet(objad, AttrDefaultRelationId, oid);
+ recordDependencyOn(&objad, &objrel, DEPENDENCY_AUTO);
+
+ /* Set atthasdef - new heap has it cleared. */
+ att_tup = SearchSysCache2(ATTNUM,
+ ObjectIdGetDatum(new_heap_id),
+ ObjectIdGetDatum(adform->adnum));
+ if (!HeapTupleIsValid(att_tup))
+ elog(ERROR, "cache lookup failed for attribute %d of relation %u",
+ adform->adnum, new_heap_id);
+
+ att_values[Anum_pg_attribute_atthasdef - 1] = BoolGetDatum(true);
+ att_replaces[Anum_pg_attribute_atthasdef - 1] = true;
+
+ if (att_rel == NULL)
+ att_rel = table_open(AttributeRelationId, RowExclusiveLock);
+ att_new_tup = heap_modify_tuple(att_tup, RelationGetDescr(att_rel),
+ att_values, att_nulls, att_replaces);
+ ReleaseSysCache(att_tup);
+ CatalogTupleUpdate(att_rel, &att_new_tup->t_self, att_new_tup);
+ }
+ systable_endscan(scan);
+
+ table_close(rel, RowExclusiveLock);
+ if (att_rel)
+ table_close(att_rel, RowExclusiveLock);
+
+ CommandCounterIncrement();
+}
+
/*
* Try to start a background worker to perform logical decoding of data
* changes applied to relation while REPACK CONCURRENTLY is copying its
diff --git a/src/test/modules/injection_points/specs/repack.spec b/src/test/modules/injection_points/specs/repack.spec
index d727a9b056b..7896d1456ad 100644
--- a/src/test/modules/injection_points/specs/repack.spec
+++ b/src/test/modules/injection_points/specs/repack.spec
@@ -3,7 +3,8 @@ setup
{
CREATE EXTENSION injection_points;
- CREATE TABLE repack_test(i int PRIMARY KEY, j int);
+ CREATE TABLE repack_test(i int PRIMARY KEY, j int,
+ k int GENERATED ALWAYS AS (j * 2) STORED);
INSERT INTO repack_test(i, j) VALUES (1, 1), (2, 2), (3, 3), (4, 4);
CREATE TABLE relfilenodes(node oid);
--
2.52.0
--=-=-=--
^ permalink raw reply [nested|flat] 5+ messages in thread
end of thread, other threads:[~2026-06-22 07:34 UTC | newest]
Thread overview: 5+ messages (download: mbox mbox.gz follow: Atom feed)
-- links below jump to the message on this page --
2026-03-31 16:55 [PATCH v51 02/10] Rename cluster.c/h -> repack.c/h Álvaro Herrera <[email protected]>
2026-06-22 07:34 [PATCH] Copy the relevant pg_attrdef catalog entries for the transient relation. Antonin Houska <[email protected]>
2026-06-22 07:34 [PATCH] Copy the relevant pg_attrdef catalog entries for the transient relation. Antonin Houska <[email protected]>
2026-06-22 07:34 [PATCH] Copy the relevant pg_attrdef catalog entries for the transient relation. Antonin Houska <[email protected]>
2026-06-22 07:34 [PATCH] Copy the relevant pg_attrdef catalog entries for the transient relation. 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