Proposal to allow setting cursor options on Portals

3 patchsets tracked - current t52830_49

v49t52830_49posted Sep 10, 21:50never appliedstale 44dpg 20apply failed

v48t52830_48posted Sep 09, 22:04successsupersededrecent 24dpg 20

base45277ca0d Oct 01, 02:15 on master

applyapplied Oct 01, 02:58

rebaselast tried 10 minutes ago on 4075409de

Applying: Add _pq_.cursor protocol extension for cursor options in Bind
Using index info to reconstruct a base tree...
M	doc/src/sgml/libpq.sgml
M	doc/src/sgml/protocol.sgml
M	src/include/libpq/protocol.h
M	src/interfaces/libpq/fe-connect.c
M	src/interfaces/libpq/libpq-int.h
M	src/test/modules/libpq_pipeline/libpq_pipeline.c
Falling back to patching base and 3-way merge...
Auto-merging src/test/modules/libpq_pipeline/libpq_pipeline.c
CONFLICT (content): Merge conflict in src/test/modules/libpq_pipeline/libpq_pipeline.c
Auto-merging src/interfaces/libpq/libpq-int.h
Auto-merging src/interfaces/libpq/fe-connect.c
Auto-merging src/include/libpq/protocol.h
Auto-merging doc/src/sgml/protocol.sgml
Auto-merging doc/src/sgml/libpq.sgml
Patch failed at 0001 Add _pq_.cursor protocol extension for cursor options in Bind

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/modules/libpq_pipeline/libpq_pipeline.c

pushOct 01, 02:59 -> 5aa6f7894 branch diff vs base

patchsetdownload in thread

Result	Att	PG	Tests	Build / test	Image	When
success	1	20	1039 / 1039	2m 48s / 4m 57s	`docker run ... :t52830`	Oct 01, 03:10
run 36808379550 executed 1039 - ccache 78 hit / 6544 miss - head 5aa6f7894 - digest sha256:9e7477f8c12589... - run 36808379550
success	1	20	1039 / 1039	2m 52s / 5m 27s	`docker run ... @sha256:dd95838...`	Sep 30, 03:08
run 36662226099 executed 1039 - ccache 78 hit / 6544 miss - head 3504dc39d - digest sha256:dd958383edbd40... - run 36662226099
success	1	20	1039 / 1039	2m 52s / 5m 25s	`docker run ... @sha256:ec5b144...`	Sep 29, 03:06
run 36514864662 executed 1039 - ccache 78 hit / 6544 miss - head 92d93d460 - digest sha256:ec5b144fb4dcd7... - run 36514864662
success	1	20	1039 / 1039	1m 44s / 4m 01s	`docker run ... @sha256:041ebd6...`	Sep 28, 03:01
run 36371562501 executed 1039 - ccache 78 hit / 6544 miss - head 3cf9f9d40 - digest sha256:041ebd641035e7... - run 36371562501
success	1	20	1039 / 1039	1m 44s / 4m 10s	`docker run ... @sha256:9c9b178...`	Sep 26, 22:28
run 36275975473 executed 1039 - ccache 78 hit / 6544 miss - head 08c4aba0e - digest sha256:9c9b1785eec840... - run 36275975473
success	1	20	1039 / 1039	2m 52s / 5m 28s	`docker run ... @sha256:2de787e...`	Sep 25, 22:31
run 36196169495 executed 1039 - ccache 78 hit / 6544 miss - head c499f8e29 - digest sha256:2de787e74e798d... - run 36196169495
success	1	20	1038 / 1038	3m 00s / 5m 41s	`docker run ... @sha256:ca34001...`	Sep 24, 22:29
run 36066719751 executed 1038 - ccache 78 hit / 6544 miss - head 3312ef6fc - digest sha256:ca340018d696a5... - run 36066719751
success	1	20	1036 / 1036	2m 15s / 4m 28s	`docker run ... @sha256:a9748eb...`	Sep 23, 22:26
run 35927501722 executed 1036 - ccache 98 hit / 6524 miss - head 15f1838c8 - digest sha256:a9748ebcefe48a... - run 35927501722
success	1	20	1036 / 1036	2m 53s / 5m 15s	`docker run ... @sha256:4ea5045...`	Sep 22, 22:27
run 35791427256 executed 1036 - ccache 98 hit / 6524 miss - head d4147f442 - digest sha256:4ea50453143db7... - run 35791427256
success	1	20	1036 / 1036	1m 42s / 4m 06s	`docker run ... @sha256:52c98c7...`	Sep 21, 22:22
run 35661640071 executed 1036 - ccache 98 hit / 6524 miss - head 52392838f - digest sha256:52c98c73a3dbbb... - run 35661640071
success	1	20	1036 / 1036	2m 54s / 5m 15s	`docker run ... @sha256:55ae9a8...`	Sep 20, 22:23
run 35540990870 executed 1036 - ccache 98 hit / 6524 miss - head 1a9c32ae8 - digest sha256:55ae9a85d88280... - run 35540990870
success	1	20	1036 / 1036	1m 42s / 3m 59s	`docker run ... @sha256:25bc9e2...`	Sep 19, 22:20
run 35472671517 executed 1036 - ccache 98 hit / 6524 miss - head 17ea03374 - digest sha256:25bc9e2fee2417... - run 35472671517
success	1	20	1036 / 1036	2m 52s / 5m 13s	`docker run ... @sha256:eed06aa...`	Sep 18, 22:22
run 35400488939 executed 1036 - ccache 98 hit / 6524 miss - head 61b331212 - digest sha256:eed06aa6f70770... - run 35400488939
success	1	20	1036 / 1036	2m 51s / 5m 12s	`docker run ... @sha256:bdff5ad...`	Sep 17, 22:22
run 35280781140 executed 1036 - ccache 98 hit / 6524 miss - head 68bb4a3b6 - digest sha256:bdff5ad3d56e64... - run 35280781140
success	1	20	1036 / 1036	2m 51s / 5m 26s	`docker run ... @sha256:dfb301c...`	Sep 16, 22:21
run 35156341335 executed 1036 - ccache 98 hit / 6524 miss - head 9b24f88e3 - digest sha256:dfb301c0b546fa... - run 35156341335
success	1	20	1036 / 1036	2m 53s / 5m 30s	`docker run ... @sha256:ad0d7fc...`	Sep 15, 22:21
run 35029548332 executed 1036 - ccache 98 hit / 6524 miss - head 6ff4f54f0 - digest sha256:ad0d7fc8455ba9... - run 35029548332
success	1	20	1036 / 1036	2m 51s / 5m 13s	`docker run ... @sha256:a38ac99...`	Sep 14, 22:19
run 34902657269 executed 1036 - ccache 98 hit / 6523 miss - head 314d5a2e3 - digest sha256:a38ac99c8fa0e5... - run 34902657269
success	1	20	1023 / 1023	2m 52s / 5m 25s	`docker run ... @sha256:8e59362...`	Sep 13, 22:19
run 34785912465 executed 1023 - ccache 98 hit / 6523 miss - head 7d8a3ac9c - digest sha256:8e59362e94abe9... - run 34785912465
success	1	20	1023 / 1023	2m 57s / 5m 17s	`docker run ... @sha256:de554ac...`	Sep 12, 22:18
run 34721875616 executed 1023 - ccache 98 hit / 6523 miss - head e145a6178 - digest sha256:de554ac27b8843... - run 34721875616
success	1	20	1023 / 1023	2m 49s / 5m 26s	`docker run ... @sha256:0eda33f...`	Sep 11, 22:17
run 34652569508 executed 1023 - ccache 98 hit / 6523 miss - head c41ef28f2 - digest sha256:0eda33f2223817... - run 34652569508
success	1	20	1022 / 1022	2m 48s / 5m 13s	`docker run ... @sha256:c57e3f1...`	Sep 10, 22:16
run 34535718022 executed 1022 - ccache 98 hit / 6523 miss - head 54faa843d - digest sha256:c57e3f1ba88e5e... - run 34535718022
success	1	20	1021 / 1021	2m 58s / 5m 21s	`docker run ... @sha256:6837d0b...`	Sep 09, 22:16
run 34410416473 executed 1021 - ccache 98 hit / 6523 miss - head 447d3c8d9 - digest sha256:6837d0bb9891db... - run 34410416473

v46t52830_46posted Mar 25, 14:34successsupersededstale 53dpg 20

base076630cbd Sep 01, 13:46 on master

applyapplied Sep 01, 13:59

rebaselast tried Sep 09, 12:18 on 412ef97d9

Applying: Add _pq_.cursor protocol extension for cursor options
Using index info to reconstruct a base tree...
M	doc/src/sgml/libpq.sgml
M	doc/src/sgml/protocol.sgml
M	src/backend/tcop/backend_startup.c
M	src/backend/tcop/postgres.c
M	src/interfaces/libpq/fe-connect.c
M	src/interfaces/libpq/fe-exec.c
M	src/interfaces/libpq/fe-protocol3.c
M	src/interfaces/libpq/libpq-fe.h
M	src/interfaces/libpq/libpq-int.h
M	src/test/modules/Makefile
M	src/test/modules/meson.build
Falling back to patching base and 3-way merge...
Auto-merging src/test/modules/meson.build
Auto-merging src/test/modules/Makefile
Auto-merging src/interfaces/libpq/libpq-int.h
Auto-merging src/interfaces/libpq/libpq-fe.h
Auto-merging src/interfaces/libpq/fe-protocol3.c
CONFLICT (content): Merge conflict in src/interfaces/libpq/fe-protocol3.c
Auto-merging src/interfaces/libpq/fe-exec.c
Auto-merging src/interfaces/libpq/fe-connect.c
Auto-merging src/backend/tcop/postgres.c
Auto-merging src/backend/tcop/backend_startup.c
Auto-merging doc/src/sgml/protocol.sgml
Auto-merging doc/src/sgml/libpq.sgml
Patch failed at 0001 Add _pq_.cursor protocol extension for cursor options

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/interfaces/libpq/fe-protocol3.c

pushSep 01, 13:59 -> fca94d91a branch diff vs base

patchsetdownload in thread

Result	Att	PG	Tests	Build / test	Image	When
success	1	20	1023 / 1023	2m 58s / 5m 24s	`docker run ... @sha256:c7017f8...`	Sep 01, 14:10
run 33516713206 executed 1023 - ccache 98 hit / 6527 miss - head fca94d91a - digest sha256:c7017f8a5bb82e... - run 33516713206
success	1	20	1023 / 1023	2m 48s / 5m 27s	`docker run ... @sha256:33209f6...`	Aug 31, 14:07
run 33399583638 executed 1023 - ccache 98 hit / 6527 miss - head 554361c31 - digest sha256:33209f6afe0508... - run 33399583638
success	1	20	1022 / 1022	2m 38s / 4m 39s	`docker run ... @sha256:b8c327e...`	Aug 30, 14:02
run 33315349777 executed 1022 - ccache 98 hit / 6526 miss - head e88ae61aa - digest sha256:b8c327ec082e8f... - run 33315349777
success	1	20	1022 / 1022	2m 58s / 5m 28s	`docker run ... @sha256:f91d62b...`	Aug 29, 14:03
run 33256067056 executed 1022 - ccache 98 hit / 6526 miss - head db37ae6d8 - digest sha256:f91d62b352821e... - run 33256067056
success	1	20	1022 / 1022	2m 49s / 5m 10s	`docker run ... @sha256:6560aec...`	Aug 28, 14:00
run 33177218431 executed 1022 - ccache 98 hit / 6526 miss - head d2e445c3c - digest sha256:6560aec6b25b7c... - run 33177218431
success	1	20	1022 / 1022	2m 54s / 5m 09s	`docker run ... @sha256:c7acf49...`	Aug 27, 13:58
run 33078748922 executed 1022 - ccache 98 hit / 6526 miss - head 4c7da2143 - digest sha256:c7acf4991f46a6... - run 33078748922
success	1	20	1025 / 1025	2m 55s / 5m 00s	`docker run ... @sha256:bad2371...`	Aug 26, 13:49
run 32974726007 executed 1025 - ccache 98 hit / 6526 miss - head 4a9d72bc1 - digest sha256:bad2371d0434e6... - run 32974726007
success	1	20	1025 / 1025	2m 50s / 5m 18s	`docker run ... @sha256:1713d7f...`	Aug 25, 13:33
run 32852957585 executed 1025 - ccache 98 hit / 6526 miss - head cd7b78a7e - digest sha256:1713d7fd0ed018... - run 32852957585
success	1	20	1024 / 1024	2m 47s / 5m 22s	`docker run ... @sha256:a1581ab...`	Aug 24, 13:32
run 32732283305 executed 1024 - ccache 98 hit / 6526 miss - head e1a896430 - digest sha256:a1581ab124999b... - run 32732283305
success	1	20	1024 / 1024	2m 21s / 4m 22s	`docker run ... @sha256:d4c9b1f...`	Aug 23, 13:30
run 32642088979 executed 1024 - ccache 98 hit / 6526 miss - head eb87a4db6 - digest sha256:d4c9b1fa96156e... - run 32642088979
success	1	20	1024 / 1024	2m 47s / 5m 27s	`docker run ... @sha256:8ef8317...`	Aug 22, 13:31
run 32575484477 executed 1024 - ccache 98 hit / 6526 miss - head 452bbe3f5 - digest sha256:8ef83176c9e61a... - run 32575484477
success	1	20	1024 / 1024	2m 56s / 5m 18s	`docker run ... @sha256:c39df83...`	Aug 21, 13:31
run 32486144225 executed 1024 - ccache 98 hit / 6526 miss - head 1150e0bd8 - digest sha256:c39df836965b80... - run 32486144225
success	1	20	1024 / 1024	2m 53s / 5m 34s	`docker run ... @sha256:a178dca...`	Aug 20, 13:28
run 32373347829 executed 1024 - ccache 98 hit / 6526 miss - head 79cac7787 - digest sha256:a178dca2bdc628... - run 32373347829
success	1	20	1024 / 1024	2m 18s / 4m 44s	`docker run ... @sha256:fb8d2e5...`	Aug 19, 13:25
run 32256897537 executed 1024 - ccache 98 hit / 6526 miss - head a5aec38e8 - digest sha256:fb8d2e5377330e... - run 32256897537
success	1	20	1022 / 1022	2m 57s / 5m 59s	`docker run ... @sha256:9354030...`	Aug 18, 13:10
run 32139620143 executed 1022 - ccache 98 hit / 6526 miss - head 5f9034d24 - digest sha256:93540307efb529... - run 32139620143
success	1	20	1020 / 1020	2m 45s / 4m 49s	`docker run ... @sha256:b8675ad...`	Aug 17, 13:08
run 32032371097 executed 1020 - ccache 98 hit / 6525 miss - head 8047d3abe - digest sha256:b8675adcd83ead... - run 32032371097
success	1	20	1020 / 1020	2m 10s / 4m 43s	`docker run ... @sha256:f8340ad...`	Aug 16, 13:03
run 31948311255 executed 1020 - ccache 98 hit / 6525 miss - head e8c7ed134 - digest sha256:f8340ad4ff1d7c... - run 31948311255
success	1	20	1020 / 1020	3m 02s / 5m 19s	`docker run ... @sha256:36de4e0...`	Aug 15, 13:05
run 31885717194 executed 1020 - ccache 98 hit / 6525 miss - head e64a22ae7 - digest sha256:36de4e0b875d01... - run 31885717194
success	1	20	1020 / 1020	2m 13s / 4m 20s	`docker run ... @sha256:a601cef...`	Aug 14, 13:01
run 31802081838 executed 1020 - ccache 98 hit / 6525 miss - head a64b17c65 - digest sha256:a601cef35fa1ab... - run 31802081838
success	1	20	1020 / 1020	2m 47s / 5m 25s	`docker run ... @sha256:80b7349...`	Aug 13, 13:03
run 31701811322 executed 1020 - ccache 98 hit / 6525 miss - head 72b8a8d5d - digest sha256:80b73494caa891... - run 31701811322
success	1	20	1020 / 1020	3m 01s / 5m 40s	`docker run ... @sha256:73b24f6...`	Aug 12, 13:02
run 31598126118 executed 1020 - ccache 98 hit / 6525 miss - head d6d123922 - digest sha256:73b24f6a40e08a... - run 31598126118
success	1	20	1020 / 1020	2m 55s / 5m 27s	`docker run ... @sha256:718f0e9...`	Aug 11, 13:03
run 31492718466 executed 1020 - ccache 98 hit / 6521 miss - head 56c149b3c - digest sha256:718f0e960f001c... - run 31492718466
success	1	20	1020 / 1020	2m 51s / 5m 11s	`docker run ... @sha256:9d0abbd...`	Aug 10, 12:49
run 31388970161 executed 1020 - ccache 98 hit / 6521 miss - head 930f0580e - digest sha256:9d0abbd3281343... - run 31388970161
success	1	20	1020 / 1020	2m 48s / 5m 27s	`docker run ... @sha256:0e7aabb...`	Aug 08, 20:20
run 31276231497 executed 1020 - ccache 98 hit / 6521 miss - head 14f7ff668 - digest sha256:0e7aabb4f9dbfa... - run 31276231497
success	1	20	1019 / 1019	2m 56s / 5m 38s	`docker run ... @sha256:0d1c39c...`	Aug 05, 17:02
run 31027090946 executed 1019 - ccache 98 hit / 6521 miss - head fc94b8ee7 - digest sha256:0d1c39cce21bfd... - run 31027090946
success	1	20	1019 / 1019	2m 52s / 5m 35s	`docker run ... @sha256:784a0fe...`	Aug 04, 17:00
run 30930899772 executed 1019 - ccache 98 hit / 6521 miss - head 1979171b9 - digest sha256:784a0fe8e4e22c... - run 30930899772
success	1	20	1018 / 1018	2m 56s / 5m 19s	`docker run ... @sha256:4143c7e...`	Aug 03, 16:59
run 30833750845 executed 1018 - ccache 98 hit / 6521 miss - head 606f4a1ee - digest sha256:4143c7ea3034eb... - run 30833750845
success	1	20	1018 / 1018	2m 54s / 5m 11s	`docker run ... @sha256:052c9f3...`	Aug 02, 16:58
run 30757398720 executed 1018 - ccache 98 hit / 6521 miss - head d38e15155 - digest sha256:052c9f3636abae... - run 30757398720
success	1	20	1018 / 1018	2m 17s / 4m 57s	`docker run ... @sha256:f627640...`	Aug 01, 16:57
run 30708865818 executed 1018 - ccache 98 hit / 6521 miss - head 9807b9a50 - digest sha256:f62764058f1099... - run 30708865818
success	1	20	1018 / 1018	2m 56s / 5m 28s	`docker run ... @sha256:645a620...`	Jul 31, 16:58
run 30648436683 executed 1018 - ccache 98 hit / 6521 miss - head febcb37a4 - digest sha256:645a620a2d861a... - run 30648436683
success	1	20	1017 / 1017	2m 52s / 5m 08s	`docker run ... @sha256:2e1a960...`	Jul 30, 16:56
run 30562876172 executed 1017 - ccache 98 hit / 6521 miss - head 7c1dbbe25 - digest sha256:2e1a960862928b... - run 30562876172
success	1	20	1017 / 1017	2m 54s / 5m 13s	`docker run ... @sha256:b777287...`	Jul 29, 16:56
run 30472137113 executed 1017 - ccache 98 hit / 6521 miss - head 6740faf7a - digest sha256:b7772870c50651... - run 30472137113
success	1	20	1015 / 1015	2m 53s / 5m 24s	`docker run ... @sha256:5b145bd...`	Jul 28, 16:57
run 30379553858 executed 1015 - ccache 98 hit / 6521 miss - head acc524202 - digest sha256:5b145bd80da418... - run 30379553858
success	1	20	1014 / 1014	2m 54s / 5m 08s	`docker run ... @sha256:4fa9be6...`	Jul 27, 02:52
run 30232779142 executed 1014 - ccache 98 hit / 6521 miss - head 9357f8313 - digest sha256:4fa9be6ff69290... - run 30232779142