=== Applying patches on top of PostgreSQL commit ID 5941946d0934b9eccb0d5bfebd40b155249a0130 ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Thu Mar 20 01:05:24 UTC 2025
On branch cf/5382
nothing to commit, working tree clean
=== using 'git am' to apply patch ./0001-This-commit-adds-support-for-temporary-files-compres.patch ===
Applying: This commit adds support for temporary files compression, it can be used only for hashjoins now.
.git/rebase-apply/patch:173: space before tab in indent.
	 	* Read whatever we can get, up to a full bufferload.
.git/rebase-apply/patch:174: space before tab in indent.
	 	*/
warning: 2 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	src/Makefile.global.in
M	src/backend/access/gist/gistbuildbuffers.c
M	src/backend/backup/backup_manifest.c
M	src/backend/executor/nodeHashjoin.c
M	src/backend/storage/file/buffile.c
M	src/backend/utils/misc/guc_tables.c
M	src/backend/utils/misc/postgresql.conf.sample
M	src/backend/utils/sort/logtape.c
M	src/backend/utils/sort/tuplestore.c
M	src/include/storage/buffile.h
M	src/test/regress/GNUmakefile
M	src/test/regress/expected/jsonb_jsonpath.out
Falling back to patching base and 3-way merge...
Auto-merging src/test/regress/expected/jsonb_jsonpath.out
CONFLICT (content): Merge conflict in src/test/regress/expected/jsonb_jsonpath.out
Auto-merging src/test/regress/GNUmakefile
Auto-merging src/include/storage/buffile.h
Auto-merging src/backend/utils/sort/tuplestore.c
Auto-merging src/backend/utils/sort/logtape.c
Auto-merging src/backend/utils/misc/postgresql.conf.sample
Auto-merging src/backend/utils/misc/guc_tables.c
CONFLICT (content): Merge conflict in src/backend/utils/misc/guc_tables.c
Auto-merging src/backend/storage/file/buffile.c
Auto-merging src/backend/executor/nodeHashjoin.c
Auto-merging src/backend/backup/backup_manifest.c
Auto-merging src/backend/access/gist/gistbuildbuffers.c
Auto-merging src/Makefile.global.in
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 This commit adds support for temporary files compression, it can be used only for hashjoins now.
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	src/Makefile.global.in
M	src/backend/access/gist/gistbuildbuffers.c
M	src/backend/backup/backup_manifest.c
M	src/backend/executor/nodeHashjoin.c
M	src/backend/storage/file/buffile.c
M	src/backend/utils/misc/guc_tables.c
M	src/backend/utils/misc/postgresql.conf.sample
M	src/backend/utils/sort/logtape.c
M	src/backend/utils/sort/tuplestore.c
M	src/include/storage/buffile.h
M	src/test/regress/GNUmakefile
M	src/test/regress/expected/jsonb_jsonpath.out
Removing src/test/regress/expected/join_hash_lz4.out
Removing src/test/regress/sql/join_hash_lz4.sql
=== using patch(1) to apply patch ./0001-This-commit-adds-support-for-temporary-files-compres.patch ===
patch: unrecognized option `--no-backup-if-mismatch'
usage: patch [-bCcEeflNnRstuv] [-B backup-prefix] [-D symbol] [-d directory]
             [-F max-fuzz] [-i patchfile] [-o out-file] [-p strip-count]
             [-r rej-name] [-V t | nil | never | none] [-x number]
             [-z backup-ext] [--posix] [origfile [patchfile]]
       patch <patchfile
=== using 'git apply' to apply patch ./0001-This-commit-adds-support-for-temporary-files-compres.patch ===
/work/patches/./0001-This-commit-adds-support-for-temporary-files-compres.patch:182: space before tab in indent.
	 	* Read whatever we can get, up to a full bufferload.
/work/patches/./0001-This-commit-adds-support-for-temporary-files-compres.patch:183: space before tab in indent.
	 	*/
Applied patch to 'src/Makefile.global.in' cleanly.
Applied patch to 'src/backend/access/gist/gistbuildbuffers.c' cleanly.
Applied patch to 'src/backend/backup/backup_manifest.c' cleanly.
Applied patch to 'src/backend/executor/nodeHashjoin.c' cleanly.
Applied patch to 'src/backend/storage/file/buffile.c' cleanly.
Applied patch to 'src/backend/utils/misc/guc_tables.c' with conflicts.
Applied patch to 'src/backend/utils/misc/postgresql.conf.sample' cleanly.
Applied patch to 'src/backend/utils/sort/logtape.c' cleanly.
Applied patch to 'src/backend/utils/sort/tuplestore.c' cleanly.
Applied patch to 'src/include/storage/buffile.h' cleanly.
Applied patch to 'src/test/regress/GNUmakefile' cleanly.
Falling back to direct application...
Applied patch to 'src/test/regress/expected/jsonb_jsonpath.out' with conflicts.
Falling back to direct application...
U src/backend/utils/misc/guc_tables.c
U src/test/regress/expected/jsonb_jsonpath.out
warning: 2 lines add whitespace errors.
diff --cc src/backend/utils/misc/guc_tables.c
index cc8f2b1230a,3821caf7630..00000000000
--- a/src/backend/utils/misc/guc_tables.c
+++ b/src/backend/utils/misc/guc_tables.c
@@@ -73,10 -71,9 +73,14 @@@
  #include "replication/slot.h"
  #include "replication/slotsync.h"
  #include "replication/syncrep.h"
 +#include "storage/aio.h"
  #include "storage/bufmgr.h"
  #include "storage/bufpage.h"
++<<<<<<< ours
 +#include "storage/io_worker.h"
++=======
+ #include "storage/buffile.h"
++>>>>>>> theirs
  #include "storage/large_object.h"
  #include "storage/pg_shmem.h"
  #include "storage/predicate.h"
diff --cc src/test/regress/expected/jsonb_jsonpath.out
index 4bcd4e91a29,b31b32490d4..00000000000
--- a/src/test/regress/expected/jsonb_jsonpath.out
+++ b/src/test/regress/expected/jsonb_jsonpath.out
@@@ -2690,10 -2687,9 +2690,14 @@@ set local timezone = 'UTC-10'
  select jsonb_path_query_tz('"12:34:56"', '$.time_tz().string()');
   jsonb_path_query_tz 
  ---------------------
++<<<<<<< ours
 + "12:34:56+10:00"
++=======
+  "12:34:56-08:00"
++>>>>>>> theirs
  (1 row)
  
 +rollback;
  select jsonb_path_query('"12:34:56"', '$.time().string()');
   jsonb_path_query 
  ------------------