Adding a stored generated column without long-lived locks

back to CI dashboard

9 patchsets tracked - current t53518_45

v45t53518_45posted 4 days agosuccessappliesrecent 0dpg 20
base9b5d4e333 about 22 hours ago on master
applyapplied about 1 hour ago
rebaselast tried about 1 hour ago on 9b5d4e333
pushabout 1 hour ago -> fc306ed77branchdiff vs base
ResultAttPGTestsBuild / testImageWhen
success1201071 / 10712m 17s / 4m 53sdocker run ... :t5351836 minutes ago
run 45045846505
executed 1071 - ccache 78 hit / 6547 miss - head fc306ed77 - digest sha256:51d828f1dee201... - run 45045846505
success1201071 / 10712m 15s / 4m 49sdocker run ... @sha256:dbd867c...1 day ago
run 44926368115
executed 1071 - ccache 78 hit / 6547 miss - head 54c0b19d7 - digest sha256:dbd867c09aad9f... - run 44926368115
success1201070 / 10702m 50s / 4m 51sdocker run ... @sha256:f432ade...2 days ago
run 44776405216
executed 1070 - ccache 78 hit / 6547 miss - head 9a29d7059 - digest sha256:f432ade313d797... - run 44776405216
success1201069 / 10692m 20s / 4m 37sdocker run ... @sha256:2fe04ba...3 days ago
run 44569419322
executed 1069 - ccache 78 hit / 6547 miss - head 6d6716870 - digest sha256:2fe04bad6d92e9... - run 44569419322
success1201068 / 10682m 35s / 4m 42sdocker run ... @sha256:fe9fbf8...4 days ago
run 44350220433
executed 1068 - ccache 78 hit / 6547 miss - head d36ffc013 - digest sha256:fe9fbf879395c2... - run 44350220433
v42t53518_42posted Nov 06, 12:36successsupersededrecent 12dpg 20
basece43880d3 Nov 09, 11:50 on master
applyapplied Nov 09, 12:39
rebaselast tried 4 days ago on 1e676702c
Applying: Support changing a column into a stored generated column
Using index info to reconstruct a base tree...
M	src/backend/commands/tablecmds.c
M	src/include/nodes/parsenodes.h
M	src/test/modules/injection_points/Makefile
M	src/test/modules/injection_points/meson.build
M	src/test/regress/expected/alter_table.out
M	src/test/regress/sql/alter_table.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/alter_table.sql
Auto-merging src/test/regress/expected/alter_table.out
Auto-merging src/test/modules/injection_points/meson.build
Auto-merging src/test/modules/injection_points/Makefile
CONFLICT (content): Merge conflict in src/test/modules/injection_points/Makefile
Auto-merging src/include/nodes/parsenodes.h
Auto-merging src/backend/commands/tablecmds.c
Patch failed at 0001 Support changing a column into a stored generated column

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/injection_points/Makefile
pushNov 09, 12:40 -> 0336a80a6branchdiff vs base
ResultAttPGTestsBuild / testImageWhen
success1201054 / 10542m 52s / 5m 12sdocker run ... @sha256:a7100a7...Nov 09, 12:50
run 42618918016
executed 1054 - ccache 78 hit / 6546 miss - head 0336a80a6 - digest sha256:a7100a764122bc... - run 42618918016
success1201054 / 10542m 22s / 5m 15sdocker run ... @sha256:b1700f3...Nov 06, 12:48
run 42219193831
executed 1054 - ccache 78 hit / 6546 miss - head 90acefd27 - digest sha256:b1700f3a32e5f3... - run 42219193831
v29t53518_29posted Sep 16, 17:02successsupersededrecent 15dpg 20
basee405a46c4 Nov 06, 07:20 on master
applyapplied Nov 06, 10:28
rebaselast tried Nov 06, 10:28 on e405a46c4
pushNov 06, 10:28 -> 152165d72branchdiff vs base
ResultAttPGTestsBuild / testImageWhen
success1201054 / 10542m 59s / 5m 36sdocker run ... @sha256:f46efc6...Nov 06, 10:39
run 42202960794
executed 1054 - ccache 78 hit / 6546 miss - head 152165d72 - digest sha256:f46efc62a1c077... - run 42202960794
success1201054 / 10543m 01s / 5m 35sdocker run ... @sha256:b8ea518...Nov 05, 10:34
run 42010191526
executed 1054 - ccache 78 hit / 6546 miss - head 67c825be9 - digest sha256:b8ea518ff0ba3f... - run 42010191526
success1201053 / 10533m 02s / 5m 33sdocker run ... @sha256:89f53a1...Nov 03, 10:27
run 41617846553
executed 1053 - ccache 78 hit / 6544 miss - head a8a47fceb - digest sha256:89f53a1c75185b... - run 41617846553
success1201053 / 10533m 06s / 5m 39sdocker run ... @sha256:072357b...Nov 02, 10:23
run 41426838128
executed 1053 - ccache 78 hit / 6544 miss - head bc2102b90 - digest sha256:072357bb4383a6... - run 41426838128
success1201052 / 10523m 03s / 5m 41sdocker run ... @sha256:d77c23f...Nov 01, 10:19
run 41296094181
executed 1052 - ccache 78 hit / 6544 miss - head dade35272 - digest sha256:d77c23fa82e257... - run 41296094181
success1201052 / 10522m 50s / 4m 54sdocker run ... @sha256:70bb6ae...Oct 31, 10:15
run 41191323217
executed 1052 - ccache 78 hit / 6544 miss - head aade7c7ad - digest sha256:70bb6aee5e1bcc... - run 41191323217
success1201052 / 10523m 01s / 5m 20sdocker run ... @sha256:d2d7d98...Oct 30, 10:13
run 41037889511
executed 1052 - ccache 78 hit / 6544 miss - head b2f78a5aa - digest sha256:d2d7d98c65f5a0... - run 41037889511
success1201052 / 10523m 05s / 5m 29sdocker run ... @sha256:6eee1f0...Oct 29, 10:12
run 40854249010
executed 1052 - ccache 78 hit / 6544 miss - head c46ee6df2 - digest sha256:6eee1f0a640e0d... - run 40854249010
success1201052 / 10522m 56s / 5m 29sdocker run ... @sha256:f13c80c...Oct 28, 10:11
run 40668633005
executed 1052 - ccache 78 hit / 6544 miss - head 223c99f57 - digest sha256:f13c80c7f31cd1... - run 40668633005
success1201051 / 10512m 53s / 5m 38sdocker run ... @sha256:ad1c980...Oct 27, 10:07
run 40484510562
executed 1051 - ccache 78 hit / 6544 miss - head 962dfb224 - digest sha256:ad1c980d912bbe... - run 40484510562
success1201051 / 10512m 03s / 4m 26sdocker run ... @sha256:5bdc2de...Oct 26, 10:03
run 40303230038
executed 1051 - ccache 78 hit / 6544 miss - head a484639c9 - digest sha256:5bdc2de154027e... - run 40303230038
success1201051 / 10511m 51s / 4m 08sdocker run ... @sha256:5834ba1...Oct 25, 10:00
run 40182435875
executed 1051 - ccache 78 hit / 6544 miss - head 4544512df - digest sha256:5834ba105612df... - run 40182435875
success1201051 / 10512m 13s / 4m 40sdocker run ... @sha256:e99cafe...Oct 24, 09:58
run 40083452906
executed 1051 - ccache 78 hit / 6544 miss - head 8b90bf161 - digest sha256:e99cafedb53c55... - run 40083452906
success1201051 / 10512m 10s / 4m 39sdocker run ... @sha256:85a8a0f...Oct 23, 09:56
run 39934427544
executed 1051 - ccache 78 hit / 6544 miss - head b1b416730 - digest sha256:85a8a0fae73ab1... - run 39934427544
success1201051 / 10512m 15s / 4m 09sdocker run ... @sha256:bf831a3...Oct 22, 09:47
run 39756996397
executed 1051 - ccache 78 hit / 6544 miss - head 6d57fb753 - digest sha256:bf831a3c7efd39... - run 39756996397
success1201050 / 10501m 55s / 4m 26sdocker run ... @sha256:d513ff2...Oct 21, 09:44
run 39578241899
executed 1050 - ccache 78 hit / 6544 miss - head dd6b7a0d6 - digest sha256:d513ff28027ade... - run 39578241899
success1201050 / 10502m 47s / 5m 09sdocker run ... @sha256:ad8a829...Oct 20, 09:33
run 39400228626
executed 1050 - ccache 78 hit / 6544 miss - head d43214241 - digest sha256:ad8a82944e15d0... - run 39400228626
success1201050 / 10502m 57s / 5m 22sdocker run ... @sha256:077bbf5...Oct 19, 09:31
run 39229359155
executed 1050 - ccache 78 hit / 6544 miss - head 9d361908b - digest sha256:077bbf54518a5e... - run 39229359155
success1201050 / 10501m 54s / 4m 44sdocker run ... @sha256:61cc619...Oct 18, 09:27
run 39114800262
executed 1050 - ccache 78 hit / 6544 miss - head c80b20291 - digest sha256:61cc619964fee3... - run 39114800262
success1201050 / 10502m 39s / 4m 47sdocker run ... @sha256:75747f1...Oct 17, 09:25
run 39020461237
executed 1050 - ccache 78 hit / 6544 miss - head 71f0fb2df - digest sha256:75747f15fde624... - run 39020461237
success1201050 / 10502m 55s / 5m 23sdocker run ... @sha256:65e535f...Oct 16, 09:25
run 38879142931
executed 1050 - ccache 78 hit / 6544 miss - head f26118797 - digest sha256:65e535f73094da... - run 38879142931
success1201050 / 10502m 38s / 4m 39sdocker run ... @sha256:87c5257...Oct 15, 09:20
run 38711045547
executed 1050 - ccache 78 hit / 6544 miss - head 465c770b8 - digest sha256:87c52576fac78f... - run 38711045547
success1201045 / 10452m 55s / 5m 08sdocker run ... @sha256:bba91e3...Oct 14, 09:18
run 38540051893
executed 1045 - ccache 78 hit / 6544 miss - head 780a0d521 - digest sha256:bba91e3ed8329e... - run 38540051893
success1201045 / 10451m 53s / 4m 00sdocker run ... @sha256:d0c8071...Oct 13, 09:11
run 38373568566
executed 1045 - ccache 78 hit / 6544 miss - head 4f869e248 - digest sha256:d0c807190fbd1b... - run 38373568566
success1201045 / 10451m 49s / 4m 01sdocker run ... @sha256:0acd565...Oct 12, 09:07
run 38226959834
executed 1045 - ccache 78 hit / 6544 miss - head 29771c0d9 - digest sha256:0acd565270e342... - run 38226959834
success1201045 / 10452m 59s / 5m 32sdocker run ... @sha256:b79520a...Oct 11, 03:10
run 38106936561
executed 1045 - ccache 78 hit / 6544 miss - head 075cfcd72 - digest sha256:b79520ad2e0f9e... - run 38106936561
success1201043 / 10432m 54s / 5m 23sdocker run ... @sha256:e71b836...Oct 08, 03:07
run 37720368878
executed 1043 - ccache 78 hit / 6544 miss - head db829d98e - digest sha256:e71b836e1b5a21... - run 37720368878
success1201042 / 10422m 58s / 5m 24sdocker run ... @sha256:4df2660...Oct 07, 03:07
run 37564288578
executed 1042 - ccache 78 hit / 6544 miss - head d55a90c72 - digest sha256:4df2660d5c9b77... - run 37564288578
success1201040 / 10403m 00s / 5m 29sdocker run ... @sha256:2a17333...Oct 06, 03:05
run 37406344193
executed 1040 - ccache 78 hit / 6544 miss - head b159ef92d - digest sha256:2a17333d6db510... - run 37406344193
success1201040 / 10401m 48s / 4m 17sdocker run ... @sha256:cc9ea43...Oct 05, 02:58
run 37256980418
executed 1040 - ccache 78 hit / 6544 miss - head 3e1f94da3 - digest sha256:cc9ea439c9058e... - run 37256980418
success1201040 / 10401m 52s / 4m 18sdocker run ... @sha256:36c6560...Oct 04, 02:57
run 37172201881
executed 1040 - ccache 78 hit / 6544 miss - head 99f8f45d8 - digest sha256:36c656038378d4... - run 37172201881
success1201040 / 10402m 53s / 5m 13sdocker run ... @sha256:46d2c3d...Oct 03, 02:58
run 37091017456
executed 1040 - ccache 78 hit / 6544 miss - head 608ca6fa6 - digest sha256:46d2c3debfb087... - run 37091017456
success1201040 / 10402m 56s / 5m 15sdocker run ... @sha256:543af20...Oct 02, 02:57
run 36957171666
executed 1040 - ccache 78 hit / 6544 miss - head 53544292e - digest sha256:543af20a69bf17... - run 36957171666
success1201040 / 10402m 46s / 5m 19sdocker run ... @sha256:4cb3c5f...Oct 01, 02:52
run 36807034816
executed 1040 - ccache 78 hit / 6544 miss - head a1631a091 - digest sha256:4cb3c5f40779ca... - run 36807034816
success1201040 / 10402m 44s / 5m 08sdocker run ... @sha256:a544e4a...Sep 30, 02:49
run 36660784918
executed 1040 - ccache 78 hit / 6544 miss - head ef0e982b5 - digest sha256:a544e4a53406fc... - run 36660784918
success1201040 / 10402m 46s / 4m 46sdocker run ... @sha256:b717bf6...Sep 29, 02:46
run 36513392090
executed 1040 - ccache 78 hit / 6544 miss - head 151384c49 - digest sha256:b717bf654524a7... - run 36513392090
success1201040 / 10402m 48s / 5m 18sdocker run ... @sha256:49bcd4b...Sep 28, 02:46
run 36370370496
executed 1040 - ccache 78 hit / 6544 miss - head 65efd6aea - digest sha256:49bcd4ba943e78... - run 36370370496
success1201040 / 10402m 12s / 4m 44sdocker run ... @sha256:06bbd85...Sep 26, 21:58
run 36274253226
executed 1040 - ccache 78 hit / 6544 miss - head b67d1bddc - digest sha256:06bbd8537357d4... - run 36274253226
success1201040 / 10402m 55s / 5m 30sdocker run ... @sha256:1323ee5...Sep 25, 21:57
run 36193333561
executed 1040 - ccache 78 hit / 6544 miss - head 4d4e2c24c - digest sha256:1323ee505685ba... - run 36193333561
success1201039 / 10392m 52s / 5m 27sdocker run ... @sha256:c30cd07...Sep 24, 21:56
run 36063419447
executed 1039 - ccache 78 hit / 6544 miss - head 115d3adc3 - digest sha256:c30cd07ecc30d0... - run 36063419447
success1201037 / 10372m 55s / 5m 27sdocker run ... @sha256:537fc88...Sep 23, 21:53
run 35924136539
executed 1037 - ccache 98 hit / 6524 miss - head 2eb9c9bd4 - digest sha256:537fc88e8afe75... - run 35924136539
success1201037 / 10372m 49s / 5m 28sdocker run ... @sha256:8cbef8f...Sep 22, 21:50
run 35788004946
executed 1037 - ccache 98 hit / 6524 miss - head 25b1b7d9a - digest sha256:8cbef8f3e654c6... - run 35788004946
success1201037 / 10372m 50s / 5m 21sdocker run ... @sha256:bf880ad...Sep 21, 21:39
run 35657383525
executed 1037 - ccache 98 hit / 6524 miss - head 6fb603647 - digest sha256:bf880adf5da6cf... - run 35657383525
success1201037 / 10372m 52s / 5m 19sdocker run ... @sha256:88df684...Sep 20, 17:16
run 35524793642
executed 1037 - ccache 98 hit / 6524 miss - head 61b1eb7b6 - digest sha256:88df6843546ab4... - run 35524793642
success1201037 / 10372m 54s / 5m 15sdocker run ... @sha256:450aa90...Sep 19, 17:16
run 35456981963
executed 1037 - ccache 98 hit / 6524 miss - head 9e9001664 - digest sha256:450aa90275c63b... - run 35456981963
success1201037 / 10371m 52s / 4m 23sdocker run ... @sha256:134ba8c...Sep 18, 17:14
run 35372265991
executed 1037 - ccache 98 hit / 6524 miss - head 91fa75e70 - digest sha256:134ba8cf4c9834... - run 35372265991
success1201037 / 10372m 17s / 4m 16sdocker run ... @sha256:c2451cf...Sep 17, 17:13
run 35250513438
executed 1037 - ccache 98 hit / 6524 miss - head 12562a9e0 - digest sha256:c2451cf59708d7... - run 35250513438
success1201037 / 10372m 47s / 5m 31sdocker run ... @sha256:6c41d40...Sep 16, 17:15
run 35125872851
executed 1037 - ccache 98 hit / 6524 miss - head ec4f3ed4d - digest sha256:6c41d40940088c... - run 35125872851
v25t53518_25posted Aug 31, 18:41successsupersededstale 2mopg 20
basec1c5d28f4 Sep 11, 11:42 on master
applyapplied Sep 11, 14:02
rebaselast tried Sep 16, 15:10 on fcc0e27f4
Applying: Support changing a column into a stored generated column
Using index info to reconstruct a base tree...
M	src/backend/commands/tablecmds.c
M	src/backend/parser/gram.y
M	src/bin/psql/t/010_tab_completion.pl
M	src/bin/psql/tab-complete.in.c
M	src/include/nodes/parsenodes.h
M	src/test/modules/injection_points/Makefile
M	src/test/modules/injection_points/meson.build
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/modules/injection_points/meson.build
Auto-merging src/test/modules/injection_points/Makefile
CONFLICT (content): Merge conflict in src/test/modules/injection_points/Makefile
Auto-merging src/include/nodes/parsenodes.h
Auto-merging src/bin/psql/tab-complete.in.c
Auto-merging src/bin/psql/t/010_tab_completion.pl
CONFLICT (content): Merge conflict in src/bin/psql/t/010_tab_completion.pl
Auto-merging src/backend/parser/gram.y
Auto-merging src/backend/commands/tablecmds.c
Patch failed at 0001 Support changing a column into a stored generated column

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/injection_points/Makefile, src/bin/psql/t/010_tab_completion.pl
pushSep 11, 14:02 -> ad6608afbbranchdiff vs base
ResultAttPGTestsBuild / testImageWhen
success1201023 / 10232m 51s / 5m 27sdocker run ... @sha256:deeea71...Sep 11, 14:14
run 34607756918
executed 1023 - ccache 98 hit / 6523 miss - head ad6608afb - digest sha256:deeea71c6dea2a... - run 34607756918
success1201023 / 10232m 52s / 5m 04sdocker run ... @sha256:7d519c2...Sep 10, 14:15
run 34486210611
executed 1023 - ccache 98 hit / 6523 miss - head 4a9aeb380 - digest sha256:7d519c2e3a75cb... - run 34486210611
success1201021 / 10212m 46s / 4m 59sdocker run ... @sha256:e65ee3e...Sep 09, 14:05
run 34360053085
executed 1021 - ccache 98 hit / 6523 miss - head f931eff0a - digest sha256:e65ee3ecf31518... - run 34360053085
success1201021 / 10212m 53s / 5m 44sdocker run ... @sha256:d76c440...Sep 08, 14:05
run 34234669569
executed 1021 - ccache 98 hit / 6523 miss - head 9edbd658f - digest sha256:d76c4407757aa1... - run 34234669569
success1201025 / 10252m 45s / 5m 24sdocker run ... @sha256:f8a7941...Sep 07, 14:08
run 34129669968
executed 1025 - ccache 98 hit / 6527 miss - head 87b7891e3 - digest sha256:f8a79417e564e7... - run 34129669968
success1201025 / 10252m 47s / 5m 02sdocker run ... @sha256:85d9260...Sep 05, 18:56
run 33985080272
executed 1025 - ccache 98 hit / 6527 miss - head 2afda3d25 - digest sha256:85d926008b36c0... - run 33985080272
success1201025 / 10253m 00s / 5m 50sdocker run ... @sha256:46a7dac...Sep 04, 18:56
run 33907599876
executed 1025 - ccache 98 hit / 6527 miss - head fa87fa905 - digest sha256:46a7dac1a204f1... - run 33907599876
success1201024 / 10242m 50s / 5m 25sdocker run ... @sha256:a386140...Sep 03, 18:55
run 33792343404
executed 1024 - ccache 98 hit / 6526 miss - head b0a8db058 - digest sha256:a38614024565aa... - run 33792343404
success1201023 / 10232m 59s / 5m 15sdocker run ... @sha256:fb9c018...Sep 02, 18:54
run 33669024457
executed 1023 - ccache 98 hit / 6526 miss - head 07ddcd055 - digest sha256:fb9c01849a44cd... - run 33669024457
success1201023 / 10232m 54s / 5m 34sdocker run ... @sha256:7dd0dfd...Sep 01, 18:53
run 33545288534
executed 1023 - ccache 98 hit / 6526 miss - head 4e4bc2a12 - digest sha256:7dd0dfdfd9bc21... - run 33545288534
success1201023 / 10232m 53s / 5m 33sdocker run ... @sha256:87c0d42...Aug 31, 18:53
run 33426540138
executed 1023 - ccache 98 hit / 6526 miss - head 0a20f6c03 - digest sha256:87c0d428d50932... - run 33426540138
v21t53518_21posted Aug 28, 05:50successsupersededstale 3mopg 20
base0e944fe35 Aug 31, 03:51 on master
applyapplied Aug 31, 06:10
rebaselast tried Aug 31, 06:10 on 0e944fe35
pushAug 31, 06:10 -> 9db7e3383branchdiff vs base
ResultAttPGTestsBuild / testImageWhen
success1201023 / 10232m 13s / 4m 31sdocker run ... @sha256:fdf41e5...Aug 31, 06:20
run 33363159778
executed 1023 - ccache 98 hit / 6526 miss - head 9db7e3383 - digest sha256:fdf41e5d196a26... - run 33363159778
success1201022 / 10222m 17s / 4m 11sdocker run ... @sha256:abfa742...Aug 30, 06:06
run 33295825578
executed 1022 - ccache 98 hit / 6525 miss - head b2910896a - digest sha256:abfa742ebaa2f5... - run 33295825578
success1201022 / 10222m 04s / 4m 36sdocker run ... @sha256:dd4a7d5...Aug 29, 06:06
run 33237318714
executed 1022 - ccache 98 hit / 6525 miss - head 1f2df7b4a - digest sha256:dd4a7d572e87ef... - run 33237318714
success1201022 / 10222m 16s / 4m 21sdocker run ... @sha256:d33b4ff...Aug 28, 06:01
run 33146078021
executed 1022 - ccache 98 hit / 6525 miss - head 54c2c32c0 - digest sha256:d33b4ffc8ff313... - run 33146078021
v17t53518_17posted Aug 24, 20:03successsupersededstale 3mopg 20
base79b101486 Aug 26, 19:38 on master
applyapplied Aug 26, 20:06
rebaselast tried Aug 27, 20:07 on 458176766
Applying: Support changing a column into a stored generated column
Using index info to reconstruct a base tree...
M	doc/src/sgml/ref/alter_table.sgml
M	src/backend/commands/tablecmds.c
M	src/backend/parser/gram.y
M	src/bin/psql/tab-complete.in.c
M	src/include/nodes/parsenodes.h
M	src/test/modules/test_ddl_deparse/test_ddl_deparse.c
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/modules/test_ddl_deparse/test_ddl_deparse.c
Auto-merging src/include/nodes/parsenodes.h
Auto-merging src/bin/psql/tab-complete.in.c
Auto-merging src/backend/parser/gram.y
Auto-merging src/backend/commands/tablecmds.c
CONFLICT (content): Merge conflict in src/backend/commands/tablecmds.c
Auto-merging doc/src/sgml/ref/alter_table.sgml
Patch failed at 0001 Support changing a column into a stored generated column

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/commands/tablecmds.c
pushAug 26, 20:06 -> 1cfc84451branchdiff vs base
ResultAttPGTestsBuild / testImageWhen
success1201026 / 10262m 46s / 5m 30sdocker run ... @sha256:87f39d1...Aug 26, 20:17
run 33008704125
executed 1026 - ccache 98 hit / 6525 miss - head 1cfc84451 - digest sha256:87f39d14d02e49... - run 33008704125
success1201025 / 10252m 57s / 5m 30sdocker run ... @sha256:2cecc58...Aug 25, 20:16
run 32893350894
executed 1025 - ccache 98 hit / 6525 miss - head 436d455eb - digest sha256:2cecc580bef2eb... - run 32893350894
success1201024 / 10242m 46s / 5m 29sdocker run ... @sha256:93ed109...Aug 24, 20:16
run 32771905606
executed 1024 - ccache 98 hit / 6525 miss - head 19bc7d0c4 - digest sha256:93ed10962b3f80... - run 32771905606
v15t53518_15posted Aug 06, 12:36successsupersededstale 3mopg 20
base53a981ed5 Aug 24, 10:43 on master
applyapplied Aug 24, 10:59
rebaselast tried Aug 24, 10:59 on 53a981ed5
pushAug 24, 10:59 -> 74a4bf8b1branchdiff vs base
ResultAttPGTestsBuild / testImageWhen
success1201024 / 10242m 00s / 4m 03sdocker run ... @sha256:7b86178...Aug 24, 11:10
run 32719555757
executed 1024 - ccache 98 hit / 6525 miss - head 74a4bf8b1 - digest sha256:7b86178568e2f5... - run 32719555757
success1201024 / 10242m 46s / 5m 26sdocker run ... @sha256:51ca7eb...Aug 23, 11:11
run 32635220193
executed 1024 - ccache 98 hit / 6525 miss - head 0a16e9a8f - digest sha256:51ca7eba2e2a47... - run 32635220193
success1201024 / 10243m 00s / 5m 39sdocker run ... @sha256:9d67e13...Aug 22, 11:09
run 32568949924
executed 1024 - ccache 98 hit / 6525 miss - head b9faefaa9 - digest sha256:9d67e134149386... - run 32568949924
success1201024 / 10242m 55s / 5m 12sdocker run ... @sha256:672f779...Aug 21, 11:09
run 32474866956
executed 1024 - ccache 98 hit / 6525 miss - head b20107f48 - digest sha256:672f779d8c5674... - run 32474866956
success1201024 / 10242m 53s / 5m 31sdocker run ... @sha256:bdf22ce...Aug 20, 11:08
run 32361254844
executed 1024 - ccache 98 hit / 6525 miss - head 96046b6cc - digest sha256:bdf22ce1809765... - run 32361254844
success1201024 / 10242m 43s / 4m 48sdocker run ... @sha256:5a915d0...Aug 19, 11:08
run 32244939080
executed 1024 - ccache 98 hit / 6525 miss - head 731d6d90b - digest sha256:5a915d051b1f02... - run 32244939080
success1201022 / 10222m 47s / 5m 04sdocker run ... @sha256:c834874...Aug 18, 10:56
run 32128277719
executed 1022 - ccache 98 hit / 6524 miss - head e68134d08 - digest sha256:c834874eaa5207... - run 32128277719
success1201020 / 10202m 18s / 4m 34sdocker run ... @sha256:6b3b0d2...Aug 17, 10:53
run 32021463498
executed 1020 - ccache 98 hit / 6524 miss - head 7a395b974 - digest sha256:6b3b0d2e5394e5... - run 32021463498
success1201020 / 10202m 47s / 5m 01sdocker run ... @sha256:23da68b...Aug 16, 10:52
run 31942352543
executed 1020 - ccache 98 hit / 6524 miss - head ae3beb14f - digest sha256:23da68b4b3fe28... - run 31942352543
success1201020 / 10202m 53s / 5m 11sdocker run ... @sha256:cd4c578...Aug 15, 10:51
run 31880107153
executed 1020 - ccache 98 hit / 6524 miss - head 1447692a6 - digest sha256:cd4c578e971728... - run 31880107153
success1201020 / 10202m 48s / 5m 25sdocker run ... @sha256:70f4f4e...Aug 14, 10:49
run 31792989961
executed 1020 - ccache 165 hit / 6457 miss - head ddf53adca - digest sha256:70f4f4e70c9793... - run 31792989961
success1201020 / 10202m 18s / 4m 29sdocker run ... @sha256:85601d1...Aug 13, 10:47
run 31691857767
executed 1020 - ccache 165 hit / 6457 miss - head 63b645fae - digest sha256:85601d16afa71b... - run 31691857767
success1201020 / 10202m 47s / 5m 22sdocker run ... @sha256:9b4ba80...Aug 12, 10:46
run 31588042835
executed 1020 - ccache 165 hit / 6457 miss - head 69e225e60 - digest sha256:9b4ba806b55b63... - run 31588042835
success1201020 / 10202m 52s / 5m 29sdocker run ... @sha256:709ad27...Aug 11, 10:46
run 31482752293
executed 1020 - ccache 165 hit / 6453 miss - head 2ca5605d8 - digest sha256:709ad27b64f67b... - run 31482752293
success1201020 / 10202m 15s / 4m 12sdocker run ... @sha256:9996bcb...Aug 10, 10:34
run 31378882178
executed 1020 - ccache 166 hit / 6452 miss - head 5b08652fe - digest sha256:9996bcbe88b657... - run 31378882178
success1201020 / 10202m 55s / 5m 33sdocker run ... @sha256:ec35af2...Aug 08, 12:53
run 31257776792
executed 1020 - ccache 166 hit / 6452 miss - head aaebc2d15 - digest sha256:ec35af29022341... - run 31257776792
success1201020 / 10202m 57s / 5m 32sdocker run ... @sha256:57b9bab...Aug 07, 12:50
run 31179123801
executed 1020 - ccache 166 hit / 6452 miss - head 8bf3b97db - digest sha256:57b9bab071f5a1... - run 31179123801
success1201019 / 10192m 53s / 5m 30sdocker run ... @sha256:97e6e99...Aug 06, 12:50
run 31102283460
executed 1019 - ccache 166 hit / 6452 miss - head bfa32f8f3 - digest sha256:97e6e99c8b3996... - run 31102283460
v11t53518_11posted Jul 03, 06:42successsupersededstale 4mopg 20
base1200dfd60 Aug 05, 23:19 on master
applyapplied Aug 05, 23:31
rebaselast tried Aug 05, 23:31 on 1200dfd60
pushAug 05, 23:31 -> 7426ada2bbranchdiff vs base
ResultAttPGTestsBuild / testImageWhen
success1201019 / 10192m 19s / 4m 21sdocker run ... @sha256:747a5a9...Aug 05, 23:40
run 31056668635
executed 1019 - ccache 166 hit / 6452 miss - head 7426ada2b - digest sha256:747a5a9ef2643b... - run 31056668635
success1201019 / 10192m 50s / 5m 26sdocker run ... @sha256:6429c65...Aug 04, 23:41
run 30960214583
executed 1019 - ccache 166 hit / 6452 miss - head c4cef3af3 - digest sha256:6429c657ade5a9... - run 30960214583
success1201019 / 10192m 56s / 5m 24sdocker run ... @sha256:b5b6349...Aug 03, 23:40
run 30862422897
executed 1019 - ccache 166 hit / 6452 miss - head 6962e3f2f - digest sha256:b5b634995bc6e8... - run 30862422897
success1201018 / 10182m 58s / 5m 39sdocker run ... @sha256:ef988a1...Aug 02, 23:39
run 30772310706
executed 1018 - ccache 166 hit / 6452 miss - head 839faa27b - digest sha256:ef988a1645491b... - run 30772310706
success1201018 / 10182m 54s / 5m 15sdocker run ... @sha256:d77be30...Aug 01, 23:38
run 30723351446
executed 1018 - ccache 166 hit / 6452 miss - head c0bb0ac16 - digest sha256:d77be30743b09f... - run 30723351446
success1201018 / 10182m 38s / 4m 45sdocker run ... @sha256:45f3ce5...Jul 31, 23:35
run 30672838930
executed 1018 - ccache 166 hit / 6452 miss - head 4ba140dc3 - digest sha256:45f3ce55f98499... - run 30672838930
success1201017 / 10172m 49s / 5m 26sdocker run ... @sha256:960535d...Jul 30, 23:35
run 30590383829
executed 1017 - ccache 166 hit / 6452 miss - head 8d524aee3 - digest sha256:960535d910eab6... - run 30590383829
success1201017 / 10172m 50s / 5m 12sdocker run ... @sha256:b5c18e8...Jul 29, 23:33
run 30499309986
executed 1017 - ccache 166 hit / 6452 miss - head 1122e5b6f - digest sha256:b5c18e85dfe425... - run 30499309986
success1201016 / 10162m 53s / 5m 28sdocker run ... @sha256:506dc2e...Jul 28, 23:41
run 30407721148
executed 1016 - ccache 166 hit / 6452 miss - head bb37ea2c2 - digest sha256:506dc2e235228e... - run 30407721148
v4t53518_4posted May 14, 22:46successsupersededstale 4mopg 20
base8a045f760 Jul 28, 08:50 on master
applyapplied Jul 28, 15:20
rebaselast tried Jul 28, 15:20 on 8a045f760
pushJul 28, 15:20 -> c376fa421branchdiff vs base
ResultAttPGTestsBuild / testImageWhen
success1201014 / 10141m 56s / 3m 52sdocker run ... @sha256:f5c15f9...Jul 28, 15:38
run 30372887824
executed 1014 - ccache 166 hit / 6452 miss - head c376fa421 - digest sha256:f5c15f97b5fc2d... - run 30372887824
success1201013 / 10132m 53s / 5m 11sdocker run ... @sha256:d2b3c5e...Jul 27, 00:24
run 30226990807
executed 1013 - ccache 166 hit / 6452 miss - head 206dd6cb5 - digest sha256:d2b3c5ed82f023... - run 30226990807