=== Applying patches on top of PostgreSQL commit ID 8be38b238a61d58b6c0f21d4c1d8e9c1d26d8b58 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Thu Sep 24 18:27:29 UTC 2026 On branch cf/6393 nothing to commit, working tree clean === using 'git am' to apply patch ./v7-0001-Avoid-unnecessary-type-casting-when-using-hash_an.patch === Applying: Avoid unnecessary type casting when using hash_any() / hash_any_extended() Using index info to reconstruct a base tree... M contrib/ltree/ltree_op.c M src/backend/access/tablesample/bernoulli.c M src/backend/access/tablesample/system.c M src/backend/commands/async.c M src/backend/lib/bloomfilter.c M src/backend/lib/hyperloglog.c M src/backend/nodes/bitmapset.c M src/backend/nodes/queryjumblefuncs.c M src/backend/tsearch/ts_typanalyze.c M src/backend/utils/adt/bytea.c M src/backend/utils/adt/jsonb_gin.c M src/backend/utils/adt/jsonb_util.c M src/backend/utils/adt/numeric.c M src/backend/utils/adt/varlena.c M src/backend/utils/cache/funccache.c Falling back to patching base and 3-way merge... Auto-merging src/backend/utils/adt/numeric.c CONFLICT (content): Merge conflict in src/backend/utils/adt/numeric.c Auto-merging src/backend/tsearch/ts_typanalyze.c CONFLICT (content): Merge conflict in src/backend/tsearch/ts_typanalyze.c Auto-merging src/backend/commands/async.c CONFLICT (content): Merge conflict in src/backend/commands/async.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 Avoid unnecessary type casting when using hash_any() / hash_any_extended() 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 ./v7-0001-Avoid-unnecessary-type-casting-when-using-hash_an.patch === patching file contrib/ltree/ltree_op.c Hunk #1 FAILED at 181. Hunk #2 FAILED at 224. 2 out of 2 hunks FAILED -- saving rejects to file contrib/ltree/ltree_op.c.rej patching file src/backend/access/tablesample/bernoulli.c Hunk #1 FAILED at 214. 1 out of 1 hunk FAILED -- saving rejects to file src/backend/access/tablesample/bernoulli.c.rej patching file src/backend/access/tablesample/system.c Hunk #1 FAILED at 202. 1 out of 1 hunk FAILED -- saving rejects to file src/backend/access/tablesample/system.c.rej patching file src/backend/commands/async.c Hunk #1 FAILED at 674. Hunk #2 FAILED at 3251. 2 out of 2 hunks FAILED -- saving rejects to file src/backend/commands/async.c.rej patching file src/backend/lib/bloomfilter.c Hunk #1 FAILED at 256. 1 out of 1 hunk FAILED -- saving rejects to file src/backend/lib/bloomfilter.c.rej patching file src/backend/lib/hyperloglog.c Hunk #1 FAILED at 158. 1 out of 1 hunk FAILED -- saving rejects to file src/backend/lib/hyperloglog.c.rej patching file src/backend/nodes/bitmapset.c Hunk #1 FAILED at 1546. 1 out of 1 hunk FAILED -- saving rejects to file src/backend/nodes/bitmapset.c.rej patching file src/backend/nodes/queryjumblefuncs.c Hunk #1 FAILED at 221. Hunk #2 FAILED at 271. 2 out of 2 hunks FAILED -- saving rejects to file src/backend/nodes/queryjumblefuncs.c.rej patching file src/backend/tsearch/ts_typanalyze.c Hunk #1 FAILED at 496. 1 out of 1 hunk FAILED -- saving rejects to file src/backend/tsearch/ts_typanalyze.c.rej patching file src/backend/utils/adt/bytea.c Hunk #1 FAILED at 1106. 1 out of 1 hunk FAILED -- saving rejects to file src/backend/utils/adt/bytea.c.rej patching file src/backend/utils/adt/jsonb_gin.c Hunk #1 FAILED at 1333. 1 out of 1 hunk FAILED -- saving rejects to file src/backend/utils/adt/jsonb_gin.c.rej patching file src/backend/utils/adt/jsonb_util.c Hunk #1 FAILED at 1451. Hunk #2 FAILED at 1494. 2 out of 2 hunks FAILED -- saving rejects to file src/backend/utils/adt/jsonb_util.c.rej patching file src/backend/utils/adt/numeric.c Hunk #1 FAILED at 2717. Hunk #2 FAILED at 2780. Hunk #3 FAILED at 2798. Hunk #4 FAILED at 2840. 4 out of 4 hunks FAILED -- saving rejects to file src/backend/utils/adt/numeric.c.rej patching file src/backend/utils/adt/varlena.c Hunk #1 FAILED at 2154. 1 out of 1 hunk FAILED -- saving rejects to file src/backend/utils/adt/varlena.c.rej patching file src/backend/utils/cache/funccache.c Hunk #1 FAILED at 89. 1 out of 1 hunk FAILED -- saving rejects to file src/backend/utils/cache/funccache.c.rej Removing contrib/ltree/ltree_op.c.rej Removing src/backend/access/tablesample/bernoulli.c.rej Removing src/backend/access/tablesample/system.c.rej Removing src/backend/commands/async.c.rej Removing src/backend/lib/bloomfilter.c.rej Removing src/backend/lib/hyperloglog.c.rej Removing src/backend/nodes/bitmapset.c.rej Removing src/backend/nodes/queryjumblefuncs.c.rej Removing src/backend/tsearch/ts_typanalyze.c.rej Removing src/backend/utils/adt/bytea.c.rej Removing src/backend/utils/adt/jsonb_gin.c.rej Removing src/backend/utils/adt/jsonb_util.c.rej Removing src/backend/utils/adt/numeric.c.rej Removing src/backend/utils/adt/varlena.c.rej Removing src/backend/utils/cache/funccache.c.rej === using 'git apply' to apply patch ./v7-0001-Avoid-unnecessary-type-casting-when-using-hash_an.patch === Applied patch to 'contrib/ltree/ltree_op.c' cleanly. Applied patch to 'src/backend/access/tablesample/bernoulli.c' cleanly. Applied patch to 'src/backend/access/tablesample/system.c' cleanly. Applied patch to 'src/backend/commands/async.c' with conflicts. Applied patch to 'src/backend/lib/bloomfilter.c' cleanly. Applied patch to 'src/backend/lib/hyperloglog.c' cleanly. Applied patch to 'src/backend/nodes/bitmapset.c' cleanly. Applied patch to 'src/backend/nodes/queryjumblefuncs.c' cleanly. Applied patch to 'src/backend/tsearch/ts_typanalyze.c' with conflicts. Applied patch to 'src/backend/utils/adt/bytea.c' cleanly. Applied patch to 'src/backend/utils/adt/jsonb_gin.c' cleanly. Applied patch to 'src/backend/utils/adt/jsonb_util.c' cleanly. Applied patch to 'src/backend/utils/adt/numeric.c' with conflicts. Applied patch to 'src/backend/utils/adt/varlena.c' cleanly. Applied patch to 'src/backend/utils/cache/funccache.c' cleanly. U src/backend/commands/async.c U src/backend/tsearch/ts_typanalyze.c U src/backend/utils/adt/numeric.c diff --cc src/backend/commands/async.c index e266fe64cc8,b24dd63b3fa..00000000000 --- a/src/backend/commands/async.c +++ b/src/backend/commands/async.c @@@ -674,7 -674,7 +674,11 @@@ globalChannelTableHash(const void *key const GlobalChannelKey *k = (const GlobalChannelKey *) key; dshash_hash h; ++<<<<<<< ours + h = DatumGetUInt32(hash_uint32(k->dboid)); ++======= + h = murmurhash32(k->dboid); ++>>>>>>> theirs h ^= hash_bytes((const unsigned char *) k->channel, strnlen(k->channel, NAMEDATALEN)); diff --cc src/backend/tsearch/ts_typanalyze.c index 2734e6e6240,6ca8ead3988..00000000000 --- a/src/backend/tsearch/ts_typanalyze.c +++ b/src/backend/tsearch/ts_typanalyze.c @@@ -496,7 -496,8 +496,12 @@@ lexeme_hash(const void *key, Size keysi { const LexemeHashKey *l = (const LexemeHashKey *) key; ++<<<<<<< ours + return hash_bytes((const unsigned char *) l->lexeme, l->length); ++======= + return hash_bytes((const unsigned char *) l->lexeme, + l->length); ++>>>>>>> theirs } /* diff --cc src/backend/utils/adt/numeric.c index 8b2575b63e3,65e6c677e59..00000000000 --- a/src/backend/utils/adt/numeric.c +++ b/src/backend/utils/adt/numeric.c @@@ -2780,8 -2780,7 +2780,12 @@@ hash_numeric(PG_FUNCTION_ARGS * this shouldn't affect correctness. */ hash_len = NUMERIC_NDIGITS(key) - start_offset - end_offset; ++<<<<<<< ours + digit_hash = hash_bytes((unsigned char *) (NUMERIC_DIGITS(key) + + start_offset), ++======= + digit_hash = hash_bytes((unsigned char *) (NUMERIC_DIGITS(key) + start_offset), ++>>>>>>> theirs hash_len * sizeof(NumericDigit)); /* Mix in the weight, via XOR */