=== Applying patches on top of PostgreSQL commit ID 7d7e58feef21e7781e8e99a960fae4d6d5a2a927 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Sun Apr 26 12:39:21 UTC 2026 On branch cf/6661 nothing to commit, working tree clean === using 'git am' to apply patch ./v1-0001-Shorten-pg_attribute_always_inline-to-pg_always_i.patch === Applying: Shorten pg_attribute_always_inline to pg_always_inline Using index info to reconstruct a base tree... M src/backend/access/transam/xlog.c M src/backend/commands/copyto.c M src/backend/executor/execExprInterp.c M src/backend/executor/execTuples.c M src/backend/storage/buffer/bufmgr.c M src/backend/utils/cache/catcache.c M src/include/c.h Falling back to patching base and 3-way merge... Auto-merging src/include/c.h Auto-merging src/backend/utils/cache/catcache.c Auto-merging src/backend/storage/buffer/bufmgr.c Auto-merging src/backend/executor/execTuples.c Auto-merging src/backend/executor/execExprInterp.c CONFLICT (content): Merge conflict in src/backend/executor/execExprInterp.c Auto-merging src/backend/commands/copyto.c Auto-merging src/backend/access/transam/xlog.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 Shorten pg_attribute_always_inline to pg_always_inline 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-Shorten-pg_attribute_always_inline-to-pg_always_i.patch === patching file src/include/c.h patching file src/include/executor/execScan.h patching file src/include/portability/instr_time.h patching file src/backend/access/heap/heapam.c patching file src/backend/access/transam/xlog.c patching file src/backend/commands/copyfromparse.c patching file src/backend/commands/copyto.c patching file src/backend/executor/execExprInterp.c Hunk #1 FAILED at 178. Hunk #2 succeeded at 2552 (offset 8 lines). Hunk #3 succeeded at 2590 (offset 8 lines). Hunk #4 succeeded at 2685 (offset 8 lines). Hunk #5 succeeded at 2728 (offset 8 lines). Hunk #6 succeeded at 2807 (offset 8 lines). Hunk #7 succeeded at 2845 (offset 8 lines). Hunk #8 succeeded at 5906 (offset 70 lines). Hunk #9 succeeded at 5938 (offset 70 lines). 1 out of 9 hunks FAILED -- saving rejects to file src/backend/executor/execExprInterp.c.rej patching file src/backend/executor/execTuples.c patching file src/backend/executor/nodeHashjoin.c patching file src/backend/executor/nodeSeqscan.c patching file src/backend/nodes/queryjumblefuncs.c patching file src/backend/storage/buffer/bufmgr.c patching file src/backend/utils/adt/json.c patching file src/backend/utils/cache/catcache.c Hunk #1 succeeded at 1091 (offset 11 lines). Unstaged changes after reset: M src/backend/access/heap/heapam.c M src/backend/access/transam/xlog.c M src/backend/commands/copyfromparse.c M src/backend/commands/copyto.c M src/backend/executor/execExprInterp.c M src/backend/executor/execTuples.c M src/backend/executor/nodeHashjoin.c M src/backend/executor/nodeSeqscan.c M src/backend/nodes/queryjumblefuncs.c M src/backend/storage/buffer/bufmgr.c M src/backend/utils/adt/json.c M src/backend/utils/cache/catcache.c M src/include/c.h M src/include/executor/execScan.h M src/include/portability/instr_time.h Removing src/backend/executor/execExprInterp.c.rej === using 'git apply' to apply patch ./v1-0001-Shorten-pg_attribute_always_inline-to-pg_always_i.patch === Applied patch to 'src/include/c.h' cleanly. Applied patch to 'src/include/executor/execScan.h' cleanly. Applied patch to 'src/include/portability/instr_time.h' cleanly. Applied patch to 'src/backend/access/heap/heapam.c' cleanly. Applied patch to 'src/backend/access/transam/xlog.c' cleanly. Applied patch to 'src/backend/commands/copyfromparse.c' cleanly. Applied patch to 'src/backend/commands/copyto.c' cleanly. Applied patch to 'src/backend/executor/execExprInterp.c' with conflicts. Applied patch to 'src/backend/executor/execTuples.c' cleanly. Applied patch to 'src/backend/executor/nodeHashjoin.c' cleanly. Applied patch to 'src/backend/executor/nodeSeqscan.c' cleanly. Applied patch to 'src/backend/nodes/queryjumblefuncs.c' cleanly. Applied patch to 'src/backend/storage/buffer/bufmgr.c' cleanly. Applied patch to 'src/backend/utils/adt/json.c' cleanly. Applied patch to 'src/backend/utils/cache/catcache.c' cleanly. U src/backend/executor/execExprInterp.c diff --cc src/backend/executor/execExprInterp.c index 0634af964a9,2bb0a3d1f63..00000000000 --- a/src/backend/executor/execExprInterp.c +++ b/src/backend/executor/execExprInterp.c @@@ -178,24 -178,16 +178,37 @@@ static Datum ExecJustHashInnerVarVirt(E static Datum ExecJustHashOuterVarStrict(ExprState *state, ExprContext *econtext, bool *isnull); /* execution helper functions */ ++<<<<<<< ours +static pg_attribute_always_inline void ExecEvalArrayCompareInternal(FunctionCallInfo fcinfo, + ArrayType *arr, + int16 typlen, + bool typbyval, + char typalign, + bool useOr, + Datum *result, + bool *resultnull); +static pg_attribute_always_inline void ExecAggPlainTransByVal(AggState *aggstate, + AggStatePerTrans pertrans, + AggStatePerGroup pergroup, + ExprContext *aggcontext, + int setno); +static pg_attribute_always_inline void ExecAggPlainTransByRef(AggState *aggstate, + AggStatePerTrans pertrans, + AggStatePerGroup pergroup, + ExprContext *aggcontext, + int setno); ++======= + static pg_always_inline void ExecAggPlainTransByVal(AggState *aggstate, + AggStatePerTrans pertrans, + AggStatePerGroup pergroup, + ExprContext *aggcontext, + int setno); + static pg_always_inline void ExecAggPlainTransByRef(AggState *aggstate, + AggStatePerTrans pertrans, + AggStatePerGroup pergroup, + ExprContext *aggcontext, + int setno); ++>>>>>>> theirs static char *ExecGetJsonValueItemString(JsonbValue *item, bool *resnull); /*