hashjoins vs. Bloom filters (yet again)

Applying: PoC: hashjoin bloom filter pushdown
Using index info to reconstruct a base tree...
M	contrib/pg_plan_advice/expected/join_order.out
M	contrib/postgres_fdw/expected/postgres_fdw.out
M	src/backend/commands/explain.c
M	src/backend/executor/execUtils.c
M	src/backend/executor/nodeIndexonlyscan.c
M	src/backend/executor/nodeIndexscan.c
M	src/backend/executor/nodeTidscan.c
M	src/backend/optimizer/path/allpaths.c
M	src/backend/optimizer/path/costsize.c
M	src/backend/optimizer/path/equivclass.c
M	src/backend/optimizer/path/joinpath.c
M	src/backend/optimizer/plan/createplan.c
M	src/backend/optimizer/plan/planner.c
M	src/backend/optimizer/plan/setrefs.c
M	src/backend/optimizer/util/pathnode.c
M	src/backend/utils/misc/guc_parameters.dat
M	src/backend/utils/misc/postgresql.conf.sample
M	src/include/executor/executor.h
M	src/include/nodes/execnodes.h
M	src/include/nodes/pathnodes.h
M	src/include/nodes/plannodes.h
M	src/include/optimizer/cost.h
M	src/include/optimizer/pathnode.h
M	src/include/optimizer/paths.h
M	src/test/regress/expected/aggregates.out
A	src/test/regress/expected/graph_table.out
M	src/test/regress/expected/join.out
M	src/test/regress/expected/misc_functions.out
M	src/test/regress/expected/privileges.out
M	src/test/regress/expected/returning.out
M	src/test/regress/expected/rowsecurity.out
M	src/test/regress/expected/stats_ext.out
M	src/test/regress/expected/subselect.out
M	src/test/regress/expected/updatable_views.out
M	src/test/regress/sql/rowsecurity.sql
M	src/tools/pgindent/typedefs.list
Falling back to patching base and 3-way merge...
Auto-merging src/tools/pgindent/typedefs.list
Auto-merging src/test/regress/sql/rowsecurity.sql
Auto-merging src/test/regress/expected/updatable_views.out
Auto-merging src/test/regress/expected/subselect.out
Auto-merging src/test/regress/expected/stats_ext.out
Auto-merging src/test/regress/expected/rowsecurity.out
Auto-merging src/test/regress/expected/returning.out
Auto-merging src/test/regress/expected/privileges.out
Auto-merging src/test/regress/expected/misc_functions.out
Auto-merging src/test/regress/expected/join.out
CONFLICT (content): Merge conflict in src/test/regress/expected/join.out
CONFLICT (modify/delete): src/test/regress/expected/graph_table.out deleted in HEAD and modified in PoC: hashjoin bloom filter pushdown. Version PoC: hashjoin bloom filter pushdown of src/test/regress/expected/graph_table.out left in tree.
Auto-merging src/test/regress/expected/aggregates.out
Auto-merging src/include/optimizer/paths.h
Auto-merging src/include/optimizer/pathnode.h
Auto-merging src/include/optimizer/cost.h
Auto-merging src/include/nodes/plannodes.h
Auto-merging src/include/nodes/pathnodes.h
Auto-merging src/include/nodes/execnodes.h
Auto-merging src/include/executor/executor.h
Auto-merging src/backend/utils/misc/postgresql.conf.sample
Auto-merging src/backend/utils/misc/guc_parameters.dat
Auto-merging src/backend/optimizer/util/pathnode.c
Auto-merging src/backend/optimizer/plan/setrefs.c
Auto-merging src/backend/optimizer/plan/planner.c
Auto-merging src/backend/optimizer/plan/createplan.c
Auto-merging src/backend/optimizer/path/joinpath.c
Auto-merging src/backend/optimizer/path/equivclass.c
Auto-merging src/backend/optimizer/path/costsize.c
Auto-merging src/backend/optimizer/path/allpaths.c
Auto-merging src/backend/executor/nodeTidscan.c
Auto-merging src/backend/executor/nodeIndexscan.c
Auto-merging src/backend/executor/nodeIndexonlyscan.c
Auto-merging src/backend/executor/execUtils.c
Auto-merging src/backend/commands/explain.c
CONFLICT (content): Merge conflict in src/backend/commands/explain.c
Auto-merging contrib/postgres_fdw/expected/postgres_fdw.out
Auto-merging contrib/pg_plan_advice/expected/join_order.out
Patch failed at 0001 PoC: hashjoin bloom filter pushdown

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"