BUG #19912: MERGE NOT MATCHED BY SOURCE sees stale source values after concurrent update (EPQ)
2 patchsets tracked - current t259287_3
v3t259287_3posted 4 days agosuccesswon't retryrecent 1dpg 20
base4a26e36f8 2 days ago on master
applyapplied 2 days ago
rebaselast tried 1 day ago on b291954ea
Applying: Use EPQ tuple for MERGE NOT MATCHED BY SOURCE actions Using index info to reconstruct a base tree... M src/backend/executor/nodeModifyTable.c Falling back to patching base and 3-way merge... Auto-merging src/backend/executor/nodeModifyTable.c CONFLICT (content): Merge conflict in src/backend/executor/nodeModifyTable.c Patch failed at 0001 Use EPQ tuple for MERGE NOT MATCHED BY SOURCE actions 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/nodeModifyTable.c
push2 days ago -> 373bbc94dbranchdiff vs base
| Result | Att | PG | Tests | Build / test | Image | When |
|---|---|---|---|---|---|---|
| success | 1 | 20 | 1069 / 1069 | 3m 03s / 5m 44s | docker run ... :t259287 | 2 days ago |
run 44737064519executed 1069 - ccache 78 hit / 6547 miss - head 373bbc94d - digest sha256:2b1e82a6a8cea8... - run 44737064519 | ||||||
| success | 1 | 20 | 1068 / 1068 | 1m 52s / 4m 22s | docker run ... @sha256:65a99e9... | 3 days ago |
run 44525166795executed 1068 - ccache 78 hit / 6547 miss - head e6e3981f3 - digest sha256:65a99e9b684006... - run 44525166795 | ||||||
| success | 1 | 20 | 1067 / 1067 | 1m 55s / 4m 15s | docker run ... @sha256:fd86382... | 4 days ago |
run 44304860657executed 1067 - ccache 78 hit / 6547 miss - head 7e3929390 - digest sha256:fd863824e0629b... - run 44304860657 | ||||||
v2t259287_2posted 4 days agosuccesssupersededrecent 3dpg 20
based9c6f22c3 4 days ago on master
applyapplied 4 days ago
rebaselast tried 4 days ago on d9c6f22c3
push4 days ago -> a8b6cba6abranchdiff vs base
| Result | Att | PG | Tests | Build / test | Image | When |
|---|---|---|---|---|---|---|
| success | 1 | 20 | 1067 / 1067 | 3m 04s / 5m 33s | docker run ... @sha256:96b5123... | 4 days ago |
run 44218112072executed 1067 - ccache 78 hit / 6547 miss - head a8b6cba6a - digest sha256:96b512380e57ca... - run 44218112072 | ||||||