On Mon, Jul 2, 2018 at 9:39 PM, Kyotaro HORIGUCHI <horiguchi.kyot...@lab.ntt.co.jp> wrote: >> === applying patch >> ./v4-0001-Remove-entries-that-haven-t-been-used-for-a-certain-.patch > ... >> |Date: Tue, 26 Dec 2017 17:43:09 +0900 > ... >> Patching file src/backend/utils/cache/plancache.c using Plan A... >> Hunk #1 failed at 63.
That's complaining about patch 0004 in your patch set. The first 3 apply OK, but it looks like maybe 0004 includes stuff that was already in 0001? cfbot tries to apply them all. I just tried it on HEAD myself: $ patch -p1 < v4-0001-Remove-entries-that-haven-t-been-used-for-a-certain-.patch patching file doc/src/sgml/config.sgml patching file src/backend/access/transam/xact.c patching file src/backend/utils/cache/catcache.c patching file src/backend/utils/cache/plancache.c patching file src/backend/utils/misc/guc.c patching file src/backend/utils/misc/postgresql.conf.sample patching file src/include/utils/catcache.h patching file src/include/utils/plancache.h $ patch -p1 < v4-0002-introduce-dynhash-pruning.patch patching file src/backend/utils/hash/dynahash.c patching file src/include/utils/catcache.h patching file src/include/utils/hsearch.h $ patch -p1 < v4-0003-Apply-purning-to-relcache.patch patching file src/backend/utils/cache/relcache.c $ patch -p1 < v4-0004-Generic-plan-removal-of-PlanCacheSource.patch patching file src/backend/utils/cache/plancache.c Reversed (or previously applied) patch detected! Assume -R? [n] ^C Let's see, 0001 and 0004 both include this hunk: --- a/src/backend/utils/cache/plancache.c +++ b/src/backend/utils/cache/plancache.c @@ -63,12 +63,14 @@ #include "storage/lmgr.h" #include "tcop/pquery.h" #include "tcop/utility.h" +#include "utils/catcache.h" #include "utils/inval.h" --- a/src/backend/utils/cache/plancache.c +++ b/src/backend/utils/cache/plancache.c @@ -63,12 +63,14 @@ #include "storage/lmgr.h" #include "tcop/pquery.h" #include "tcop/utility.h" +#include "utils/catcache.h" #include "utils/inval.h" > On the other hand the same patch cleanly applies on the master > HEAD with no offsets. > >> $ patch -p1 < >> ~/work/patches/v4-0001-Remove-entries-that-haven-t-been-used-for-a-certain-.patch >> patching file doc/src/sgml/config.sgml >> patching file src/backend/access/transam/xact.c >> patching file src/backend/utils/cache/catcache.c >> patching file src/backend/utils/cache/plancache.c >> patching file src/backend/utils/misc/guc.c >> patching file src/backend/utils/misc/postgresql.conf.sample >> patching file src/include/utils/catcache.h >> patching file src/include/utils/plancache.h Here you show only patch 0001. > How can I find the base version the CF-bot used at the time? Yeah. Sorry. I should include that information in the log to make it clearer what it's doing. I will do that in the next update. -- Thomas Munro http://www.enterprisedb.com
