explain analyze rows=%.0f
1 patchset tracked - current t22467_104
v104t22467_104posted Apr 09, 2025successwon't retryancient 1ypg 18
based69d45a5a Apr 08, 2025 - 529 days / 4300 commits behind master (from history)
applyapplied Aug 18, 14:31
rebaselast tried Aug 18, 14:31 on 195e8e427
Applying: Always use two fractional digits for estimated rows count Using index info to reconstruct a base tree... M contrib/file_fdw/file_fdw.c M contrib/postgres_fdw/postgres_fdw.c M contrib/tsm_system_rows/tsm_system_rows.c M contrib/tsm_system_time/tsm_system_time.c M src/backend/access/table/tableam.c M src/backend/access/tablesample/bernoulli.c M src/backend/access/tablesample/system.c M src/backend/commands/explain.c M src/backend/optimizer/path/costsize.c M src/backend/optimizer/util/pathnode.c M src/backend/utils/adt/selfuncs.c M src/include/optimizer/optimizer.h Falling back to patching base and 3-way merge... Auto-merging src/include/optimizer/optimizer.h Auto-merging src/backend/utils/adt/selfuncs.c Auto-merging src/backend/optimizer/util/pathnode.c CONFLICT (content): Merge conflict in src/backend/optimizer/util/pathnode.c Auto-merging src/backend/optimizer/path/costsize.c Auto-merging src/backend/commands/explain.c Auto-merging src/backend/access/tablesample/system.c Auto-merging src/backend/access/tablesample/bernoulli.c Auto-merging src/backend/access/table/tableam.c Auto-merging contrib/tsm_system_time/tsm_system_time.c Auto-merging contrib/tsm_system_rows/tsm_system_rows.c Auto-merging contrib/postgres_fdw/postgres_fdw.c Auto-merging contrib/file_fdw/file_fdw.c Patch failed at 0001 Always use two fractional digits for estimated rows count 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/optimizer/util/pathnode.c
pushAug 18, 14:31 -> 9ce661054branchdiff vs base
| Result | Att | PG | Tests | Build / test | Image | When |
|---|---|---|---|---|---|---|
| success | 1 | 18 | 890 / 890 | 2m 40s / 6m 01s | docker run ... :t22467 | Aug 18, 14:44 |
run 32148869740executed 890 - ccache 94 hit / 6452 miss - head 9ce661054 - digest sha256:26ddf8dc13c5b0... - run 32148869740 | ||||||