Parallel tuplesort (for parallel B-Tree index creation)

back to CI dashboard

1 patchset tracked - current t35010_275

v275t35010_275posted Feb 06, 2018successwon't retryancient 9ypg 11
base9da0cc352 Feb 02, 2018 - 3151 days / 21223 commits behind master (from history)
applyapplied Aug 18, 16:51
rebaselast tried Aug 18, 16:51 on 195e8e427
Applying: Mark logtape.c buffer's tail as defined to Valgrind.
Using index info to reconstruct a base tree...
M	src/backend/utils/sort/logtape.c
Falling back to patching base and 3-way merge...
Auto-merging src/backend/utils/sort/logtape.c
CONFLICT (content): Merge conflict in src/backend/utils/sort/logtape.c
Patch failed at 0001 Mark logtape.c buffer's tail as defined to Valgrind.

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/utils/sort/logtape.c
pushAug 18, 16:51 -> 37319d2e9branchdiff vs base
ResultAttPGTestsBuild / testImageWhen
success111479 / 4791m 53s / 2m 36sdocker run ... :t35010Aug 18, 16:58
run 32162536294
executed 479 - ccache 176 hit / 4814 miss - head 37319d2e9 - digest sha256:4a6cc6f08a094a... - run 32162536294