=== Applying patches on top of PostgreSQL commit ID 5174d157a0381876cb1c6c5903c1844669d5bbc2 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Wed Jul 15 23:11:26 UTC 2026 On branch cf/6675 nothing to commit, working tree clean === using 'git am' to apply patch ./v3-0001-Introduce-bms_offset_members-function.patch === Applying: Introduce bms_offset_members() function Using index info to reconstruct a base tree... M src/backend/nodes/bitmapset.c M src/backend/optimizer/plan/setrefs.c M src/backend/optimizer/prep/prepjointree.c M src/backend/rewrite/rewriteManip.c M src/backend/statistics/extended_stats.c M src/include/nodes/bitmapset.h M src/test/modules/test_bitmapset/expected/test_bitmapset.out M src/test/modules/test_bitmapset/sql/test_bitmapset.sql M src/test/modules/test_bitmapset/test_bitmapset--1.0.sql M src/test/modules/test_bitmapset/test_bitmapset.c Falling back to patching base and 3-way merge... Auto-merging src/test/modules/test_bitmapset/test_bitmapset.c CONFLICT (content): Merge conflict in src/test/modules/test_bitmapset/test_bitmapset.c Auto-merging src/test/modules/test_bitmapset/sql/test_bitmapset.sql CONFLICT (content): Merge conflict in src/test/modules/test_bitmapset/sql/test_bitmapset.sql Auto-merging src/test/modules/test_bitmapset/expected/test_bitmapset.out CONFLICT (content): Merge conflict in src/test/modules/test_bitmapset/expected/test_bitmapset.out Auto-merging src/backend/rewrite/rewriteManip.c Auto-merging src/backend/optimizer/prep/prepjointree.c Auto-merging src/backend/optimizer/plan/setrefs.c Auto-merging src/backend/nodes/bitmapset.c CONFLICT (content): Merge conflict in src/backend/nodes/bitmapset.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 Introduce bms_offset_members() function 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 ./v3-0001-Introduce-bms_offset_members-function.patch === patching file src/backend/nodes/bitmapset.c Hunk #1 FAILED at 39. Hunk #2 succeeded at 540 (offset 135 lines). 1 out of 2 hunks FAILED -- saving rejects to file src/backend/nodes/bitmapset.c.rej patching file src/backend/optimizer/plan/setrefs.c Hunk #1 FAILED at 2057. 1 out of 1 hunk FAILED -- saving rejects to file src/backend/optimizer/plan/setrefs.c.rej patching file src/backend/optimizer/prep/prepjointree.c Hunk #1 FAILED at 3731. Hunk #2 FAILED at 3751. 2 out of 2 hunks FAILED -- saving rejects to file src/backend/optimizer/prep/prepjointree.c.rej patching file src/backend/rewrite/rewriteManip.c Hunk #1 FAILED at 64. Hunk #2 FAILED at 397. Hunk #3 FAILED at 435. Hunk #4 FAILED at 524. 4 out of 4 hunks FAILED -- saving rejects to file src/backend/rewrite/rewriteManip.c.rej patching file src/backend/statistics/extended_stats.c Hunk #1 FAILED at 1673. Hunk #2 FAILED at 1685. 2 out of 2 hunks FAILED -- saving rejects to file src/backend/statistics/extended_stats.c.rej patching file src/include/nodes/bitmapset.h Hunk #1 FAILED at 100. 1 out of 1 hunk FAILED -- saving rejects to file src/include/nodes/bitmapset.h.rej patching file src/test/modules/test_bitmapset/expected/test_bitmapset.out Hunk #1 succeeded at 602 (offset 74 lines). Hunk #2 succeeded at 1730 with fuzz 1 (offset 81 lines). patching file src/test/modules/test_bitmapset/sql/test_bitmapset.sql Hunk #1 succeeded at 165 with fuzz 2 (offset 20 lines). Hunk #2 succeeded at 446 with fuzz 2 (offset 23 lines). patching file src/test/modules/test_bitmapset/test_bitmapset--1.0.sql Hunk #1 succeeded at 60 (offset 4 lines). Hunk #2 succeeded at 149 (offset 8 lines). patching file src/test/modules/test_bitmapset/test_bitmapset.c Hunk #1 FAILED at 44. Hunk #2 FAILED at 66. Hunk #3 succeeded at 309 with fuzz 1 (offset 13 lines). Hunk #4 FAILED at 592. Hunk #5 succeeded at 876 with fuzz 2 (offset 99 lines). 3 out of 5 hunks FAILED -- saving rejects to file src/test/modules/test_bitmapset/test_bitmapset.c.rej Unstaged changes after reset: M src/backend/nodes/bitmapset.c M src/test/modules/test_bitmapset/expected/test_bitmapset.out M src/test/modules/test_bitmapset/sql/test_bitmapset.sql M src/test/modules/test_bitmapset/test_bitmapset--1.0.sql M src/test/modules/test_bitmapset/test_bitmapset.c Removing src/backend/nodes/bitmapset.c.rej Removing src/backend/optimizer/plan/setrefs.c.rej Removing src/backend/optimizer/prep/prepjointree.c.rej Removing src/backend/rewrite/rewriteManip.c.rej Removing src/backend/statistics/extended_stats.c.rej Removing src/include/nodes/bitmapset.h.rej Removing src/test/modules/test_bitmapset/test_bitmapset.c.rej === using 'git apply' to apply patch ./v3-0001-Introduce-bms_offset_members-function.patch === Applied patch to 'src/backend/nodes/bitmapset.c' with conflicts. Applied patch to 'src/backend/optimizer/plan/setrefs.c' cleanly. Applied patch to 'src/backend/optimizer/prep/prepjointree.c' cleanly. Applied patch to 'src/backend/rewrite/rewriteManip.c' cleanly. Applied patch to 'src/backend/statistics/extended_stats.c' cleanly. Applied patch to 'src/include/nodes/bitmapset.h' cleanly. Applied patch to 'src/test/modules/test_bitmapset/expected/test_bitmapset.out' with conflicts. Applied patch to 'src/test/modules/test_bitmapset/sql/test_bitmapset.sql' with conflicts. Applied patch to 'src/test/modules/test_bitmapset/test_bitmapset--1.0.sql' cleanly. Applied patch to 'src/test/modules/test_bitmapset/test_bitmapset.c' with conflicts. U src/backend/nodes/bitmapset.c U src/test/modules/test_bitmapset/expected/test_bitmapset.out U src/test/modules/test_bitmapset/sql/test_bitmapset.sql U src/test/modules/test_bitmapset/test_bitmapset.c diff --cc src/backend/nodes/bitmapset.c index 26f457a3509,9cb4e252b2c..00000000000 --- a/src/backend/nodes/bitmapset.c +++ b/src/backend/nodes/bitmapset.c @@@ -411,7 -411,7 +411,11 @@@ bms_difference(const Bitmapset *a, cons * Creates a new Bitmapset with all members of 'a' adjusted to add the * value of 'offset' to each member. * ++<<<<<<< ours + * Members that would become negative as a result of a negative offset will ++======= + * Members which would become negative as a result of a negative offset will ++>>>>>>> theirs * be removed from the set, whereas too large an offset, which would result in * a member going > INT_MAX, will result in an ERROR. */ @@@ -455,7 -455,7 +459,11 @@@ bms_offset_members(const Bitmapset *a, if (offset >= 0) { /* ++<<<<<<< ours + * We special-case offsetting only by whole words, so we don't have to ++======= + * We special-case offsetting only by whole words so we don't have to ++>>>>>>> theirs * special-case bitshifting by BITS_PER_BITMAPWORD places, which has * an undefined behavior. */ diff --cc src/test/modules/test_bitmapset/expected/test_bitmapset.out index 18ccf402742,0574b047844..00000000000 --- a/src/test/modules/test_bitmapset/expected/test_bitmapset.out +++ b/src/test/modules/test_bitmapset/expected/test_bitmapset.out @@@ -1650,10 -1650,10 +1650,17 @@@ SELECT test_random_operations(NULL, 100 (1 row) -- perform some random tests on bms_offset_members() ++<<<<<<< ours +SELECT test_random_offset_operations(NULL, 1000, 1024, 0) AS result; + result +-------- + 1000 ++======= + SELECT test_random_offset_operations(NULL, 10000, 1024, 0) AS result; + result + -------- + 10000 ++>>>>>>> theirs (1 row) DROP EXTENSION test_bitmapset; diff --cc src/test/modules/test_bitmapset/sql/test_bitmapset.sql index fd30b21f694,1d2916dcaa5..00000000000 --- a/src/test/modules/test_bitmapset/sql/test_bitmapset.sql +++ b/src/test/modules/test_bitmapset/sql/test_bitmapset.sql @@@ -424,6 -424,6 +424,10 @@@ SELECT test_bms_nonempty_difference('( SELECT test_random_operations(NULL, 10000, 81920, 0) > 0 AS result; -- perform some random tests on bms_offset_members() ++<<<<<<< ours +SELECT test_random_offset_operations(NULL, 1000, 1024, 0) AS result; ++======= + SELECT test_random_offset_operations(NULL, 10000, 1024, 0) AS result; ++>>>>>>> theirs DROP EXTENSION test_bitmapset; diff --cc src/test/modules/test_bitmapset/test_bitmapset.c index 0f366aadea0,950795ae611..00000000000 --- a/src/test/modules/test_bitmapset/test_bitmapset.c +++ b/src/test/modules/test_bitmapset/test_bitmapset.c @@@ -797,7 -797,7 +797,11 @@@ Datu test_random_offset_operations(PG_FUNCTION_ARGS) { pg_prng_state state; ++<<<<<<< ours + int64 seed; ++======= + uint64 seed; ++>>>>>>> theirs int num_ops; int max_range; int min_value; @@@ -819,7 -819,7 +823,11 @@@ if (PG_ARGISNULL(3) || min_value < 0) elog(ERROR, "invalid minimum value"); ++<<<<<<< ours + pg_prng_seed(&state, (uint64) seed); ++======= + pg_prng_seed(&state, seed); ++>>>>>>> theirs for (int op = 0; op < num_ops; op++) {