Preserve statistics targets with ALTER TABLE ALTER COLUMN TYPE
2 patchsets tracked - current t253417_4
v4t253417_4posted Oct 01, 12:02successneeds rebaserecent 13dpg 20
based0a4f6621 Nov 08, 08:21 on master
applyapplied Nov 08, 23:39
rebaselast tried about 10 hours ago on 9b5d4e333
Applying: Preserve statistics targets of indexes rebuilt by ALTER TABLE Using index info to reconstruct a base tree... M src/backend/commands/indexcmds.c M src/backend/commands/tablecmds.c M src/include/nodes/parsenodes.h M src/test/regress/expected/alter_table.out M src/test/regress/sql/alter_table.sql Falling back to patching base and 3-way merge... Auto-merging src/test/regress/sql/alter_table.sql CONFLICT (content): Merge conflict in src/test/regress/sql/alter_table.sql Auto-merging src/test/regress/expected/alter_table.out Auto-merging src/include/nodes/parsenodes.h Auto-merging src/backend/commands/tablecmds.c Auto-merging src/backend/commands/indexcmds.c Patch failed at 0001 Preserve statistics targets of indexes rebuilt by ALTER TABLE 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/alter_table.sql
pushNov 08, 23:40 -> 478c09d02branchdiff vs base
| Result | Att | PG | Tests | Build / test | Image | When |
|---|---|---|---|---|---|---|
| success | 1 | 20 | 1053 / 1053 | 3m 05s / 5m 35s | docker run ... :t253417 | Nov 08, 23:51 |
run 42536262166executed 1053 - ccache 78 hit / 6546 miss - head 478c09d02 - digest sha256:c3e2a0447ff5b4... - run 42536262166 | ||||||
| success | 1 | 20 | 1053 / 1053 | 2m 51s / 4m 48s | docker run ... @sha256:442020d... | Nov 07, 23:48 |
run 42426160232executed 1053 - ccache 78 hit / 6546 miss - head 70525187c - digest sha256:442020d2065aaf... - run 42426160232 | ||||||
| success | 1 | 20 | 1053 / 1053 | 2m 18s / 4m 40s | docker run ... @sha256:ddbfb1d... | Nov 06, 23:46 |
run 42313169822executed 1053 - ccache 78 hit / 6546 miss - head 404ac0eca - digest sha256:ddbfb1d2f850fc... - run 42313169822 | ||||||
| success | 1 | 20 | 1053 / 1053 | 3m 06s / 5m 40s | docker run ... @sha256:9322764... | Nov 05, 23:48 |
run 42130736142executed 1053 - ccache 78 hit / 6546 miss - head d6f2b22dd - digest sha256:93227646b64c73... - run 42130736142 | ||||||
| success | 1 | 20 | 1052 / 1052 | 2m 03s / 4m 45s | docker run ... @sha256:5913212... | Nov 04, 23:45 |
run 41934988922executed 1052 - ccache 78 hit / 6546 miss - head f13b19906 - digest sha256:5913212d3cc70a... - run 41934988922 | ||||||
| success | 1 | 20 | 1052 / 1052 | 2m 50s / 4m 48s | docker run ... @sha256:a1c1692... | Nov 03, 23:44 |
run 41740150091executed 1052 - ccache 78 hit / 6544 miss - head 58002762f - digest sha256:a1c1692fbd933d... - run 41740150091 | ||||||
| success | 1 | 20 | 1052 / 1052 | 3m 11s / 5m 45s | docker run ... @sha256:c00ccd7... | Nov 02, 23:44 |
run 41546246742executed 1052 - ccache 78 hit / 6544 miss - head 703514499 - digest sha256:c00ccd73a1894e... - run 41546246742 | ||||||
| success | 1 | 20 | 1052 / 1052 | 3m 02s / 5m 31s | docker run ... @sha256:b22bdc8... | Nov 01, 23:42 |
run 41362553818executed 1052 - ccache 78 hit / 6544 miss - head 52f3217a2 - digest sha256:b22bdc878a5a39... - run 41362553818 | ||||||
| success | 1 | 20 | 1051 / 1051 | 2m 54s / 5m 17s | docker run ... @sha256:6b2d022... | Oct 31, 23:41 |
run 41252834504executed 1051 - ccache 78 hit / 6544 miss - head d80ff956b - digest sha256:6b2d0224af7f92... - run 41252834504 | ||||||
| success | 1 | 20 | 1051 / 1051 | 2m 23s / 5m 00s | docker run ... @sha256:c830702... | Oct 30, 23:38 |
run 41144714343executed 1051 - ccache 78 hit / 6544 miss - head 58985c038 - digest sha256:c83070239b423a... - run 41144714343 | ||||||
| success | 1 | 20 | 1051 / 1051 | 2m 16s / 4m 46s | docker run ... @sha256:b5254ff... | Oct 29, 23:36 |
run 40973183516executed 1051 - ccache 78 hit / 6544 miss - head 9e8d4ab4f - digest sha256:b5254ff7c9328a... - run 40973183516 | ||||||
| success | 1 | 20 | 1051 / 1051 | 3m 07s / 5m 52s | docker run ... @sha256:cf8733c... | Oct 28, 23:36 |
run 40787178591executed 1051 - ccache 78 hit / 6544 miss - head b6db7bfba - digest sha256:cf8733c22156b6... - run 40787178591 | ||||||
| success | 1 | 20 | 1050 / 1050 | 2m 11s / 4m 42s | docker run ... @sha256:9da0b49... | Oct 27, 23:30 |
run 40601596252executed 1050 - ccache 78 hit / 6544 miss - head 4fd73ef89 - digest sha256:9da0b496a5657d... - run 40601596252 | ||||||
| success | 1 | 20 | 1050 / 1050 | 2m 55s / 5m 36s | docker run ... @sha256:11afb98... | Oct 26, 23:30 |
run 40418962470executed 1050 - ccache 78 hit / 6544 miss - head c97541922 - digest sha256:11afb98e97f302... - run 40418962470 | ||||||
| success | 1 | 20 | 1050 / 1050 | 2m 55s / 5m 40s | docker run ... @sha256:dd2d1f3... | Oct 25, 23:28 |
run 40244106292executed 1050 - ccache 78 hit / 6544 miss - head 3b809716f - digest sha256:dd2d1f312a4a05... - run 40244106292 | ||||||
| success | 1 | 20 | 1050 / 1050 | 2m 52s / 5m 13s | docker run ... @sha256:1f4df97... | Oct 24, 23:27 |
run 40142094623executed 1050 - ccache 78 hit / 6544 miss - head 7bca6157a - digest sha256:1f4df974a97f0e... - run 40142094623 | ||||||
| success | 1 | 20 | 1050 / 1050 | 2m 56s / 5m 38s | docker run ... @sha256:f98044d... | Oct 23, 23:26 |
run 40038561358executed 1050 - ccache 78 hit / 6544 miss - head 143d2ea55 - digest sha256:f98044db094230... - run 40038561358 | ||||||
| success | 1 | 20 | 1050 / 1050 | 3m 02s / 5m 27s | docker run ... @sha256:64f7d0a... | Oct 22, 23:24 |
run 39870371044executed 1050 - ccache 78 hit / 6544 miss - head 473056568 - digest sha256:64f7d0acc4c319... - run 39870371044 | ||||||
| success | 1 | 20 | 1049 / 1049 | 2m 21s / 5m 01s | docker run ... @sha256:5036019... | Oct 21, 23:22 |
run 39691842591executed 1049 - ccache 78 hit / 6544 miss - head e5078f22c - digest sha256:5036019a1f5f70... - run 39691842591 | ||||||
| success | 1 | 20 | 1049 / 1049 | 3m 02s / 5m 38s | docker run ... @sha256:938f56b... | Oct 20, 23:20 |
run 39513165100executed 1049 - ccache 78 hit / 6544 miss - head 1ce6204a9 - digest sha256:938f56b5729c3b... - run 39513165100 | ||||||
| success | 1 | 20 | 1049 / 1049 | 2m 55s / 5m 33s | docker run ... @sha256:531b92c... | Oct 19, 23:19 |
run 39339606995executed 1049 - ccache 78 hit / 6544 miss - head 141d83ff1 - digest sha256:531b92c5a5bca0... - run 39339606995 | ||||||
| success | 1 | 20 | 1049 / 1049 | 2m 55s / 5m 31s | docker run ... @sha256:6614334... | Oct 18, 23:15 |
run 39174974707executed 1049 - ccache 78 hit / 6544 miss - head 4c05d95fd - digest sha256:6614334ade0e01... - run 39174974707 | ||||||
| success | 1 | 20 | 1049 / 1049 | 2m 53s / 5m 27s | docker run ... @sha256:22faef0... | Oct 17, 16:14 |
run 39047742930executed 1049 - ccache 78 hit / 6544 miss - head db75736a6 - digest sha256:22faef0db30c55... - run 39047742930 | ||||||
| success | 1 | 20 | 1049 / 1049 | 2m 53s / 5m 32s | docker run ... @sha256:38f7233... | Oct 16, 16:13 |
run 38928762244executed 1049 - ccache 78 hit / 6544 miss - head ab4ca7618 - digest sha256:38f7233745cec2... - run 38928762244 | ||||||
| success | 1 | 20 | 1049 / 1049 | 2m 54s / 5m 39s | docker run ... @sha256:2b430b1... | Oct 15, 16:09 |
run 38765061768executed 1049 - ccache 78 hit / 6544 miss - head f8fdca76b - digest sha256:2b430b150ed528... - run 38765061768 | ||||||
| success | 1 | 20 | 1045 / 1045 | 3m 04s / 5m 47s | docker run ... @sha256:83f0c53... | Oct 14, 16:10 |
run 38593883898executed 1045 - ccache 78 hit / 6544 miss - head a5c519a7a - digest sha256:83f0c53ac5b37f... - run 38593883898 | ||||||
| cancelled | 1 | - | - | - | - | Oct 14, 15:58 |
run 38593874060head a5c519a7a - run 38593874060 | ||||||
| success | 1 | 20 | 1044 / 1044 | 1m 53s / 4m 18s | docker run ... @sha256:32fc1dc... | Oct 13, 15:52 |
run 38424663192executed 1044 - ccache 78 hit / 6544 miss - head 2cbc12902 - digest sha256:32fc1dcf4ba740... - run 38424663192 | ||||||
| success | 1 | 20 | 1044 / 1044 | 2m 53s / 5m 36s | docker run ... @sha256:2710837... | Oct 12, 15:51 |
run 38271899244executed 1044 - ccache 78 hit / 6544 miss - head ff8976e02 - digest sha256:271083707175e5... - run 38271899244 | ||||||
| success | 1 | 20 | 1044 / 1044 | 2m 51s / 5m 42s | docker run ... @sha256:fe0b973... | Oct 11, 12:28 |
run 38138696274executed 1044 - ccache 78 hit / 6544 miss - head c8ce26654 - digest sha256:fe0b9732b8194c... - run 38138696274 | ||||||
| success | 1 | 20 | 1042 / 1042 | 2m 58s / 5m 40s | docker run ... @sha256:c9f8c67... | Oct 08, 12:25 |
run 37775490382executed 1042 - ccache 78 hit / 6544 miss - head c5df99404 - digest sha256:c9f8c67cd0fdc9... - run 37775490382 | ||||||
| success | 1 | 20 | 1042 / 1042 | 2m 16s / 4m 18s | docker run ... @sha256:11213e2... | Oct 07, 12:21 |
run 37619387412executed 1042 - ccache 78 hit / 6544 miss - head 58c6ab8fa - digest sha256:11213e2c011b91... - run 37619387412 | ||||||
| success | 1 | 20 | 1040 / 1040 | 2m 00s / 4m 06s | docker run ... @sha256:8755345... | Oct 06, 12:19 |
run 37461409432executed 1040 - ccache 78 hit / 6544 miss - head db4bcf124 - digest sha256:87553459cb8da6... - run 37461409432 | ||||||
| success | 1 | 20 | 1039 / 1039 | 2m 58s / 5m 38s | docker run ... @sha256:aa65879... | Oct 05, 12:21 |
run 37307641632executed 1039 - ccache 78 hit / 6544 miss - head dea4cd698 - digest sha256:aa658795e653f8... - run 37307641632 | ||||||
| success | 1 | 20 | 1039 / 1039 | 1m 45s / 4m 06s | docker run ... @sha256:3880c06... | Oct 04, 12:16 |
run 37201091055executed 1039 - ccache 78 hit / 6544 miss - head 331f9d9b8 - digest sha256:3880c068184e51... - run 37201091055 | ||||||
| success | 1 | 20 | 1039 / 1039 | 1m 53s / 4m 19s | docker run ... @sha256:958f4bb... | Oct 03, 12:15 |
run 37121837638executed 1039 - ccache 78 hit / 6544 miss - head f0980a08f - digest sha256:958f4bb010fd5b... - run 37121837638 | ||||||
| success | 1 | 20 | 1039 / 1039 | 2m 46s / 4m 47s | docker run ... @sha256:c58e079... | Oct 02, 12:15 |
run 37004688392executed 1039 - ccache 78 hit / 6544 miss - head 3fd666cec - digest sha256:c58e079b9542a6... - run 37004688392 | ||||||
| success | 1 | 20 | 1039 / 1039 | 2m 58s / 5m 16s | docker run ... @sha256:4af62bc... | Oct 01, 12:14 |
run 36859329932executed 1039 - ccache 78 hit / 6544 miss - head 11477a80c - digest sha256:4af62bce0714e3... - run 36859329932 | ||||||
v1t253417_1posted Aug 14, 22:37successsupersededstale 2mopg 20
base23c07b460 Sep 07, 20:05 on master
applyapplied Sep 07, 23:49
rebaselast tried Oct 01, 03:05 on 45277ca0d
Applying: Preserve statistics target of extended statistics rebuilt by ALTER TABLE Using index info to reconstruct a base tree... M src/backend/commands/statscmds.c M src/backend/commands/tablecmds.c M src/backend/parser/gram.y M src/backend/parser/parse_utilcmd.c M src/include/nodes/parsenodes.h Falling back to patching base and 3-way merge... Auto-merging src/include/nodes/parsenodes.h Auto-merging src/backend/parser/parse_utilcmd.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 src/backend/commands/statscmds.c Patch failed at 0001 Preserve statistics target of extended statistics rebuilt by ALTER TABLE 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
pushSep 07, 23:49 -> 56d460e97branchdiff vs base
| Result | Att | PG | Tests | Build / test | Image | When |
|---|---|---|---|---|---|---|
| success | 1 | 20 | 1020 / 1020 | 2m 51s / 5m 21s | docker run ... @sha256:50fa3a2... | Sep 08, 00:02 |
run 34171327791executed 1020 - ccache 98 hit / 6523 miss - head 56d460e97 - digest sha256:50fa3a28ea4df8... - run 34171327791 | ||||||
| success | 1 | 20 | 1024 / 1024 | 2m 23s / 4m 28s | docker run ... @sha256:416b276... | Sep 06, 23:59 |
run 34067879981executed 1024 - ccache 98 hit / 6527 miss - head a054ecf53 - digest sha256:416b2760ab9b86... - run 34067879981 | ||||||
| success | 1 | 20 | 1024 / 1024 | 3m 03s / 5m 41s | docker run ... @sha256:fc28aa2... | Sep 05, 00:31 |
run 33932626990executed 1024 - ccache 98 hit / 6527 miss - head 6e960737d - digest sha256:fc28aa27860f7d... - run 33932626990 | ||||||
| success | 1 | 20 | 1024 / 1024 | 2m 22s / 4m 12s | docker run ... @sha256:cb42533... | Sep 04, 00:28 |
run 33821301058executed 1024 - ccache 98 hit / 6527 miss - head 4b34dd509 - digest sha256:cb425339ef0047... - run 33821301058 | ||||||
| success | 1 | 20 | 1022 / 1022 | 2m 53s / 5m 10s | docker run ... @sha256:6a7becf... | Sep 03, 00:28 |
run 33698939722executed 1022 - ccache 98 hit / 6526 miss - head f463bec01 - digest sha256:6a7becff20dd0c... - run 33698939722 | ||||||
| success | 1 | 20 | 1022 / 1022 | 2m 56s / 5m 12s | docker run ... @sha256:7c9200f... | Sep 02, 00:27 |
run 33574720023executed 1022 - ccache 98 hit / 6526 miss - head 26f3cfb6f - digest sha256:7c9200ffef9ebe... - run 33574720023 | ||||||
| success | 1 | 20 | 1022 / 1022 | 2m 10s / 4m 27s | docker run ... @sha256:174debc... | Sep 01, 00:25 |
run 33454075803executed 1022 - ccache 98 hit / 6526 miss - head 4e81c8ba5 - digest sha256:174debc93a0c65... - run 33454075803 | ||||||
| success | 1 | 20 | 1021 / 1021 | 2m 54s / 5m 31s | docker run ... @sha256:022d1d3... | Aug 31, 00:25 |
run 33344009066executed 1021 - ccache 98 hit / 6525 miss - head 483e82371 - digest sha256:022d1d3941dbae... - run 33344009066 | ||||||
| success | 1 | 20 | 1021 / 1021 | 2m 59s / 5m 21s | docker run ... @sha256:dbe63d1... | Aug 30, 00:25 |
run 33282836653executed 1021 - ccache 98 hit / 6525 miss - head bd98f1d6a - digest sha256:dbe63d1e3ad9e9... - run 33282836653 | ||||||
| success | 1 | 20 | 1021 / 1021 | 2m 11s / 4m 14s | docker run ... @sha256:07ee75a... | Aug 29, 00:22 |
run 33222918447executed 1021 - ccache 98 hit / 6525 miss - head 95cb49fea - digest sha256:07ee75a4f776f3... - run 33222918447 | ||||||
| success | 1 | 20 | 1021 / 1021 | 2m 39s / 4m 35s | docker run ... @sha256:18cd936... | Aug 28, 00:23 |
run 33129021064executed 1021 - ccache 98 hit / 6525 miss - head 589780579 - digest sha256:18cd936fc51d30... - run 33129021064 | ||||||
| success | 1 | 20 | 1021 / 1021 | 1m 57s / 4m 11s | docker run ... @sha256:efe33a7... | Aug 27, 00:21 |
run 33026058702executed 1021 - ccache 98 hit / 6525 miss - head 4be7540ea - digest sha256:efe33a7c3d6f9c... - run 33026058702 | ||||||
| success | 1 | 20 | 1024 / 1024 | 2m 56s / 5m 31s | docker run ... @sha256:f42b098... | Aug 26, 00:21 |
run 32913991538executed 1024 - ccache 98 hit / 6525 miss - head 64b70125e - digest sha256:f42b09809c8563... - run 32913991538 | ||||||
| success | 1 | 20 | 1024 / 1024 | 2m 15s / 4m 31s | docker run ... @sha256:06acd6f... | Aug 25, 00:19 |
run 32792501808executed 1024 - ccache 98 hit / 6525 miss - head 1028e3af3 - digest sha256:06acd6fa34bc6c... - run 32792501808 | ||||||
| success | 1 | 20 | 1023 / 1023 | 2m 48s / 5m 06s | docker run ... @sha256:db2801e... | Aug 24, 00:19 |
run 32675731625executed 1023 - ccache 98 hit / 6525 miss - head 22cdb2bae - digest sha256:db2801efac5877... - run 32675731625 | ||||||
| success | 1 | 20 | 1023 / 1023 | 2m 49s / 5m 26s | docker run ... @sha256:b8bd232... | Aug 23, 00:18 |
run 32607041672executed 1023 - ccache 98 hit / 6525 miss - head 1414ea4e4 - digest sha256:b8bd232f36cfa0... - run 32607041672 | ||||||
| success | 1 | 20 | 1023 / 1023 | 2m 48s / 4m 47s | docker run ... @sha256:89336b8... | Aug 22, 00:16 |
run 32539224703executed 1023 - ccache 98 hit / 6525 miss - head e15b0534b - digest sha256:89336b82f1aa6b... - run 32539224703 | ||||||
| success | 1 | 20 | 1023 / 1023 | 2m 54s / 5m 26s | docker run ... @sha256:f0f31c3... | Aug 21, 00:16 |
run 32431322228executed 1023 - ccache 98 hit / 6525 miss - head e09e9b034 - digest sha256:f0f31c32434292... - run 32431322228 | ||||||
| success | 1 | 20 | 1023 / 1023 | 2m 46s / 5m 25s | docker run ... @sha256:985b4c2... | Aug 20, 00:15 |
run 32315848721executed 1023 - ccache 98 hit / 6525 miss - head 4af9767f0 - digest sha256:985b4c2be0bf45... - run 32315848721 | ||||||
| success | 1 | 20 | 1023 / 1023 | 2m 56s / 5m 18s | docker run ... @sha256:8b3caf4... | Aug 19, 00:13 |
run 32199681948executed 1023 - ccache 98 hit / 6525 miss - head 62ef804d1 - digest sha256:8b3caf41353625... - run 32199681948 | ||||||
| success | 1 | 20 | 1019 / 1019 | 2m 46s / 4m 53s | docker run ... @sha256:56094d3... | Aug 18, 00:12 |
run 32082872245executed 1019 - ccache 98 hit / 6524 miss - head 2178646ba - digest sha256:56094d313ba4ed... - run 32082872245 | ||||||
| success | 1 | 20 | 1019 / 1019 | 2m 54s / 5m 12s | docker run ... @sha256:ca0f6cc... | Aug 17, 00:09 |
run 31980605959executed 1019 - ccache 98 hit / 6524 miss - head 476bc0b00 - digest sha256:ca0f6cc132047f... - run 31980605959 | ||||||
| success | 1 | 20 | 1019 / 1019 | 3m 00s / 5m 36s | docker run ... @sha256:ab06703... | Aug 15, 22:51 |
run 31912720213executed 1019 - ccache 98 hit / 6524 miss - head 44e2bda7d - digest sha256:ab067035f69ace... - run 31912720213 | ||||||
| success | 1 | 20 | 1019 / 1019 | 1m 55s / 4m 16s | docker run ... @sha256:1c1d8df... | Aug 14, 22:48 |
run 31847479785executed 1019 - ccache 98 hit / 6524 miss - head 90b3acf43 - digest sha256:1c1d8df99fec1e... - run 31847479785 | ||||||