=== Applying patches on top of PostgreSQL commit ID 972c14fb9134fdfd76ea6ebcf98a55a945bbc988 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Wed Apr 15 10:40:29 UTC 2026
On branch cf/5382
nothing to commit, working tree clean
=== using 'git am' to apply patch ./0001-Add-transparent-compression-for-temporary-files.patch ===
Applying: Add transparent compression for temporary files
Using index info to reconstruct a base tree...
M	doc/src/sgml/config.sgml
M	src/backend/executor/nodeHashjoin.c
M	src/backend/storage/file/buffile.c
M	src/backend/utils/misc/guc_parameters.dat
M	src/backend/utils/misc/guc_tables.c
M	src/backend/utils/misc/postgresql.conf.sample
M	src/backend/utils/sort/tuplestore.c
Falling back to patching base and 3-way merge...
Auto-merging src/backend/utils/sort/tuplestore.c
Auto-merging src/backend/utils/misc/postgresql.conf.sample
Auto-merging src/backend/utils/misc/guc_tables.c
Auto-merging src/backend/utils/misc/guc_parameters.dat
Auto-merging src/backend/storage/file/buffile.c
CONFLICT (content): Merge conflict in src/backend/storage/file/buffile.c
Auto-merging src/backend/executor/nodeHashjoin.c
Auto-merging doc/src/sgml/config.sgml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Add transparent compression for temporary files
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 ./0001-Add-transparent-compression-for-temporary-files.patch ===
patching file doc/src/sgml/config.sgml
Hunk #1 succeeded at 1987 (offset 32 lines).
patching file src/backend/executor/nodeHashjoin.c
Hunk #1 succeeded at 1591 (offset 157 lines).
patching file src/backend/storage/file/buffile.c
Hunk #1 FAILED at 53.
Hunk #2 succeeded at 63 (offset 1 line).
Hunk #3 succeeded at 107 (offset 1 line).
Hunk #4 succeeded at 153 (offset 1 line).
Hunk #5 succeeded at 243 (offset 1 line).
Hunk #6 succeeded at 500 (offset 1 line).
Hunk #7 succeeded at 545 (offset 1 line).
Hunk #8 succeeded at 709 (offset 1 line).
Hunk #9 succeeded at 843 (offset 1 line).
Hunk #10 succeeded at 872 (offset 1 line).
Hunk #11 succeeded at 920 (offset 1 line).
Hunk #12 succeeded at 1066 (offset 1 line).
Hunk #13 succeeded at 1159 (offset 1 line).
1 out of 13 hunks FAILED -- saving rejects to file src/backend/storage/file/buffile.c.rej
patching file src/backend/utils/misc/guc_parameters.dat
Hunk #1 succeeded at 3048 (offset 117 lines).
patching file src/backend/utils/misc/guc_tables.c
Hunk #1 succeeded at 78 with fuzz 1.
Hunk #2 succeeded at 477 (offset 12 lines).
patching file src/backend/utils/misc/postgresql.conf.sample
Hunk #1 succeeded at 190 (offset 8 lines).
patching file src/backend/utils/sort/tuplestore.c
Hunk #1 succeeded at 861 (offset 1 line).
patching file src/include/storage/buffile.h
Unstaged changes after reset:
M	doc/src/sgml/config.sgml
M	src/backend/executor/nodeHashjoin.c
M	src/backend/storage/file/buffile.c
M	src/backend/utils/misc/guc_parameters.dat
M	src/backend/utils/misc/guc_tables.c
M	src/backend/utils/misc/postgresql.conf.sample
M	src/backend/utils/sort/tuplestore.c
M	src/include/storage/buffile.h
Removing src/backend/storage/file/buffile.c.rej
=== using 'git apply' to apply patch ./0001-Add-transparent-compression-for-temporary-files.patch ===
Applied patch to 'doc/src/sgml/config.sgml' cleanly.
Applied patch to 'src/backend/executor/nodeHashjoin.c' cleanly.
Applied patch to 'src/backend/storage/file/buffile.c' with conflicts.
Applied patch to 'src/backend/utils/misc/guc_parameters.dat' cleanly.
Applied patch to 'src/backend/utils/misc/guc_tables.c' cleanly.
Applied patch to 'src/backend/utils/misc/postgresql.conf.sample' cleanly.
Applied patch to 'src/backend/utils/sort/tuplestore.c' cleanly.
Applied patch to 'src/include/storage/buffile.h' cleanly.
U src/backend/storage/file/buffile.c
diff --cc src/backend/storage/file/buffile.c
index c4afe4d368a,e6d2af0f815..00000000000
--- a/src/backend/storage/file/buffile.c
+++ b/src/backend/storage/file/buffile.c
@@@ -53,7 -53,12 +53,16 @@@
  #include "storage/bufmgr.h"
  #include "storage/fd.h"
  #include "utils/resowner.h"
++<<<<<<< ours
 +#include "utils/wait_event.h"
++=======
+ #include "utils/memutils.h"
+ #include "common/pg_lzcompress.h"
+ 
+ #ifdef USE_LZ4
+ #include <lz4.h>
+ #endif
++>>>>>>> theirs
  
  /*
   * We break BufFiles into gigabyte-sized segments, regardless of RELSEG_SIZE.