=== Applying patches on top of PostgreSQL commit ID e1c3654839e464957675344a1e949489d98b103b === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Thu Jul 24 10:08:18 UTC 2025 On branch cf/5830 nothing to commit, working tree clean === using 'git am' to apply patch ./v1-0001-direct-tids-toast.patch === Applying: TOAST with direct TIDs TOAST table with direct TID chains instead of index. New TOAST pointer structure varatt_external_tid is introduced with corresponding vartag. error: sha1 information is lacking or useless (src/backend/access/common/detoast.c). error: could not build fake ancestor hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 TOAST with direct TIDs TOAST table with direct TID chains instead of index. New TOAST pointer structure varatt_external_tid is introduced with corresponding vartag. 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-direct-tids-toast.patch === patching file src/backend/access/common/detoast.c Hunk #1 succeeded at 115 (offset -1 lines). Hunk #3 FAILED at 467. 1 out of 3 hunks FAILED -- saving rejects to file src/backend/access/common/detoast.c.rej can't find file to patch at input line 89 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/src/backend/access/common/toast_external.c b/src/backend/access/common/toast_external.c |index 0e79ac8aca..6fc08b12d9 100644 |--- a/src/backend/access/common/toast_external.c |+++ b/src/backend/access/common/toast_external.c -------------------------- No file to patch. Skipping patch. 4 out of 4 hunks ignored patching file src/backend/access/common/toast_internals.c Hunk #1 FAILED at 24. Hunk #2 succeeded at 103 (offset -1 lines). 1 out of 2 hunks FAILED -- saving rejects to file src/backend/access/common/toast_internals.c.rej patching file src/backend/access/heap/heaptoast.c Hunk #1 FAILED at 165. Hunk #2 FAILED at 184. 2 out of 2 hunks FAILED -- saving rejects to file src/backend/access/heap/heaptoast.c.rej patching file src/backend/access/table/toast_helper.c Hunk #1 succeeded at 260 (offset -6 lines). Hunk #2 succeeded at 314 (offset -6 lines). Hunk #3 succeeded at 347 (offset -6 lines). patching file src/backend/catalog/toasting.c Hunk #1 FAILED at 33. Hunk #2 succeeded at 41 (offset -4 lines). Hunk #3 succeeded at 124 (offset -4 lines). Hunk #4 succeeded at 135 (offset -4 lines). 1 out of 4 hunks FAILED -- saving rejects to file src/backend/catalog/toasting.c.rej patching file src/backend/utils/misc/guc_tables.c Hunk #1 succeeded at 2143 (offset -8 lines). can't find file to patch at input line 916 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/src/include/access/toast_external.h b/src/include/access/toast_external.h |index 1a7c61454f..874e2612da 100644 |--- a/src/include/access/toast_external.h |+++ b/src/include/access/toast_external.h -------------------------- No file to patch. Skipping patch. 2 out of 2 hunks ignored patching file src/include/access/toast_helper.h patching file src/include/access/toast_internals.h can't find file to patch at input line 968 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -------------------------- |diff --git a/src/include/access/toast_type.h b/src/include/access/toast_type.h |index 494c2a3e85..d0c3b5e163 100644 |--- a/src/include/access/toast_type.h |+++ b/src/include/access/toast_type.h -------------------------- No file to patch. Skipping patch. 1 out of 1 hunk ignored patching file src/include/varatt.h Hunk #1 succeeded at 38 with fuzz 2 (offset -3 lines). Hunk #2 FAILED at 85. Hunk #3 FAILED at 136. Hunk #4 FAILED at 143. Hunk #5 FAILED at 342. Hunk #6 FAILED at 414. 5 out of 6 hunks FAILED -- saving rejects to file src/include/varatt.h.rej Unstaged changes after reset: M src/backend/access/common/detoast.c M src/backend/access/common/toast_internals.c M src/backend/access/table/toast_helper.c M src/backend/catalog/toasting.c M src/backend/utils/misc/guc_tables.c M src/include/access/toast_helper.h M src/include/access/toast_internals.h M src/include/varatt.h Removing src/backend/access/common/detoast.c.rej Removing src/backend/access/common/toast_internals.c.rej Removing src/backend/access/heap/heaptoast.c.rej Removing src/backend/catalog/toasting.c.rej Removing src/include/varatt.h.rej === using 'git apply' to apply patch ./v1-0001-direct-tids-toast.patch === error: repository lacks the necessary blob to perform 3-way merge. Falling back to direct application... error: patch failed: src/backend/access/common/detoast.c:457 error: src/backend/access/common/detoast.c: patch does not apply error: src/backend/access/common/toast_external.c: does not exist in index error: repository lacks the necessary blob to perform 3-way merge. Falling back to direct application... error: patch failed: src/backend/access/common/toast_internals.c:24 error: src/backend/access/common/toast_internals.c: patch does not apply error: repository lacks the necessary blob to perform 3-way merge. Falling back to direct application... error: patch failed: src/backend/access/heap/heaptoast.c:165 error: src/backend/access/heap/heaptoast.c: patch does not apply error: repository lacks the necessary blob to perform 3-way merge. Falling back to direct application... error: repository lacks the necessary blob to perform 3-way merge. Falling back to direct application... error: patch failed: src/backend/catalog/toasting.c:33 error: src/backend/catalog/toasting.c: patch does not apply error: repository lacks the necessary blob to perform 3-way merge. Falling back to direct application... error: src/include/access/toast_external.h: does not exist in index error: repository lacks the necessary blob to perform 3-way merge. Falling back to direct application... Applied patch to 'src/include/access/toast_internals.h' cleanly. error: src/include/access/toast_type.h: does not exist in index error: repository lacks the necessary blob to perform 3-way merge. Falling back to direct application... error: patch failed: src/include/varatt.h:41 error: src/include/varatt.h: patch does not apply