=== Applying patches on top of PostgreSQL commit ID 7e9c216b5236cc61f677787b35e8c8f28f5f6959 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Sat Sep 13 22:51:22 UTC 2025 On branch cf/5012 nothing to commit, working tree clean === using 'git am' to apply patch ./0001-Core-patch-for-vacuum-statistics.patch === Applying: Core patch for vacuum statistics. === using 'git am' to apply patch ./0001-Create-vacuum-extension-statistics.patch === Applying: Create vacuum extension statistics .git/rebase-apply/patch:1450: indent with spaces. (dst->substruct.field += src->substruct.field) .git/rebase-apply/patch:1478: indent with spaces. if (dst->type == PGSTAT_EXTVAC_INVALID) .git/rebase-apply/patch:1479: indent with spaces. dst->type = src->type; .git/rebase-apply/patch:1481: indent with spaces. //Assert(src->type != PGSTAT_EXTVAC_INVALID && src->type != PGSTAT_EXTVAC_DB && src->type == dst->type); .git/rebase-apply/patch:1483: indent with spaces. pgstat_accumulate_common(&dst->common, &src->common); warning: squelched 71 whitespace errors warning: 76 lines add whitespace errors. Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... CONFLICT (add/add): Merge conflict in Makefile Auto-merging Makefile error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 Create vacuum extension statistics 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 Makefile Removing expected/ Removing spec/ Removing sql/ Removing vacuum_statistics--1.0.sql Removing vacuum_statistics.c Removing vacuum_statistics.control === using patch(1) to apply patch ./0001-Create-vacuum-extension-statistics.patch === The next patch would create the file Makefile, which already exists! Skipping patch. 1 out of 1 hunk ignored patching file expected/vacuum-extending-in-repetable-read.out patching file expected/vacuum_index_statistics.out patching file expected/vacuum_tables_and_db_statistics.out patching file spec/vacuum-extending-in-repetable-read.spec patching file sql/vacuum_index_statistics.sql patching file sql/vacuum_tables_and_db_statistics.sql patching file vacuum_statistics--1.0.sql patching file vacuum_statistics.c patching file vacuum_statistics.control Removing expected/ Removing spec/ Removing sql/ Removing vacuum_statistics--1.0.sql Removing vacuum_statistics.c Removing vacuum_statistics.control === using 'git apply' to apply patch ./0001-Create-vacuum-extension-statistics.patch === /work/patches/./0001-Create-vacuum-extension-statistics.patch:1455: indent with spaces. (dst->substruct.field += src->substruct.field) /work/patches/./0001-Create-vacuum-extension-statistics.patch:1483: indent with spaces. if (dst->type == PGSTAT_EXTVAC_INVALID) /work/patches/./0001-Create-vacuum-extension-statistics.patch:1484: indent with spaces. dst->type = src->type; /work/patches/./0001-Create-vacuum-extension-statistics.patch:1486: indent with spaces. //Assert(src->type != PGSTAT_EXTVAC_INVALID && src->type != PGSTAT_EXTVAC_DB && src->type == dst->type); /work/patches/./0001-Create-vacuum-extension-statistics.patch:1488: indent with spaces. pgstat_accumulate_common(&dst->common, &src->common); Performing three-way merge... Applied patch to 'Makefile' with conflicts. Falling back to direct application... Falling back to direct application... Falling back to direct application... Falling back to direct application... Falling back to direct application... Falling back to direct application... Falling back to direct application... Falling back to direct application... Falling back to direct application... U Makefile warning: squelched 71 whitespace errors warning: 76 lines add whitespace errors. diff --cc Makefile index 8a2ec9396b6,7fd875e954c..00000000000 --- a/Makefile +++ b/Makefile @@@ -1,43 -1,21 +1,67 @@@ ++<<<<<<< ours +# The PostgreSQL make files exploit features of GNU make that other +# makes do not have. Because it is a common mistake for users to try +# to build Postgres with a different make, we have this make file +# that, as a service, will look for a GNU make and invoke it, or show +# an error message if none could be found. + +# If the user were using GNU make now, this file would not get used +# because GNU make uses a make file named "GNUmakefile" in preference +# to "Makefile" if it exists. PostgreSQL is shipped with a +# "GNUmakefile". If the user hasn't run the configure script yet, the +# GNUmakefile won't exist yet, so we catch that case as well. + + +# AIX make defaults to building *every* target of the first rule. Start with +# a single-target, empty rule to make the other targets non-default. +# (We don't support AIX anymore, but if someone tries to build on AIX anyway, +# at least they'll get the instructions to run 'configure' first.) +all: + +all check install installdirs installcheck installcheck-parallel uninstall clean distclean maintainer-clean dist distcheck world check-world install-world installcheck-world: + @if [ ! -f GNUmakefile ] ; then \ + echo "You need to run the 'configure' program first. Please see"; \ + echo "" ; \ + false ; \ + fi + @IFS=':' ; \ + for dir in $$PATH; do \ + for prog in gmake gnumake make; do \ + if [ -f $$dir/$$prog ] && ( $$dir/$$prog -f /dev/null --version 2>/dev/null | grep GNU >/dev/null 2>&1 ) ; then \ + GMAKE=$$dir/$$prog; \ + break 2; \ + fi; \ + done; \ + done; \ + \ + if [ x"$${GMAKE+set}" = xset ]; then \ + echo "Using GNU make found at $${GMAKE}"; \ + unset MAKELEVEL; \ + $${GMAKE} $@ ; \ + else \ + echo "You must use GNU make to build PostgreSQL." ; \ + false; \ + fi ++======= + EXTENSION = vacuum_statistics + EXTVERSION = 1.0 + MODULE_big = vacuum_statistics + PGFILEDESC = "Vacuum Statistics - extension for storage statistics of vacuum workload" + OBJS = vacuum_statistics.o + + DATA = vacuum_statistics--1.0.sql + + REGRESS = vacuum_index_statistics vacuum_tables_and_db_statistics + ISOLATION = vacuum-extending-in-repetable-read + + ifdef USE_PGXS + PG_CONFIG = pg_config + PGXS := $(shell $(PG_CONFIG) --pgxs) + include $(PGXS) + else + subdir = contrib/vacuum_statistics + top_builddir = ../.. + include $(top_builddir)/src/Makefile.global + include $(top_srcdir)/contrib/contrib-global.mk -endif ++endif ++>>>>>>> theirs