[PATCH] Improving Visibility of Temporary Table Usage
2 patchsets tracked - current t139591_2
v2t139591_2posted Jun 25, 22:20successwon't retrystale 5mopg 19
base4cc02b807 Jun 23, 19:19 - 150 days / 1558 commits behind master (from history)
applyapplied Jul 28, 23:46
rebaselast tried Jul 28, 23:46 on 239eabda4
Applying: Add temp table monitoring columns to pg_stat_database Using index info to reconstruct a base tree... M doc/src/sgml/monitoring.sgml M src/backend/catalog/system_views.sql M src/backend/storage/buffer/bufmgr.c M src/backend/utils/adt/pgstatfuncs.c M src/include/catalog/catversion.h M src/include/catalog/pg_proc.dat M src/include/pgstat.h M src/test/regress/expected/rules.out Falling back to patching base and 3-way merge... Auto-merging src/test/regress/expected/rules.out Auto-merging src/include/pgstat.h Auto-merging src/include/catalog/pg_proc.dat Auto-merging src/include/catalog/catversion.h CONFLICT (content): Merge conflict in src/include/catalog/catversion.h Auto-merging src/backend/utils/adt/pgstatfuncs.c Auto-merging src/backend/storage/buffer/bufmgr.c Auto-merging src/backend/catalog/system_views.sql Auto-merging doc/src/sgml/monitoring.sgml Patch failed at 0001 Add temp table monitoring columns to pg_stat_database error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch hint: When you have resolved this problem, run "git am --continue". hint: If you prefer to skip this patch, run "git am --skip" instead. hint: To restore the original branch and stop patching, run "git am --abort". hint: Disable this message with "git config advice.mergeConflict false"
conflicts on master: src/include/catalog/catversion.h
pushJul 28, 23:46 -> bbc24624cbranchdiff vs base
| Result | Att | PG | Tests | Build / test | Image | When |
|---|---|---|---|---|---|---|
| success | 1 | 19 | 1005 / 1005 | 2m 52s / 5m 20s | docker run ... :t139591 | Jul 29, 00:07 |
run 30409028216executed 1005 - ccache 145 hit / 6474 miss - head bbc24624c - digest sha256:2bba4f67007105... - run 30409028216 | ||||||
v1t139591_1posted May 08, 19:28successsupersededstale 9mopg 19
baseac58465e0 Mar 10, 18:56 - 256 days / 2592 commits behind master (from history)
applyapplied Jul 26, 07:19
pushJul 27, 00:34 -> 00d06fcb4branchdiff vs base
| Result | Att | PG | Tests | Build / test | Image | When |
|---|---|---|---|---|---|---|
| success | 1 | 19 | 953 / 953 | 2m 39s / 4m 22s | docker run ... @sha256:62ada03... | Jul 27, 00:43 |
run 30227739322executed 953 - ccache 78 hit / 6504 miss - head 00d06fcb4 - digest sha256:62ada03bbec76d... - run 30227739322 | ||||||