forked frompostgres/postgres
- Notifications
You must be signed in to change notification settings - Fork6
Commit05d8a56
committed
Clean up handling of XactReadOnly and RecoveryInProgress checks.
Add some checks that seem logically necessary, in particular let's makereal sure that HS slave sessions cannot create temp tables. (If they didthey would think that temp tables belonging to the master's session withthe same BackendId were theirs. We *must* not allow myTempNamespace tobecome set in a slave session.)Change setval() and nextval() so that they are only allowed on temp sequencesin a read-only transaction. This seems consistent with what we allow fortable modifications in read-only transactions. Since an HS slave can't have atemp sequence, this also provides a nicer cure for the setval PANIC reportedby Erik Rijkers.Make the error messages more uniform, and have them mention the specificcommand being complained of. This seems worth the trifling amount of extracode, since people are likely to see such messages a lot more than before.1 parentfada420 commit05d8a56
File tree
12 files changed
+114
-64
lines changed- src
- backend
- access/transam
- catalog
- commands
- executor
- tcop
- utils/adt
- include
- test/regress/expected
12 files changed
+114
-64
lines changedLines changed: 9 additions & 1 deletion
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
6 | 6 |
| |
7 | 7 |
| |
8 | 8 |
| |
9 |
| - | |
| 9 | + | |
10 | 10 |
| |
11 | 11 |
| |
12 | 12 |
| |
| |||
58 | 58 |
| |
59 | 59 |
| |
60 | 60 |
| |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
61 | 65 |
| |
62 | 66 |
| |
63 | 67 |
| |
| |||
420 | 424 |
| |
421 | 425 |
| |
422 | 426 |
| |
| 427 | + | |
| 428 | + | |
| 429 | + | |
| 430 | + | |
423 | 431 |
| |
424 | 432 |
| |
425 | 433 |
| |
|
Lines changed: 1 addition & 4 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
10 | 10 |
| |
11 | 11 |
| |
12 | 12 |
| |
13 |
| - | |
| 13 | + | |
14 | 14 |
| |
15 | 15 |
| |
16 | 16 |
| |
| |||
402 | 402 |
| |
403 | 403 |
| |
404 | 404 |
| |
405 |
| - | |
406 |
| - | |
407 |
| - | |
408 | 405 |
| |
409 | 406 |
| |
410 | 407 |
| |
|
Lines changed: 16 additions & 1 deletion
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
13 | 13 |
| |
14 | 14 |
| |
15 | 15 |
| |
16 |
| - | |
| 16 | + | |
17 | 17 |
| |
18 | 18 |
| |
19 | 19 |
| |
| |||
3017 | 3017 |
| |
3018 | 3018 |
| |
3019 | 3019 |
| |
| 3020 | + | |
| 3021 | + | |
| 3022 | + | |
| 3023 | + | |
| 3024 | + | |
| 3025 | + | |
| 3026 | + | |
| 3027 | + | |
| 3028 | + | |
| 3029 | + | |
| 3030 | + | |
| 3031 | + | |
| 3032 | + | |
| 3033 | + | |
| 3034 | + | |
3020 | 3035 |
| |
3021 | 3036 |
| |
3022 | 3037 |
| |
|
Lines changed: 4 additions & 1 deletion
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
7 | 7 |
| |
8 | 8 |
| |
9 | 9 |
| |
10 |
| - | |
| 10 | + | |
11 | 11 |
| |
12 | 12 |
| |
13 | 13 |
| |
| |||
534 | 534 |
| |
535 | 535 |
| |
536 | 536 |
| |
| 537 | + | |
| 538 | + | |
| 539 | + | |
537 | 540 |
| |
538 | 541 |
| |
539 | 542 |
| |
|
Lines changed: 2 additions & 4 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
8 | 8 |
| |
9 | 9 |
| |
10 | 10 |
| |
11 |
| - | |
| 11 | + | |
12 | 12 |
| |
13 | 13 |
| |
14 | 14 |
| |
| |||
1023 | 1023 |
| |
1024 | 1024 |
| |
1025 | 1025 |
| |
1026 |
| - | |
1027 |
| - | |
1028 |
| - | |
| 1026 | + | |
1029 | 1027 |
| |
1030 | 1028 |
| |
1031 | 1029 |
| |
|
Lines changed: 2 additions & 2 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
8 | 8 |
| |
9 | 9 |
| |
10 | 10 |
| |
11 |
| - | |
| 11 | + | |
12 | 12 |
| |
13 | 13 |
| |
14 | 14 |
| |
| |||
55 | 55 |
| |
56 | 56 |
| |
57 | 57 |
| |
58 |
| - | |
| 58 | + | |
59 | 59 |
| |
60 | 60 |
| |
61 | 61 |
| |
|
Lines changed: 9 additions & 7 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
8 | 8 |
| |
9 | 9 |
| |
10 | 10 |
| |
11 |
| - | |
| 11 | + | |
12 | 12 |
| |
13 | 13 |
| |
14 | 14 |
| |
| |||
459 | 459 |
| |
460 | 460 |
| |
461 | 461 |
| |
462 |
| - | |
463 |
| - | |
464 |
| - | |
465 | 462 |
| |
466 | 463 |
| |
467 | 464 |
| |
| |||
472 | 469 |
| |
473 | 470 |
| |
474 | 471 |
| |
| 472 | + | |
| 473 | + | |
| 474 | + | |
| 475 | + | |
475 | 476 |
| |
476 | 477 |
| |
477 | 478 |
| |
| |||
736 | 737 |
| |
737 | 738 |
| |
738 | 739 |
| |
739 |
| - | |
740 |
| - | |
741 |
| - | |
742 | 740 |
| |
743 | 741 |
| |
744 | 742 |
| |
| |||
748 | 746 |
| |
749 | 747 |
| |
750 | 748 |
| |
| 749 | + | |
| 750 | + | |
| 751 | + | |
| 752 | + | |
751 | 753 |
| |
752 | 754 |
| |
753 | 755 |
| |
|
Lines changed: 10 additions & 11 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
26 | 26 |
| |
27 | 27 |
| |
28 | 28 |
| |
29 |
| - | |
| 29 | + | |
30 | 30 |
| |
31 | 31 |
| |
32 | 32 |
| |
| |||
50 | 50 |
| |
51 | 51 |
| |
52 | 52 |
| |
| 53 | + | |
53 | 54 |
| |
54 | 55 |
| |
55 | 56 |
| |
| |||
568 | 569 |
| |
569 | 570 |
| |
570 | 571 |
| |
| 572 | + | |
| 573 | + | |
| 574 | + | |
| 575 | + | |
571 | 576 |
| |
572 | 577 |
| |
573 | 578 |
| |
| |||
577 | 582 |
| |
578 | 583 |
| |
579 | 584 |
| |
580 |
| - | |
| 585 | + | |
| 586 | + | |
581 | 587 |
| |
582 | 588 |
| |
583 |
| - | |
| 589 | + | |
584 | 590 |
| |
585 | 591 |
| |
586 | 592 |
| |
| |||
596 | 602 |
| |
597 | 603 |
| |
598 | 604 |
| |
599 |
| - | |
| 605 | + | |
600 | 606 |
| |
601 |
| - | |
602 |
| - | |
603 |
| - | |
604 |
| - | |
605 |
| - | |
606 |
| - | |
607 |
| - | |
608 | 607 |
| |
609 | 608 |
| |
610 | 609 |
| |
|
0 commit comments
Comments
(0)