=== Applying patches on top of PostgreSQL commit ID 2fd3e2fa5c908d05ac4d8b6c2c80fd50c506f32e ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Mon Mar 31 20:30:21 UTC 2025
On branch cf/5250
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v4-0001-Always-use-long-SLRU-segment-file-names.patch ===
Applying: Always use long SLRU segment file names
Using index info to reconstruct a base tree...
M	src/backend/access/transam/multixact.c
M	src/backend/access/transam/slru.c
M	src/bin/pg_upgrade/pg_upgrade.c
M	src/bin/pg_upgrade/pg_upgrade.h
M	src/bin/pg_verifybackup/t/003_corruption.pl
M	src/test/modules/test_slru/test_slru.c
Falling back to patching base and 3-way merge...
Auto-merging src/test/modules/test_slru/test_slru.c
Auto-merging src/bin/pg_verifybackup/t/003_corruption.pl
Auto-merging src/bin/pg_upgrade/pg_upgrade.h
Auto-merging src/bin/pg_upgrade/pg_upgrade.c
Auto-merging src/backend/access/transam/slru.c
CONFLICT (content): Merge conflict in src/backend/access/transam/slru.c
Auto-merging src/backend/access/transam/multixact.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 Always use long SLRU segment file names
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/backend/access/transam/clog.c
M	src/backend/access/transam/commit_ts.c
M	src/backend/access/transam/multixact.c
M	src/backend/access/transam/slru.c
M	src/backend/access/transam/subtrans.c
M	src/backend/commands/async.c
M	src/backend/storage/lmgr/predicate.c
M	src/bin/pg_upgrade/pg_upgrade.c
M	src/bin/pg_upgrade/pg_upgrade.h
M	src/bin/pg_verifybackup/t/003_corruption.pl
M	src/include/access/slru.h
M	src/test/modules/test_slru/test_slru.c
=== using patch(1) to apply patch ./v4-0001-Always-use-long-SLRU-segment-file-names.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 ./v4-0001-Always-use-long-SLRU-segment-file-names.patch ===
Applied patch to 'src/backend/access/transam/clog.c' cleanly.
Applied patch to 'src/backend/access/transam/commit_ts.c' cleanly.
Applied patch to 'src/backend/access/transam/multixact.c' cleanly.
Applied patch to 'src/backend/access/transam/slru.c' with conflicts.
Applied patch to 'src/backend/access/transam/subtrans.c' cleanly.
Applied patch to 'src/backend/commands/async.c' cleanly.
Applied patch to 'src/backend/storage/lmgr/predicate.c' cleanly.
Applied patch to 'src/bin/pg_upgrade/pg_upgrade.c' cleanly.
Applied patch to 'src/bin/pg_upgrade/pg_upgrade.h' cleanly.
Applied patch to 'src/bin/pg_verifybackup/t/003_corruption.pl' cleanly.
Applied patch to 'src/include/access/slru.h' cleanly.
Applied patch to 'src/test/modules/test_slru/test_slru.c' cleanly.
U src/backend/access/transam/slru.c
diff --cc src/backend/access/transam/slru.c
index fe56286d9a9,cc078d2e6ce..00000000000
--- a/src/backend/access/transam/slru.c
+++ b/src/backend/access/transam/slru.c
@@@ -90,28 -83,16 +83,41 @@@
  static inline int
  SlruFileName(SlruCtl ctl, char *path, int64 segno)
  {
++<<<<<<< ours
 +	if (ctl->long_segment_names)
 +	{
 +		/*
 +		 * We could use 16 characters here but the disadvantage would be that
 +		 * the SLRU segments will be hard to distinguish from WAL segments.
 +		 *
 +		 * For this reason we use 15 characters. It is enough but also means
 +		 * that in the future we can't decrease SLRU_PAGES_PER_SEGMENT easily.
 +		 */
 +		Assert(segno >= 0 && segno <= INT64CONST(0xFFFFFFFFFFFFFFF));
 +		return snprintf(path, MAXPGPATH, "%s/%015" PRIX64, ctl->Dir, segno);
 +	}
 +	else
 +	{
 +		/*
 +		 * Despite the fact that %04X format string is used up to 24 bit
 +		 * integers are allowed. See SlruCorrectSegmentFilenameLength()
 +		 */
 +		Assert(segno >= 0 && segno <= INT64CONST(0xFFFFFF));
 +		return snprintf(path, MAXPGPATH, "%s/%04X", (ctl)->Dir,
 +						(unsigned int) segno);
 +	}
++=======
+ 	/*
+ 	 * We could use 16 characters here but the disadvantage would be that
+ 	 * the SLRU segments will be hard to distinguish from WAL segments.
+ 	 *
+ 	 * For this reason we use 15 characters. It is enough but also means
+ 	 * that in the future we can't decrease SLRU_PAGES_PER_SEGMENT easily.
+ 	 */
+ 	Assert(segno >= 0 && segno <= INT64CONST(0xFFFFFFFFFFFFFFF));
+ 	return snprintf(path, MAXPGPATH, "%s/%015llX", ctl->Dir,
+ 					(long long) segno);
++>>>>>>> theirs
  }
  
  /*