Replace literal 0 values with the appropriate Invalid* constants
1 patchset tracked - current t53300_1
v1t53300_1posted Feb 12, 10:15successwon't retrystale 34dpg 20
base4fb6e9eb7 Aug 17, 00:20 on master
applyapplied Aug 17, 01:10
rebaselast tried 6 days ago on a625fc570
Applying: Replace literal 0 with InvalidAttrNumber for AttrNumber assignments Using index info to reconstruct a base tree... M contrib/pg_visibility/pg_visibility.c M contrib/postgres_fdw/postgres_fdw.c M src/backend/access/common/printtup.c M src/backend/access/common/tupdesc.c M src/backend/catalog/heap.c M src/backend/commands/copyfrom.c M src/backend/commands/indexcmds.c M src/backend/commands/sequence.c M src/backend/commands/tablecmds.c M src/backend/executor/execExpr.c M src/backend/executor/execJunk.c M src/backend/executor/execMain.c M src/backend/executor/execTuples.c M src/backend/executor/nodeFunctionscan.c M src/backend/executor/nodeIndexscan.c M src/backend/statistics/attribute_stats.c M src/backend/statistics/dependencies.c M src/backend/utils/adt/pg_dependencies.c M src/backend/utils/adt/selfuncs.c Falling back to patching base and 3-way merge... Auto-merging src/backend/utils/adt/selfuncs.c Auto-merging src/backend/utils/adt/pg_dependencies.c Auto-merging src/backend/statistics/dependencies.c Auto-merging src/backend/statistics/attribute_stats.c Auto-merging src/backend/executor/nodeIndexscan.c Auto-merging src/backend/executor/nodeFunctionscan.c Auto-merging src/backend/executor/execTuples.c Auto-merging src/backend/executor/execMain.c Auto-merging src/backend/executor/execJunk.c CONFLICT (content): Merge conflict in src/backend/executor/execJunk.c Auto-merging src/backend/executor/execExpr.c Auto-merging src/backend/commands/tablecmds.c Auto-merging src/backend/commands/sequence.c Auto-merging src/backend/commands/indexcmds.c Auto-merging src/backend/commands/copyfrom.c Auto-merging src/backend/catalog/heap.c Auto-merging src/backend/access/common/tupdesc.c Auto-merging src/backend/access/common/printtup.c Auto-merging contrib/postgres_fdw/postgres_fdw.c Auto-merging contrib/pg_visibility/pg_visibility.c Patch failed at 0001 Replace literal 0 with InvalidAttrNumber for AttrNumber assignments 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/backend/executor/execJunk.c
pushAug 17, 01:10 -> 56587f00ebranchdiff vs base
| Result | Att | PG | Tests | Build / test | Image | When |
|---|---|---|---|---|---|---|
| success | 1 | 20 | 1019 / 1019 | 2m 56s / 5m 37s | docker run ... :t53300 | Aug 17, 01:21 |
run 31984172675executed 1019 - ccache 98 hit / 6524 miss - head 56587f00e - digest sha256:a4be4628665e58... - run 31984172675 | ||||||
| success | 1 | 20 | 1019 / 1019 | 1m 47s / 4m 17s | docker run ... @sha256:e9d0404... | Aug 16, 01:03 |
run 31918347832executed 1019 - ccache 98 hit / 6524 miss - head 1819dab48 - digest sha256:e9d0404b663a30... - run 31918347832 | ||||||
| success | 1 | 20 | 1019 / 1019 | 2m 55s / 5m 24s | docker run ... @sha256:49a65e5... | Aug 15, 01:04 |
run 31854952702executed 1019 - ccache 98 hit / 6524 miss - head 6694461c9 - digest sha256:49a65e59a1e7ee... - run 31854952702 | ||||||
| success | 1 | 20 | 1019 / 1019 | 2m 55s / 5m 23s | docker run ... @sha256:42f4aa8... | Aug 14, 01:02 |
run 31758787486executed 1019 - ccache 165 hit / 6457 miss - head c594b9133 - digest sha256:42f4aa8d67062c... - run 31758787486 | ||||||
| success | 1 | 20 | 1019 / 1019 | 2m 49s / 5m 25s | docker run ... @sha256:1648d89... | Aug 13, 01:02 |
run 31655791896executed 1019 - ccache 165 hit / 6457 miss - head 62eeb4854 - digest sha256:1648d89642248f... - run 31655791896 | ||||||
| success | 1 | 20 | 1019 / 1019 | 2m 55s / 5m 33s | docker run ... @sha256:c20b71b... | Aug 12, 01:00 |
run 31551494253executed 1019 - ccache 165 hit / 6453 miss - head 4e6c4dab0 - digest sha256:c20b71b4ae3c1f... - run 31551494253 | ||||||
| success | 1 | 20 | 1019 / 1019 | 2m 18s / 4m 12s | docker run ... @sha256:843895f... | Aug 11, 00:56 |
run 31447224008executed 1019 - ccache 165 hit / 6453 miss - head beec40745 - digest sha256:843895f5a194cf... - run 31447224008 | ||||||
| success | 1 | 20 | 1019 / 1019 | 2m 09s / 4m 30s | docker run ... @sha256:ed3714e... | Aug 10, 00:55 |
run 31345303605executed 1019 - ccache 166 hit / 6452 miss - head f23607d72 - digest sha256:ed3714e1b4327f... - run 31345303605 | ||||||
| success | 1 | 20 | 1019 / 1019 | 2m 47s / 5m 22s | docker run ... @sha256:6871b25... | Aug 07, 23:05 |
run 31224990678executed 1019 - ccache 166 hit / 6452 miss - head 3dd79ffcb - digest sha256:6871b256351f39... - run 31224990678 | ||||||
| success | 1 | 20 | 1018 / 1018 | 2m 56s / 5m 11s | docker run ... @sha256:fa5b867... | Aug 07, 00:22 |
run 31129766575executed 1018 - ccache 166 hit / 6452 miss - head 6c83c3701 - digest sha256:fa5b867134b63e... - run 31129766575 | ||||||
| success | 1 | 20 | 1018 / 1018 | 2m 55s / 5m 27s | docker run ... @sha256:c00de8a... | Aug 05, 17:36 |
run 31029550016executed 1018 - ccache 166 hit / 6452 miss - head 5b059d39b - digest sha256:c00de8ac69bc16... - run 31029550016 | ||||||
| success | 1 | 20 | 1018 / 1018 | 2m 52s / 5m 30s | docker run ... @sha256:6abea85... | Aug 04, 17:32 |
run 30933345150executed 1018 - ccache 166 hit / 6452 miss - head 6068bd84a - digest sha256:6abea85ad21ef1... - run 30933345150 | ||||||
| success | 1 | 20 | 1017 / 1017 | 2m 54s / 5m 12s | docker run ... @sha256:fee9230... | Aug 03, 17:31 |
run 30836064836executed 1017 - ccache 166 hit / 6452 miss - head 628d98d86 - digest sha256:fee9230eb3bfac... - run 30836064836 | ||||||
| success | 1 | 20 | 1017 / 1017 | 2m 57s / 5m 47s | docker run ... @sha256:75ff98c... | Aug 02, 17:32 |
run 30758502422executed 1017 - ccache 166 hit / 6452 miss - head 8a97bb1a9 - digest sha256:75ff98c5a0d8ba... - run 30758502422 | ||||||
| success | 1 | 20 | 1017 / 1017 | 2m 54s / 5m 10s | docker run ... @sha256:df29377... | Aug 01, 17:26 |
run 30709908261executed 1017 - ccache 166 hit / 6452 miss - head 5f3fcce2a - digest sha256:df293779dfdc27... - run 30709908261 | ||||||
| success | 1 | 20 | 1017 / 1017 | 2m 57s / 5m 37s | docker run ... @sha256:9d6f17e... | Jul 31, 17:33 |
run 30650369329executed 1017 - ccache 166 hit / 6452 miss - head c2a163c46 - digest sha256:9d6f17ec62c83a... - run 30650369329 | ||||||
| success | 1 | 20 | 1016 / 1016 | 2m 56s / 5m 25s | docker run ... @sha256:729fde0... | Jul 30, 17:22 |
run 30564866953executed 1016 - ccache 166 hit / 6452 miss - head 1a5bc27da - digest sha256:729fde0ae71301... - run 30564866953 | ||||||
| success | 1 | 20 | 1016 / 1016 | 2m 48s / 5m 21s | docker run ... @sha256:b2d7351... | Jul 29, 17:21 |
run 30474120503executed 1016 - ccache 166 hit / 6452 miss - head c535c7be8 - digest sha256:b2d73514b99671... - run 30474120503 | ||||||
| success | 1 | 20 | 1014 / 1014 | 2m 53s / 5m 15s | docker run ... @sha256:2e98360... | Jul 28, 17:28 |
run 30381576993executed 1014 - ccache 166 hit / 6452 miss - head 5a0504dde - digest sha256:2e98360d64001e... - run 30381576993 | ||||||
| success | 1 | 20 | 1013 / 1013 | 2m 47s / 5m 27s | docker run ... @sha256:898822a... | Jul 27, 04:05 |
run 30235720455executed 1013 - ccache 166 hit / 6452 miss - head 79914d9ad - digest sha256:898822a693bf32... - run 30235720455 | ||||||