=== Applying patches on top of PostgreSQL commit ID c5d34f4a550f26583a0b92e294eff7d001e318d3 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Sat Nov 8 02:38:20 UTC 2025 On branch cf/6167 nothing to commit, working tree clean === using 'git am' to apply patch ./v5-0001-pg_stat_statements-Fix-handling-of-duplicate-cons.patch === Applying: pg_stat_statements: Fix handling of duplicate constant locations Using index info to reconstruct a base tree... M contrib/pg_stat_statements/expected/squashing.out M contrib/pg_stat_statements/pg_stat_statements.c M contrib/pg_stat_statements/sql/squashing.sql Falling back to patching base and 3-way merge... Auto-merging contrib/pg_stat_statements/pg_stat_statements.c CONFLICT (content): Merge conflict in contrib/pg_stat_statements/pg_stat_statements.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 pg_stat_statements: Fix handling of duplicate constant locations 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". Unstaged changes after reset: M contrib/pg_stat_statements/pg_stat_statements.c === using patch(1) to apply patch ./v5-0001-pg_stat_statements-Fix-handling-of-duplicate-cons.patch === patching file contrib/pg_stat_statements/expected/squashing.out Hunk #1 succeeded at 887 with fuzz 2 (offset 78 lines). Hunk #2 FAILED at 896. 1 out of 2 hunks FAILED -- saving rejects to file contrib/pg_stat_statements/expected/squashing.out.rej patching file contrib/pg_stat_statements/pg_stat_statements.c Hunk #1 FAILED at 2954. Hunk #2 FAILED at 2976. Hunk #3 FAILED at 2998. Hunk #4 FAILED at 3060. 4 out of 4 hunks FAILED -- saving rejects to file contrib/pg_stat_statements/pg_stat_statements.c.rej patching file contrib/pg_stat_statements/sql/squashing.sql Hunk #1 succeeded at 315 with fuzz 1 (offset 24 lines). Hunk #2 FAILED at 324. 1 out of 2 hunks FAILED -- saving rejects to file contrib/pg_stat_statements/sql/squashing.sql.rej Unstaged changes after reset: M contrib/pg_stat_statements/expected/squashing.out M contrib/pg_stat_statements/sql/squashing.sql Removing contrib/pg_stat_statements/expected/squashing.out.rej Removing contrib/pg_stat_statements/pg_stat_statements.c.rej Removing contrib/pg_stat_statements/sql/squashing.sql.rej === using 'git apply' to apply patch ./v5-0001-pg_stat_statements-Fix-handling-of-duplicate-cons.patch === Applied patch to 'contrib/pg_stat_statements/expected/squashing.out' cleanly. Applied patch to 'contrib/pg_stat_statements/pg_stat_statements.c' with conflicts. Applied patch to 'contrib/pg_stat_statements/sql/squashing.sql' cleanly. U contrib/pg_stat_statements/pg_stat_statements.c diff --cc contrib/pg_stat_statements/pg_stat_statements.c index 39208f80b5b,06a1de97c61..00000000000 --- a/contrib/pg_stat_statements/pg_stat_statements.c +++ b/contrib/pg_stat_statements/pg_stat_statements.c @@@ -3001,7 -3001,7 +3001,11 @@@ fill_in_constant_lengths(JumbleState *j int tok; /* Ignore constants after the first one in the same location */ ++<<<<<<< ours + if (i > 0 && locs[i].location == locs[i - 1].location) ++======= + if (i > 0 && loc == locs[i - 1].location) ++>>>>>>> theirs { locs[i].length = -1; continue; @@@ -3011,12 -3011,12 +3015,21 @@@ continue; /* squashable list, ignore */ /* Adjust recorded location if we're dealing with partial string */ ++<<<<<<< ours + loc = locs[i].location - query_loc; + Assert(loc >= 0); + + /* + * We have a valid location for a constant that's not a dupe. Lex + * tokens until we find the desired constant. ++======= + loc -= query_loc; + Assert(loc >= 0); + + /* + * We have a valid location for a constant that's not a dupe, let's + * save it. Lex tokens until we find the desired constant. ++>>>>>>> theirs */ for (;;) {