Empty label expressions and views

1 patchset tracked - current t253343_1

v1t253343_1posted Aug 07, 09:23successwon't retrystale 58dpg 20

basee58994c30 Aug 25, 08:23 on master

applyapplied Aug 25, 08:28

rebaselast tried Sep 23, 14:12 on 374522aa6

Applying: Empty label expression in view definition
Using index info to reconstruct a base tree...
A src/backend/parser/parse_graphtable.c
A src/backend/rewrite/rewriteGraphTable.c
M src/include/nodes/parsenodes.h
A src/test/regress/expected/create_property_graph.out
A src/test/regress/expected/graph_table.out
A src/test/regress/sql/create_property_graph.sql
A src/test/regress/sql/graph_table.sql
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): src/test/regress/sql/graph_table.sql deleted in HEAD and modified in Empty label expression in view definition. Version Empty label expression in view definition of src/test/regress/sql/graph_table.sql left in tree.
CONFLICT (modify/delete): src/test/regress/sql/create_property_graph.sql deleted in HEAD and modified in Empty label expression in view definition. Version Empty label expression in view definition of src/test/regress/sql/create_property_graph.sql left in tree.
CONFLICT (modify/delete): src/test/regress/expected/graph_table.out deleted in HEAD and modified in Empty label expression in view definition. Version Empty label expression in view definition of src/test/regress/expected/graph_table.out left in tree.
CONFLICT (modify/delete): src/test/regress/expected/create_property_graph.out deleted in HEAD and modified in Empty label expression in view definition. Version Empty label expression in view definition of src/test/regress/expected/create_property_graph.out left in tree.
Auto-merging src/include/nodes/parsenodes.h
CONFLICT (content): Merge conflict in src/include/nodes/parsenodes.h
CONFLICT (modify/delete): src/backend/rewrite/rewriteGraphTable.c deleted in HEAD and modified in Empty label expression in view definition. Version Empty label expression in view definition of src/backend/rewrite/rewriteGraphTable.c left in tree.
CONFLICT (modify/delete): src/backend/parser/parse_graphtable.c deleted in HEAD and modified in Empty label expression in view definition. Version Empty label expression in view definition of src/backend/parser/parse_graphtable.c left in tree.
Patch failed at 0001 Empty label expression in view definition

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/test/regress/sql/graph_table.sql, src/test/regress/sql/create_property_graph.sql, src/test/regress/expected/graph_table.out, src/test/regress/expected/create_property_graph.out, src/include/nodes/parsenodes.h, src/backend/rewrite/rewriteGraphTable.c, src/backend/parser/parse_graphtable.c

pushAug 25, 08:28 -> 16e1f159e branch diff vs base

patchsetdownload in thread

Result	Att	PG	Tests	Build / test	Image	When
success	1	20	1024 / 1024	2m 57s / 5m 38s	`docker run ... :t253343`	Aug 25, 08:39
run 32826817024 executed 1024 - ccache 98 hit / 6525 miss - head 16e1f159e - digest sha256:6d6c63e349f967... - run 32826817024
success	1	20	1023 / 1023	2m 57s / 4m 46s	`docker run ... @sha256:b77cd32...`	Aug 24, 08:39
run 32706399057 executed 1023 - ccache 98 hit / 6525 miss - head 0020e5dbc - digest sha256:b77cd32d77eb2f... - run 32706399057
success	1	20	1023 / 1023	2m 47s / 5m 24s	`docker run ... @sha256:c93d9ea...`	Aug 23, 08:35
run 32628213020 executed 1023 - ccache 98 hit / 6525 miss - head 251c81a4d - digest sha256:c93d9eabe97487... - run 32628213020
success	1	20	1023 / 1023	2m 55s / 5m 17s	`docker run ... @sha256:311754e...`	Aug 22, 08:34
run 32562176386 executed 1023 - ccache 98 hit / 6525 miss - head 1d38caf2a - digest sha256:311754e2fb4418... - run 32562176386
success	1	20	1023 / 1023	2m 56s / 5m 13s	`docker run ... @sha256:f5744b8...`	Aug 21, 08:33
run 32462921001 executed 1023 - ccache 98 hit / 6525 miss - head dba2862ca - digest sha256:f5744b8350b512... - run 32462921001
tests failed	1	20	0 / 0	2m 47s / 0m 00s	-	Aug 20, 08:29
run 32348413671 executed 0 - ccache 98 hit / 6390 miss - head 5833504e3 - run 32348413671
success	1	20	1023 / 1023	2m 55s / 5m 17s	`docker run ... @sha256:50e1364...`	Aug 19, 08:34
run 32232137273 executed 1023 - ccache 98 hit / 6525 miss - head ce08d69de - digest sha256:50e1364a99bd3a... - run 32232137273
success	1	20	1021 / 1021	2m 36s / 4m 33s	`docker run ... @sha256:86076eb...`	Aug 18, 08:29
run 32115758350 executed 1021 - ccache 98 hit / 6524 miss - head 9014b1d81 - digest sha256:86076eb978169d... - run 32115758350
success	1	20	1019 / 1019	2m 52s / 5m 24s	`docker run ... @sha256:f8ac42b...`	Aug 17, 08:31
run 32009699216 executed 1019 - ccache 98 hit / 6524 miss - head 5303e0b71 - digest sha256:f8ac42b9c49acc... - run 32009699216
success	1	20	1019 / 1019	2m 14s / 4m 10s	`docker run ... @sha256:fb97684...`	Aug 16, 08:27
run 31936076462 executed 1019 - ccache 98 hit / 6524 miss - head 1a91c19a5 - digest sha256:fb9768460806ae... - run 31936076462
success	1	20	1019 / 1019	3m 02s / 5m 56s	`docker run ... @sha256:4697b91...`	Aug 15, 08:33
run 31874058831 executed 1019 - ccache 98 hit / 6524 miss - head 262822781 - digest sha256:4697b916db96a4... - run 31874058831
success	1	20	1019 / 1019	2m 48s / 5m 09s	`docker run ... @sha256:b7be170...`	Aug 14, 08:29
run 31783146308 executed 1019 - ccache 165 hit / 6457 miss - head 1edc79dd4 - digest sha256:b7be1704b7099b... - run 31783146308
success	1	20	1019 / 1019	2m 55s / 5m 19s	`docker run ... @sha256:2be09a1...`	Aug 13, 08:29
run 31681115876 executed 1019 - ccache 165 hit / 6457 miss - head a731af34e - digest sha256:2be09a12311d15... - run 31681115876
success	1	20	1019 / 1019	2m 10s / 4m 32s	`docker run ... @sha256:4fe786f...`	Aug 12, 08:28
run 31577303103 executed 1019 - ccache 165 hit / 6457 miss - head a983b6a01 - digest sha256:4fe786ffb97032... - run 31577303103
success	1	20	1019 / 1019	2m 56s / 5m 18s	`docker run ... @sha256:9dc7e35...`	Aug 11, 08:28
run 31472176484 executed 1019 - ccache 165 hit / 6453 miss - head f658f19d8 - digest sha256:9dc7e35575e9d6... - run 31472176484
success	1	20	1019 / 1019	2m 56s / 4m 52s	`docker run ... @sha256:af08542...`	Aug 10, 08:16
run 31368522404 executed 1019 - ccache 166 hit / 6452 miss - head 9266c91c5 - digest sha256:af08542a396941... - run 31368522404
success	1	20	1019 / 1019	2m 57s / 5m 22s	`docker run ... @sha256:c713518...`	Aug 08, 09:38
run 31250600748 executed 1019 - ccache 166 hit / 6452 miss - head 8834c631e - digest sha256:c7135184567e73... - run 31250600748
success	1	20	1019 / 1019	3m 00s / 5m 37s	`docker run ... @sha256:813b510...`	Aug 07, 09:36
run 31165853126 executed 1019 - ccache 166 hit / 6452 miss - head 86ac9ceeb - digest sha256:813b51015952ad... - run 31165853126