=== Applying patches on top of PostgreSQL commit ID 9cfd19bc10ac07139ca6c6d051d4492764441edb === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Tue Jun 30 21:33:27 UTC 2026 On branch cf/6932 nothing to commit, working tree clean === using 'git am' to apply patch ./v2-0001-Improve-estimates-for-multicolumn-unique-indexes.patch === Applying: Improve estimates for multicolumn unique indexes Using index info to reconstruct a base tree... M src/backend/utils/adt/selfuncs.c M src/test/regress/expected/planner_est.out M src/test/regress/sql/planner_est.sql Falling back to patching base and 3-way merge... Auto-merging src/test/regress/sql/planner_est.sql CONFLICT (content): Merge conflict in src/test/regress/sql/planner_est.sql Auto-merging src/test/regress/expected/planner_est.out CONFLICT (content): Merge conflict in src/test/regress/expected/planner_est.out Auto-merging src/backend/utils/adt/selfuncs.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 Improve estimates for multicolumn unique indexes 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 ./v2-0001-Improve-estimates-for-multicolumn-unique-indexes.patch === patching file src/backend/optimizer/path/costsize.c patching file src/backend/optimizer/path/indxpath.c patching file src/backend/utils/adt/selfuncs.c Hunk #1 succeeded at 7727 (offset 8 lines). Hunk #2 succeeded at 8035 (offset 8 lines). Hunk #3 succeeded at 8133 (offset 8 lines). patching file src/include/optimizer/paths.h patching file src/test/regress/expected/planner_est.out Hunk #1 succeeded at 221 with fuzz 2 (offset 11 lines). patching file src/test/regress/sql/planner_est.sql Hunk #1 succeeded at 153 with fuzz 2 (offset 6 lines). [cf/6932 17e5af78d90] Improve estimates for multicolumn unique indexes Author: Chengpeng Yan Date: Sat Jun 27 12:48:23 2026 +0800 6 files changed, 268 insertions(+), 2 deletions(-)