=== Applying patches on top of PostgreSQL commit ID 2007df43332b7c4d153bcd2153e32d5a76f7e3ac === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Fri Mar 6 07:57:36 UTC 2026 On branch cf/5829 nothing to commit, working tree clean === using 'git am' to apply patch ./v20260210-0001-VCI-changes-to-postgres-core.patch === Applying: VCI - changes to postgres core Using index info to reconstruct a base tree... M src/backend/access/heap/heapam.c M src/backend/access/heap/heapam_handler.c M src/backend/access/transam/xlogfuncs.c M src/backend/access/transam/xlogrecovery.c M src/backend/catalog/dependency.c M src/backend/commands/explain.c M src/backend/commands/tablecmds.c M src/backend/commands/vacuum.c M src/backend/executor/nodeModifyTable.c M src/backend/optimizer/path/allpaths.c M src/backend/optimizer/plan/createplan.c M src/backend/storage/ipc/procarray.c M src/backend/utils/adt/timestamp.c M src/backend/utils/cache/relcache.c M src/bin/pg_dump/pg_dump.c M src/bin/pg_dump/pg_dump.h M src/include/access/heapam.h M src/include/access/xlogrecovery.h M src/include/nodes/plannodes.h M src/include/optimizer/planner.h Falling back to patching base and 3-way merge... Auto-merging src/include/optimizer/planner.h Auto-merging src/include/nodes/plannodes.h Auto-merging src/include/access/xlogrecovery.h Auto-merging src/include/access/heapam.h Auto-merging src/bin/pg_dump/pg_dump.h Auto-merging src/bin/pg_dump/pg_dump.c Auto-merging src/backend/utils/cache/relcache.c Auto-merging src/backend/utils/adt/timestamp.c Auto-merging src/backend/storage/ipc/procarray.c Auto-merging src/backend/optimizer/plan/createplan.c Auto-merging src/backend/optimizer/path/allpaths.c Auto-merging src/backend/executor/nodeModifyTable.c Auto-merging src/backend/commands/vacuum.c Auto-merging src/backend/commands/tablecmds.c Auto-merging src/backend/commands/explain.c Auto-merging src/backend/catalog/dependency.c Auto-merging src/backend/access/transam/xlogrecovery.c Auto-merging src/backend/access/transam/xlogfuncs.c CONFLICT (content): Merge conflict in src/backend/access/transam/xlogfuncs.c Auto-merging src/backend/access/heap/heapam_handler.c Auto-merging src/backend/access/heap/heapam.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 VCI - changes to postgres core 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/heap/heapam.c M src/backend/access/heap/heapam_handler.c M src/backend/access/heap/heapam_visibility.c M src/backend/access/transam/xlogfuncs.c M src/backend/access/transam/xlogrecovery.c M src/backend/catalog/dependency.c M src/backend/catalog/index.c M src/backend/commands/explain.c M src/backend/commands/tablecmds.c M src/backend/commands/vacuum.c M src/backend/executor/execAmi.c M src/backend/executor/execExpr.c M src/backend/executor/execExprInterp.c M src/backend/executor/execProcnode.c M src/backend/executor/execScan.c M src/backend/executor/nodeCustom.c M src/backend/executor/nodeModifyTable.c M src/backend/jit/llvm/llvmjit_expr.c M src/backend/jit/llvm/llvmjit_types.c M src/backend/nodes/gen_node_support.pl M src/backend/optimizer/path/allpaths.c M src/backend/optimizer/plan/createplan.c M src/backend/storage/ipc/procarray.c M src/backend/utils/adt/timestamp.c M src/backend/utils/cache/relcache.c M src/bin/pg_dump/common.c M src/bin/pg_dump/pg_dump.c M src/bin/pg_dump/pg_dump.h M src/include/access/heapam.h M src/include/access/xlogrecovery.h M src/include/catalog/dependency.h M src/include/catalog/index.h M src/include/commands/explain.h M src/include/commands/tablecmds.h M src/include/datatype/timestamp.h M src/include/executor/execExpr.h M src/include/executor/nodeModifyTable.h M src/include/nodes/extensible.h M src/include/nodes/params.h M src/include/nodes/plannodes.h M src/include/optimizer/planner.h M src/include/utils/relcache.h M src/include/utils/snapshot.h === using patch(1) to apply patch ./v20260210-0001-VCI-changes-to-postgres-core.patch === patching file src/backend/access/heap/heapam.c Hunk #1 succeeded at 55 (offset 1 line). Hunk #2 succeeded at 2862 (offset 2 lines). Hunk #3 succeeded at 3109 (offset 2 lines). Hunk #4 succeeded at 3256 (offset 2 lines). Hunk #5 succeeded at 3361 (offset 2 lines). Hunk #6 succeeded at 3808 (offset 2 lines). Hunk #7 succeeded at 4293 (offset 2 lines). patching file src/backend/access/heap/heapam_handler.c Hunk #2 succeeded at 1677 (offset 2 lines). patching file src/backend/access/heap/heapam_visibility.c patching file src/backend/access/transam/xlogfuncs.c Hunk #1 succeeded at 62 (offset -545 lines). patching file src/backend/access/transam/xlogrecovery.c Hunk #1 succeeded at 2908 (offset -61 lines). Hunk #2 succeeded at 3075 (offset -61 lines). Hunk #3 succeeded at 3096 (offset -61 lines). patching file src/backend/catalog/dependency.c patching file src/backend/catalog/index.c patching file src/backend/commands/explain.c Hunk #7 succeeded at 5156 (offset 26 lines). patching file src/backend/commands/tablecmds.c Hunk #2 succeeded at 16325 (offset -3 lines). Hunk #3 succeeded at 16877 (offset -3 lines). Hunk #4 succeeded at 17004 (offset -3 lines). Hunk #5 succeeded at 19262 (offset -3 lines). patching file src/backend/commands/vacuum.c Hunk #2 succeeded at 2136 (offset 4 lines). patching file src/backend/executor/execAmi.c patching file src/backend/executor/execExpr.c patching file src/backend/executor/execExprInterp.c patching file src/backend/executor/execProcnode.c patching file src/backend/executor/execScan.c patching file src/backend/executor/nodeCustom.c patching file src/backend/executor/nodeModifyTable.c Hunk #2 succeeded at 2365 with fuzz 2 (offset 31 lines). patching file src/backend/jit/llvm/llvmjit_expr.c patching file src/backend/jit/llvm/llvmjit_types.c patching file src/backend/nodes/gen_node_support.pl patching file src/backend/optimizer/path/allpaths.c Hunk #2 succeeded at 825 (offset 2 lines). Hunk #3 succeeded at 852 (offset 2 lines). patching file src/backend/optimizer/plan/createplan.c Hunk #1 succeeded at 33 (offset 1 line). Hunk #2 succeeded at 174 (offset 1 line). Hunk #3 succeeded at 5371 (offset 3 lines). patching file src/backend/storage/ipc/procarray.c Hunk #1 succeeded at 1928 (offset 6 lines). patching file src/backend/utils/adt/timestamp.c Hunk #2 succeeded at 72 (offset -2 lines). Hunk #3 succeeded at 3470 (offset -2 lines). Hunk #4 succeeded at 3949 (offset -2 lines). patching file src/backend/utils/cache/relcache.c Hunk #3 succeeded at 6997 (offset 23 lines). patching file src/bin/pg_dump/common.c patching file src/bin/pg_dump/pg_dump.c Hunk #1 succeeded at 8718 (offset 75 lines). Hunk #2 succeeded at 17207 (offset 86 lines). Hunk #3 succeeded at 20575 (offset 141 lines). patching file src/bin/pg_dump/pg_dump.h patching file src/include/access/heapam.h Hunk #1 succeeded at 431 (offset 1 line). patching file src/include/access/xlogrecovery.h Hunk #1 succeeded at 58 with fuzz 1 (offset 2 lines). Hunk #2 succeeded at 229 (offset 67 lines). patching file src/include/catalog/dependency.h patching file src/include/catalog/index.h patching file src/include/commands/explain.h patching file src/include/commands/tablecmds.h patching file src/include/datatype/timestamp.h patching file src/include/executor/execExpr.h patching file src/include/executor/nodeModifyTable.h patching file src/include/nodes/extensible.h patching file src/include/nodes/params.h patching file src/include/nodes/plannodes.h Hunk #1 succeeded at 220 (offset 6 lines). patching file src/include/optimizer/planner.h Hunk #1 succeeded at 54 (offset 1 line). patching file src/include/utils/relcache.h patching file src/include/utils/snapshot.h [cf/5829 62f879f8108] VCI - changes to postgres core Author: Peter Smith Date: Tue Feb 10 18:28:04 2026 +1100 43 files changed, 577 insertions(+), 44 deletions(-) === using 'git am' to apply patch ./v20260210-0002-VCI-main-part1.patch === fatal: previous rebase directory .git/rebase-apply still exists but mbox given. === using patch(1) to apply patch ./v20260210-0002-VCI-main-part1.patch === patching file contrib/Makefile patching file contrib/meson.build patching file contrib/vci/.gitignore patching file contrib/vci/Makefile patching file contrib/vci/README patching file contrib/vci/include/vci.h patching file contrib/vci/include/vci_utils.h patching file contrib/vci/meson.build patching file contrib/vci/utils/Makefile patching file contrib/vci/utils/meson.build patching file contrib/vci/utils/nodes.t patching file contrib/vci/utils/vci_symbols.c patching file contrib/vci/vci--1.0.sql patching file contrib/vci/vci.control patching file contrib/vci/vci_supported_funcs.c patching file contrib/vci/vci_supported_funcs.sql patching file contrib/vci/vci_supported_types.c [cf/5829 f7425cbe391] VCI - main - part1 Author: Peter Smith Date: Tue Feb 10 18:29:15 2026 +1100 17 files changed, 3280 insertions(+), 1 deletion(-) create mode 100644 contrib/vci/.gitignore create mode 100644 contrib/vci/Makefile create mode 100755 contrib/vci/README create mode 100644 contrib/vci/include/vci.h create mode 100644 contrib/vci/include/vci_utils.h create mode 100644 contrib/vci/meson.build create mode 100644 contrib/vci/utils/Makefile create mode 100644 contrib/vci/utils/meson.build create mode 100644 contrib/vci/utils/nodes.t create mode 100644 contrib/vci/utils/vci_symbols.c create mode 100644 contrib/vci/vci--1.0.sql create mode 100644 contrib/vci/vci.control create mode 100644 contrib/vci/vci_supported_funcs.c create mode 100644 contrib/vci/vci_supported_funcs.sql create mode 100644 contrib/vci/vci_supported_types.c === using 'git am' to apply patch ./v20260210-0003-VCI-main-part2.patch === fatal: previous rebase directory .git/rebase-apply still exists but mbox given. === using patch(1) to apply patch ./v20260210-0003-VCI-main-part2.patch === patching file contrib/vci/include/postgresql_copy.h patching file contrib/vci/include/vci_chunk.h patching file contrib/vci/include/vci_columns.h patching file contrib/vci/include/vci_columns_data.h patching file contrib/vci/include/vci_fetch.h patching file contrib/vci/include/vci_freelist.h patching file contrib/vci/include/vci_mem.h patching file contrib/vci/include/vci_memory_entry.h patching file contrib/vci/include/vci_ros.h patching file contrib/vci/include/vci_ros_command.h patching file contrib/vci/include/vci_ros_daemon.h patching file contrib/vci/include/vci_tidcrid.h patching file contrib/vci/include/vci_wos.h patching file contrib/vci/include/vci_xact.h patching file contrib/vci/storage/Makefile patching file contrib/vci/storage/meson.build patching file contrib/vci/storage/vci_ros.c patching file contrib/vci/storage/vci_ros_command.c patching file contrib/vci/storage/vci_ros_daemon.c [cf/5829 8fbda7f7600] VCI - main - part2 Author: Peter Smith Date: Tue Feb 10 18:30:58 2026 +1100 19 files changed, 10430 insertions(+) create mode 100644 contrib/vci/include/postgresql_copy.h create mode 100644 contrib/vci/include/vci_chunk.h create mode 100644 contrib/vci/include/vci_columns.h create mode 100644 contrib/vci/include/vci_columns_data.h create mode 100644 contrib/vci/include/vci_fetch.h create mode 100644 contrib/vci/include/vci_freelist.h create mode 100644 contrib/vci/include/vci_mem.h create mode 100644 contrib/vci/include/vci_memory_entry.h create mode 100644 contrib/vci/include/vci_ros.h create mode 100644 contrib/vci/include/vci_ros_command.h create mode 100644 contrib/vci/include/vci_ros_daemon.h create mode 100644 contrib/vci/include/vci_tidcrid.h create mode 100644 contrib/vci/include/vci_wos.h create mode 100644 contrib/vci/include/vci_xact.h create mode 100644 contrib/vci/storage/Makefile create mode 100644 contrib/vci/storage/meson.build create mode 100644 contrib/vci/storage/vci_ros.c create mode 100644 contrib/vci/storage/vci_ros_command.c create mode 100644 contrib/vci/storage/vci_ros_daemon.c === using 'git am' to apply patch ./v20260210-0004-VCI-main-part3.patch === fatal: previous rebase directory .git/rebase-apply still exists but mbox given. === using patch(1) to apply patch ./v20260210-0004-VCI-main-part3.patch === patching file contrib/vci/include/vci_supported_oid.h patching file contrib/vci/storage/Makefile patching file contrib/vci/storage/meson.build patching file contrib/vci/storage/vci_index.c patching file contrib/vci/storage/vci_internal_view.c patching file contrib/vci/storage/vci_tidcrid.c patching file contrib/vci/storage/vci_wos.c [cf/5829 b6ca35bca18] VCI - main - part3 Author: Peter Smith Date: Tue Feb 10 18:31:50 2026 +1100 7 files changed, 4755 insertions(+), 8 deletions(-) create mode 100644 contrib/vci/include/vci_supported_oid.h create mode 100644 contrib/vci/storage/vci_index.c create mode 100644 contrib/vci/storage/vci_internal_view.c create mode 100644 contrib/vci/storage/vci_tidcrid.c create mode 100644 contrib/vci/storage/vci_wos.c === using 'git am' to apply patch ./v20260210-0005-VCI-main-part4.patch === fatal: previous rebase directory .git/rebase-apply still exists but mbox given. === using patch(1) to apply patch ./v20260210-0005-VCI-main-part4.patch === patching file contrib/vci/storage/Makefile patching file contrib/vci/storage/meson.build patching file contrib/vci/storage/vci_chunk.c patching file contrib/vci/storage/vci_columns.c patching file contrib/vci/storage/vci_columns_data.c patching file contrib/vci/storage/vci_fetch.c patching file contrib/vci/storage/vci_freelist.c patching file contrib/vci/storage/vci_low_utils.c patching file contrib/vci/storage/vci_memory_entry.c patching file contrib/vci/storage/vci_xact.c [cf/5829 571ea44e7af] VCI - main - part4 Author: Peter Smith Date: Tue Feb 10 18:33:12 2026 +1100 10 files changed, 6094 insertions(+), 16 deletions(-) create mode 100644 contrib/vci/storage/vci_chunk.c create mode 100644 contrib/vci/storage/vci_columns.c create mode 100644 contrib/vci/storage/vci_columns_data.c create mode 100644 contrib/vci/storage/vci_fetch.c create mode 100644 contrib/vci/storage/vci_freelist.c create mode 100644 contrib/vci/storage/vci_low_utils.c create mode 100644 contrib/vci/storage/vci_memory_entry.c create mode 100644 contrib/vci/storage/vci_xact.c === using 'git am' to apply patch ./v20260210-0006-VCI-main-part5.patch === fatal: previous rebase directory .git/rebase-apply still exists but mbox given. === using patch(1) to apply patch ./v20260210-0006-VCI-main-part5.patch === patching file contrib/vci/executor/Makefile patching file contrib/vci/executor/meson.build patching file contrib/vci/executor/vci_agg.c patching file contrib/vci/executor/vci_aggmergetranstype.c patching file contrib/vci/executor/vci_aggref.c patching file contrib/vci/executor/vci_executor.c patching file contrib/vci/executor/vci_fetch_column_store.c patching file contrib/vci/executor/vci_gather.c patching file contrib/vci/executor/vci_param.c patching file contrib/vci/executor/vci_plan.c patching file contrib/vci/executor/vci_plan_func.c patching file contrib/vci/executor/vci_planner.c patching file contrib/vci/executor/vci_planner_preanalyze.c patching file contrib/vci/executor/vci_scan.c patching file contrib/vci/executor/vci_sort.c patching file contrib/vci/executor/vci_vector_executor.c patching file contrib/vci/include/vci_aggref.h patching file contrib/vci/include/vci_aggref_impl.inc patching file contrib/vci/include/vci_executor.h patching file contrib/vci/include/vci_fetch_row_store.h patching file contrib/vci/include/vci_planner.h [cf/5829 9d7a0e83b83] VCI - main - part5 Author: Peter Smith Date: Tue Feb 10 18:41:19 2026 +1100 21 files changed, 16051 insertions(+) create mode 100644 contrib/vci/executor/Makefile create mode 100644 contrib/vci/executor/meson.build create mode 100644 contrib/vci/executor/vci_agg.c create mode 100644 contrib/vci/executor/vci_aggmergetranstype.c create mode 100644 contrib/vci/executor/vci_aggref.c create mode 100644 contrib/vci/executor/vci_executor.c create mode 100644 contrib/vci/executor/vci_fetch_column_store.c create mode 100644 contrib/vci/executor/vci_gather.c create mode 100644 contrib/vci/executor/vci_param.c create mode 100644 contrib/vci/executor/vci_plan.c create mode 100644 contrib/vci/executor/vci_plan_func.c create mode 100644 contrib/vci/executor/vci_planner.c create mode 100644 contrib/vci/executor/vci_planner_preanalyze.c create mode 100644 contrib/vci/executor/vci_scan.c create mode 100644 contrib/vci/executor/vci_sort.c create mode 100644 contrib/vci/executor/vci_vector_executor.c create mode 100644 contrib/vci/include/vci_aggref.h create mode 100644 contrib/vci/include/vci_aggref_impl.inc create mode 100644 contrib/vci/include/vci_executor.h create mode 100644 contrib/vci/include/vci_fetch_row_store.h create mode 100644 contrib/vci/include/vci_planner.h === using 'git am' to apply patch ./v20260210-0007-VCI-main-part6.patch === fatal: previous rebase directory .git/rebase-apply still exists but mbox given. === using patch(1) to apply patch ./v20260210-0007-VCI-main-part6.patch === patching file contrib/vci/Makefile patching file contrib/vci/meson.build patching file contrib/vci/vci_main.c patching file contrib/vci/vci_read_guc.c patching file contrib/vci/vci_shmem.c [cf/5829 0ef381bdb1c] VCI - main - part6 Author: Peter Smith Date: Tue Feb 10 18:42:57 2026 +1100 5 files changed, 861 insertions(+), 6 deletions(-) create mode 100644 contrib/vci/vci_main.c create mode 100644 contrib/vci/vci_read_guc.c create mode 100644 contrib/vci/vci_shmem.c === using 'git am' to apply patch ./v20260210-0008-VCI-tests.patch === fatal: previous rebase directory .git/rebase-apply still exists but mbox given. === using patch(1) to apply patch ./v20260210-0008-VCI-tests.patch === patching file contrib/vci/expected/bugs.out patching file contrib/vci/expected/vci.out patching file contrib/vci/sql/bugs.sql patching file contrib/vci/sql/vci.sql patching file contrib/vci/vci.conf [cf/5829 7b180eec463] VCI tests Author: Peter Smith Date: Tue Feb 10 18:45:59 2026 +1100 5 files changed, 480 insertions(+) create mode 100644 contrib/vci/expected/bugs.out create mode 100644 contrib/vci/expected/vci.out create mode 100644 contrib/vci/sql/bugs.sql create mode 100644 contrib/vci/sql/vci.sql create mode 100644 contrib/vci/vci.conf === using 'git am' to apply patch ./v20260210-0009-VCI-docs.patch === fatal: previous rebase directory .git/rebase-apply still exists but mbox given. === using patch(1) to apply patch ./v20260210-0009-VCI-docs.patch === patching file doc/src/sgml/contrib.sgml patching file doc/src/sgml/filelist.sgml patching file doc/src/sgml/vci.sgml [cf/5829 ab180837e89] VCI docs Author: Peter Smith Date: Tue Feb 10 18:48:29 2026 +1100 3 files changed, 152 insertions(+) create mode 100644 doc/src/sgml/vci.sgml