diff options
| -rw-r--r-- | src/backend/commands/tablecmds.c | 15 | ||||
| -rw-r--r-- | src/test/regress/expected/stats.out | 4 | ||||
| -rw-r--r-- | src/test/regress/sql/stats.sql | 4 |
3 files changed, 13 insertions, 10 deletions
diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c index 8e854279d2a..d6d0de1b01b 100644 --- a/src/backend/commands/tablecmds.c +++ b/src/backend/commands/tablecmds.c @@ -1591,19 +1591,22 @@ ExecuteTruncateGuts(List *explicit_rels, List *relids, List *relids_logged, heap_create_init_fork(rel); heap_relid = RelationGetRelid(rel); - toast_relid = rel->rd_rel->reltoastrelid; /* * The same for the toast table, if any. */ + toast_relid = rel->rd_rel->reltoastrelid; if (OidIsValid(toast_relid)) { - rel = relation_open(toast_relid, AccessExclusiveLock); - RelationSetNewRelfilenode(rel, rel->rd_rel->relpersistence, + Relation toastrel = relation_open(toast_relid, + AccessExclusiveLock); + + RelationSetNewRelfilenode(toastrel, + toastrel->rd_rel->relpersistence, RecentXmin, minmulti); - if (rel->rd_rel->relpersistence == RELPERSISTENCE_UNLOGGED) - heap_create_init_fork(rel); - heap_close(rel, NoLock); + if (toastrel->rd_rel->relpersistence == RELPERSISTENCE_UNLOGGED) + heap_create_init_fork(toastrel); + heap_close(toastrel, NoLock); } /* diff --git a/src/test/regress/expected/stats.out b/src/test/regress/expected/stats.out index 991c287b114..b01e58b98cb 100644 --- a/src/test/regress/expected/stats.out +++ b/src/test/regress/expected/stats.out @@ -79,9 +79,9 @@ end $$ language plpgsql; -- test effects of TRUNCATE on n_live_tup/n_dead_tup counters CREATE TABLE trunc_stats_test(id serial); -CREATE TABLE trunc_stats_test1(id serial); +CREATE TABLE trunc_stats_test1(id serial, stuff text); CREATE TABLE trunc_stats_test2(id serial); -CREATE TABLE trunc_stats_test3(id serial); +CREATE TABLE trunc_stats_test3(id serial, stuff text); CREATE TABLE trunc_stats_test4(id serial); -- check that n_live_tup is reset to 0 after truncate INSERT INTO trunc_stats_test DEFAULT VALUES; diff --git a/src/test/regress/sql/stats.sql b/src/test/regress/sql/stats.sql index 2be7dde8346..feaaee6326e 100644 --- a/src/test/regress/sql/stats.sql +++ b/src/test/regress/sql/stats.sql @@ -79,9 +79,9 @@ $$ language plpgsql; -- test effects of TRUNCATE on n_live_tup/n_dead_tup counters CREATE TABLE trunc_stats_test(id serial); -CREATE TABLE trunc_stats_test1(id serial); +CREATE TABLE trunc_stats_test1(id serial, stuff text); CREATE TABLE trunc_stats_test2(id serial); -CREATE TABLE trunc_stats_test3(id serial); +CREATE TABLE trunc_stats_test3(id serial, stuff text); CREATE TABLE trunc_stats_test4(id serial); -- check that n_live_tup is reset to 0 after truncate |