=== Applying patches on top of PostgreSQL commit ID 6678b58d7810b7471f00af66423aecb08f87a32a ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Mon Jun 15 19:25:23 UTC 2026
On branch cf/5777
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v1-0001-Fix-reltuples-stats-after-VACUUM-FULL-and-CLUSTER.patch ===
Applying: Fix reltuples stats after VACUUM FULL and CLUSTER
.git/rebase-apply/patch:164: trailing whitespace.
step s2_update       { UPDATE stats SET a = 1 WHERE a > 6; } 
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
A	src/backend/commands/cluster.c
M	src/include/access/tableam.h
M	src/test/isolation/isolation_schedule
Falling back to patching base and 3-way merge...
Auto-merging src/test/isolation/isolation_schedule
Auto-merging src/include/access/tableam.h
CONFLICT (modify/delete): src/backend/commands/cluster.c deleted in HEAD and modified in Fix reltuples stats after VACUUM FULL and CLUSTER. Version Fix reltuples stats after VACUUM FULL and CLUSTER of src/backend/commands/cluster.c left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix reltuples stats after VACUUM FULL and CLUSTER
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
=== using patch(1) to apply patch ./v1-0001-Fix-reltuples-stats-after-VACUUM-FULL-and-CLUSTER.patch ===
can't find file to patch at input line 33
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|From 1a5814f794c71d6a6c0b100e71289dece7136a89 Mon Sep 17 00:00:00 2001
|From: =?UTF-8?q?Erik=20Nordstr=C3=B6m?= <erik.nordstrom@gmail.com>
|Date: Fri, 23 May 2025 14:54:56 +0200
|Subject: [PATCH v1] Fix reltuples stats after VACUUM FULL and CLUSTER
|
|The tableam API's function for clustering a table, used by both
|CLUSTER and VACUUM FULL, returns the number of non-removable tuples in
|a num_tuples variable. This number includes dead tuples that cannot be
|removed because they are still visible to concurrent
|transactions. Previously, num_tuples was used to update
|pg_class.reltuples, but this could lead to widely misleading numbers
|if many tuples had been deleted or updated concurrently with ongoing
|transactions. The fix is to not include the recently dead tuples.
|
|It should be noted that this issue only occurred on tables that didn't
|have any indexes, since the reindexing that happens as part of the
|cluster code also updates reltuples, but using the more accurate
|number based on currently visible tuples.
|---
| src/backend/commands/cluster.c                |  2 +-
| src/include/access/tableam.h                  |  1 +
| .../isolation/expected/vacuum-full-stats.out  | 72 +++++++++++++++++++
| src/test/isolation/isolation_schedule         |  1 +
| .../isolation/specs/vacuum-full-stats.spec    | 42 +++++++++++
| 5 files changed, 117 insertions(+), 1 deletion(-)
| create mode 100644 src/test/isolation/expected/vacuum-full-stats.out
| create mode 100644 src/test/isolation/specs/vacuum-full-stats.spec
|
|diff --git a/src/backend/commands/cluster.c b/src/backend/commands/cluster.c
|index 54a08e4102e..74e445d9a67 100644
|--- a/src/backend/commands/cluster.c
|+++ b/src/backend/commands/cluster.c
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
patching file src/include/access/tableam.h
Hunk #1 succeeded at 1739 (offset 108 lines).
patching file src/test/isolation/expected/vacuum-full-stats.out
patching file src/test/isolation/isolation_schedule
Hunk #1 succeeded at 101 (offset 6 lines).
patching file src/test/isolation/specs/vacuum-full-stats.spec
Unstaged changes after reset:
M	src/include/access/tableam.h
M	src/test/isolation/isolation_schedule
Removing src/test/isolation/expected/vacuum-full-stats.out
Removing src/test/isolation/specs/vacuum-full-stats.spec
=== using 'git apply' to apply patch ./v1-0001-Fix-reltuples-stats-after-VACUUM-FULL-and-CLUSTER.patch ===
/work/patches/./v1-0001-Fix-reltuples-stats-after-VACUUM-FULL-and-CLUSTER.patch:182: trailing whitespace.
step s2_update       { UPDATE stats SET a = 1 WHERE a > 6; } 
error: src/backend/commands/cluster.c: does not exist in index
Applied patch to 'src/include/access/tableam.h' cleanly.
Falling back to direct application...
Applied patch to 'src/test/isolation/isolation_schedule' cleanly.
Falling back to direct application...