[PATCH] Avoid internal error for invalid interval typmods

1 patchset tracked - current t248679_4

v4t248679_4posted Jul 01, 01:49successwon't retrystale 33dpg 20

based39fda1cc Sep 21, 10:36 on master

applyapplied Sep 21, 12:20

rebaselast tried 4 days ago on 68af68ac6

Applying: Avoid internal error for invalid interval typmods
Using index info to reconstruct a base tree...
M	src/backend/utils/adt/timestamp.c
Falling back to patching base and 3-way merge...
Auto-merging src/backend/utils/adt/timestamp.c
CONFLICT (content): Merge conflict in src/backend/utils/adt/timestamp.c
Patch failed at 0001 Avoid internal error for invalid interval typmods

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/utils/adt/timestamp.c

pushSep 21, 12:20 -> 8e3d21073 branch diff vs base

patchsetdownload in thread

Result	Att	PG	Tests	Build / test	Image	When
success	1	20	1036 / 1036	2m 11s / 4m 31s	`docker run ... :t248679`	Sep 21, 12:30
run 35598993482 executed 1036 - ccache 98 hit / 6524 miss - head 8e3d21073 - digest sha256:0e61cb77ffd480... - run 35598993482
success	1	20	1036 / 1036	2m 40s / 4m 37s	`docker run ... @sha256:4b5414c...`	Sep 20, 07:00
run 35495279895 executed 1036 - ccache 98 hit / 6524 miss - head 755d4155c - digest sha256:4b5414c80ff3f4... - run 35495279895
success	1	20	1036 / 1036	2m 52s / 5m 04s	`docker run ... @sha256:0f121e0...`	Sep 19, 06:59
run 35427645709 executed 1036 - ccache 98 hit / 6524 miss - head cbf587f1c - digest sha256:0f121e0dea1e00... - run 35427645709
success	1	20	1036 / 1036	1m 57s / 4m 31s	`docker run ... @sha256:a77a3df...`	Sep 18, 06:59
run 35316517794 executed 1036 - ccache 98 hit / 6524 miss - head c5865dd66 - digest sha256:a77a3df760067d... - run 35316517794
success	1	20	1036 / 1036	2m 12s / 4m 43s	`docker run ... @sha256:18bb8a7...`	Sep 17, 06:57
run 35191433654 executed 1036 - ccache 98 hit / 6524 miss - head bc46480bf - digest sha256:18bb8a7e35221c... - run 35191433654
success	1	20	1036 / 1036	2m 49s / 5m 28s	`docker run ... @sha256:18ecb4e...`	Sep 16, 06:56
run 35065200671 executed 1036 - ccache 98 hit / 6524 miss - head eddfd51d6 - digest sha256:18ecb4e9ae7fb9... - run 35065200671
success	1	20	1036 / 1036	2m 50s / 5m 22s	`docker run ... @sha256:b922c66...`	Sep 15, 06:55
run 34938302149 executed 1036 - ccache 98 hit / 6523 miss - head af21c1640 - digest sha256:b922c664505400... - run 34938302149
success	1	20	1023 / 1023	2m 09s / 4m 45s	`docker run ... @sha256:03a96cc...`	Sep 14, 06:51
run 34814598317 executed 1023 - ccache 98 hit / 6523 miss - head 7f1ef1baa - digest sha256:03a96cc9ca10d7... - run 34814598317
success	1	20	1023 / 1023	2m 45s / 5m 11s	`docker run ... @sha256:715fa02...`	Sep 13, 06:30
run 34742275702 executed 1023 - ccache 98 hit / 6523 miss - head 0db580142 - digest sha256:715fa02756bfdb... - run 34742275702
success	1	20	1023 / 1023	2m 50s / 5m 27s	`docker run ... @sha256:2480c19...`	Sep 12, 06:15
run 34677225854 executed 1023 - ccache 98 hit / 6523 miss - head 50aea5711 - digest sha256:2480c19eb55475... - run 34677225854
success	1	20	1022 / 1022	2m 59s / 5m 42s	`docker run ... @sha256:6225759...`	Sep 11, 06:14
run 34568324179 executed 1022 - ccache 98 hit / 6523 miss - head 95f2e1edd - digest sha256:6225759fd8686e... - run 34568324179
success	1	20	1022 / 1022	2m 49s / 4m 46s	`docker run ... @sha256:cf7a747...`	Sep 10, 06:12
run 34443438806 executed 1022 - ccache 98 hit / 6523 miss - head fbf3632f2 - digest sha256:cf7a747d356b20... - run 34443438806
success	1	20	1020 / 1020	2m 44s / 4m 59s	`docker run ... @sha256:42c33c5...`	Sep 09, 06:08
run 34317039585 executed 1020 - ccache 98 hit / 6523 miss - head 4ba77f401 - digest sha256:42c33c5a0681be... - run 34317039585
success	1	20	1020 / 1020	2m 56s / 5m 32s	`docker run ... @sha256:044ff75...`	Sep 08, 06:08
run 34192630844 executed 1020 - ccache 98 hit / 6523 miss - head 5d808ce8c - digest sha256:044ff7589c6796... - run 34192630844
success	1	20	1024 / 1024	2m 48s / 5m 06s	`docker run ... @sha256:db4de42...`	Sep 07, 06:06
run 34088668180 executed 1024 - ccache 98 hit / 6527 miss - head 789edd8c8 - digest sha256:db4de42d267cc9... - run 34088668180
success	1	20	1024 / 1024	2m 55s / 5m 30s	`docker run ... @sha256:8f98e2a...`	Sep 05, 07:57
run 33953475662 executed 1024 - ccache 98 hit / 6527 miss - head 7861a0534 - digest sha256:8f98e2afe2d558... - run 33953475662
success	1	20	1024 / 1024	2m 46s / 5m 21s	`docker run ... @sha256:e76b94b...`	Sep 04, 07:55
run 33850102694 executed 1024 - ccache 98 hit / 6527 miss - head a8feb50d9 - digest sha256:e76b94bed331b0... - run 33850102694
success	1	20	1023 / 1023	2m 47s / 5m 22s	`docker run ... @sha256:177e334...`	Sep 03, 07:54
run 33729544259 executed 1023 - ccache 98 hit / 6526 miss - head 3f1e902cc - digest sha256:177e334967bb57... - run 33729544259
success	1	20	1022 / 1022	2m 56s / 5m 25s	`docker run ... @sha256:e471025...`	Sep 02, 07:54
run 33604872959 executed 1022 - ccache 98 hit / 6526 miss - head 0d065b6e4 - digest sha256:e471025a190d7e... - run 33604872959
success	1	20	1022 / 1022	2m 12s / 4m 15s	`docker run ... @sha256:bcad4ae...`	Sep 01, 07:51
run 33483269014 executed 1022 - ccache 98 hit / 6526 miss - head 612f529ab - digest sha256:bcad4ae69f2f02... - run 33483269014
success	1	20	1022 / 1022	2m 47s / 5m 06s	`docker run ... @sha256:44def23...`	Aug 31, 07:30
run 33367918153 executed 1022 - ccache 98 hit / 6526 miss - head e1c71de20 - digest sha256:44def23f793fc2... - run 33367918153
success	1	20	1021 / 1021	2m 53s / 5m 00s	`docker run ... @sha256:01d2499...`	Aug 30, 07:28
run 33298854714 executed 1021 - ccache 98 hit / 6525 miss - head 4e4843b7f - digest sha256:01d2499b7e24a9... - run 33298854714
success	1	20	1021 / 1021	2m 55s / 5m 09s	`docker run ... @sha256:e927739...`	Aug 29, 07:24
run 33240341085 executed 1021 - ccache 98 hit / 6525 miss - head b1471f1ec - digest sha256:e927739880674c... - run 33240341085
success	1	20	1021 / 1021	2m 46s / 5m 31s	`docker run ... @sha256:28dfe63...`	Aug 28, 07:15
run 33150154263 executed 1021 - ccache 98 hit / 6525 miss - head bc2764509 - digest sha256:28dfe6305fe7af... - run 33150154263
success	1	20	1021 / 1021	2m 55s / 5m 30s	`docker run ... @sha256:cc4c4f6...`	Aug 27, 07:15
run 33048205224 executed 1021 - ccache 98 hit / 6525 miss - head be224c491 - digest sha256:cc4c4f64d3d2e5... - run 33048205224
success	1	20	1024 / 1024	2m 57s / 5m 44s	`docker run ... @sha256:7a56d73...`	Aug 26, 06:51
run 32939067634 executed 1024 - ccache 98 hit / 6525 miss - head 4831efc35 - digest sha256:7a56d73dff8498... - run 32939067634
success	1	20	1024 / 1024	2m 51s / 5m 34s	`docker run ... @sha256:740150c...`	Aug 25, 06:45
run 32817373587 executed 1024 - ccache 98 hit / 6525 miss - head 6d1b5a6e3 - digest sha256:740150ca3ef90f... - run 32817373587
success	1	20	1023 / 1023	3m 05s / 5m 55s	`docker run ... @sha256:3d448e2...`	Aug 24, 06:43
run 32697655600 executed 1023 - ccache 98 hit / 6525 miss - head 65af1e2ce - digest sha256:3d448e2e529228... - run 32697655600
success	1	20	1023 / 1023	2m 57s / 5m 01s	`docker run ... @sha256:9b08927...`	Aug 23, 06:40
run 32623021668 executed 1023 - ccache 98 hit / 6525 miss - head 947c689b9 - digest sha256:9b089275258383... - run 32623021668
success	1	20	1023 / 1023	2m 57s / 5m 23s	`docker run ... @sha256:1007344...`	Aug 22, 06:38
run 32557019593 executed 1023 - ccache 98 hit / 6525 miss - head 4a34ed994 - digest sha256:1007344c3e539f... - run 32557019593
success	1	20	1023 / 1023	2m 54s / 5m 39s	`docker run ... @sha256:60ffbfb...`	Aug 21, 06:37
run 32454359091 executed 1023 - ccache 98 hit / 6525 miss - head df0e8f11e - digest sha256:60ffbfb5f65e52... - run 32454359091
success	1	20	1023 / 1023	2m 59s / 5m 40s	`docker run ... @sha256:fd7d7a4...`	Aug 20, 06:40
run 32339468326 executed 1023 - ccache 98 hit / 6525 miss - head 9f13fc8dc - digest sha256:fd7d7a489948e3... - run 32339468326
success	1	20	1023 / 1023	2m 49s / 5m 30s	`docker run ... @sha256:aac1e22...`	Aug 19, 06:35
run 32223128067 executed 1023 - ccache 98 hit / 6525 miss - head c1f46cc74 - digest sha256:aac1e2283878e1... - run 32223128067
success	1	20	1020 / 1020	2m 56s / 5m 33s	`docker run ... @sha256:f38888f...`	Aug 18, 06:34
run 32106545191 executed 1020 - ccache 98 hit / 6524 miss - head c2509aace - digest sha256:f38888f5494a88... - run 32106545191
success	1	20	1019 / 1019	2m 50s / 5m 41s	`docker run ... @sha256:2fa9d47...`	Aug 17, 06:34
run 32001227012 executed 1019 - ccache 98 hit / 6524 miss - head a00df29bb - digest sha256:2fa9d47c87cf6a... - run 32001227012
success	1	20	1019 / 1019	2m 55s / 5m 05s	`docker run ... @sha256:446bd48...`	Aug 16, 06:33
run 31931114363 executed 1019 - ccache 98 hit / 6524 miss - head d056b10f4 - digest sha256:446bd4896d4e4c... - run 31931114363
success	1	20	1019 / 1019	2m 55s / 5m 38s	`docker run ... @sha256:55934eb...`	Aug 15, 06:29
run 31869048694 executed 1019 - ccache 98 hit / 6524 miss - head 4146847c8 - digest sha256:55934eb330f07d... - run 31869048694
success	1	20	1019 / 1019	2m 54s / 5m 24s	`docker run ... @sha256:c315b3a...`	Aug 14, 06:29
run 31775705304 executed 1019 - ccache 165 hit / 6457 miss - head 12d40a197 - digest sha256:c315b3a9bf83e9... - run 31775705304
success	1	20	1019 / 1019	2m 52s / 5m 35s	`docker run ... @sha256:497c514...`	Aug 13, 06:28
run 31673187017 executed 1019 - ccache 165 hit / 6457 miss - head d5a43ea33 - digest sha256:497c5141611989... - run 31673187017
success	1	20	1019 / 1019	2m 47s / 5m 08s	`docker run ... @sha256:945d4ec...`	Aug 12, 06:26
run 31569276814 executed 1019 - ccache 165 hit / 6454 miss - head ee2e845bc - digest sha256:945d4ec535a012... - run 31569276814
success	1	20	1019 / 1019	2m 10s / 4m 36s	`docker run ... @sha256:2ec4324...`	Aug 11, 06:24
run 31464256336 executed 1019 - ccache 165 hit / 6453 miss - head 1d3e2c7b8 - digest sha256:2ec432402ea797... - run 31464256336
success	1	20	1019 / 1019	2m 50s / 5m 21s	`docker run ... @sha256:cfedca0...`	Aug 10, 06:24
run 31361065745 executed 1019 - ccache 166 hit / 6452 miss - head 740be7dac - digest sha256:cfedca09ace642... - run 31361065745
success	1	20	1019 / 1019	2m 54s / 5m 34s	`docker run ... @sha256:df24aab...`	Aug 08, 05:03
run 31240124192 executed 1019 - ccache 166 hit / 6452 miss - head 4666e3cc1 - digest sha256:df24aab367bd9f... - run 31240124192
success	1	20	1018 / 1018	2m 54s / 5m 23s	`docker run ... @sha256:dcd18b1...`	Aug 07, 05:02
run 31148241512 executed 1018 - ccache 166 hit / 6452 miss - head 7d27fd627 - digest sha256:dcd18b11a57312... - run 31148241512
success	1	20	1018 / 1018	2m 58s / 5m 28s	`docker run ... @sha256:0779a62...`	Aug 05, 23:53
run 31057262248 executed 1018 - ccache 166 hit / 6452 miss - head 310a6ddb5 - digest sha256:0779a62559237b... - run 31057262248
success	1	20	1018 / 1018	2m 44s / 4m 28s	`docker run ... @sha256:d0aa7a7...`	Aug 04, 23:50
run 30960799033 executed 1018 - ccache 166 hit / 6452 miss - head 3450383cd - digest sha256:d0aa7a70bcfea2... - run 30960799033
success	1	20	1018 / 1018	2m 58s / 5m 24s	`docker run ... @sha256:2e67ba9...`	Aug 03, 23:51
run 30862998616 executed 1018 - ccache 166 hit / 6452 miss - head 5ee01396f - digest sha256:2e67ba9390e815... - run 30862998616
success	1	20	1017 / 1017	2m 58s / 4m 57s	`docker run ... @sha256:b2b8dc2...`	Aug 02, 23:48
run 30772666039 executed 1017 - ccache 166 hit / 6452 miss - head ab91135d8 - digest sha256:b2b8dc2ec0df9d... - run 30772666039
success	1	20	1017 / 1017	2m 54s / 5m 11s	`docker run ... @sha256:a66214c...`	Aug 01, 23:47
run 30723668041 executed 1017 - ccache 166 hit / 6452 miss - head 21747aaed - digest sha256:a66214c8ccf055... - run 30723668041
success	1	20	1017 / 1017	2m 14s / 4m 40s	`docker run ... @sha256:88814b7...`	Jul 31, 23:45
run 30673292470 executed 1017 - ccache 166 hit / 6452 miss - head 3d4462f12 - digest sha256:88814b746cf8d2... - run 30673292470
success	1	20	1016 / 1016	2m 46s / 4m 48s	`docker run ... @sha256:1ad81d3...`	Jul 30, 23:44
run 30590897763 executed 1016 - ccache 166 hit / 6452 miss - head a7242b71b - digest sha256:1ad81d3ba759b4... - run 30590897763
success	1	20	1016 / 1016	2m 57s / 5m 22s	`docker run ... @sha256:934e630...`	Jul 29, 23:44
run 30499905913 executed 1016 - ccache 166 hit / 6452 miss - head 78143f3f9 - digest sha256:934e6302fb7b12... - run 30499905913
success	1	20	1015 / 1015	2m 56s / 5m 21s	`docker run ... @sha256:0030d56...`	Jul 28, 23:43
run 30408331012 executed 1015 - ccache 166 hit / 6452 miss - head 198236b76 - digest sha256:0030d56e47a9bc... - run 30408331012