Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit0605b58

Browse files
committed
Merge branch 'REL9_5_STABLE' into PGPRO9_5
2 parents67345f8 +c9bb00f commit0605b58

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+2569
-1351
lines changed

‎contrib/test_decoding/expected/xact.out‎

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ SELECT 'init' FROM pg_create_logical_replication_slot('regression_slot', 'test_d
66
init
77
(1 row)
88

9-
-- bug #13844, xids in non-decoded records need to be inspected
109
CREATE TABLE xact_test(data text);
1110
INSERT INTO xact_test VALUES ('before-test');
11+
-- bug #13844, xids in non-decoded records need to be inspected
1212
BEGIN;
1313
-- perform operation in xact that creates and logs xid, but isn't decoded
1414
SELECT * FROM xact_test FOR UPDATE;
@@ -33,6 +33,28 @@ SELECT data FROM pg_logical_slot_get_changes('regression_slot', NULL, NULL, 'inc
3333
COMMIT
3434
(6 rows)
3535

36+
-- bug #14279, do not propagate null snapshot from subtransaction
37+
BEGIN;
38+
-- first insert
39+
INSERT INTO xact_test VALUES ('main-txn');
40+
SAVEPOINT foo;
41+
-- now perform operation in subxact that creates and logs xid, but isn't decoded
42+
SELECT 1 FROM xact_test FOR UPDATE LIMIT 1;
43+
?column?
44+
----------
45+
1
46+
(1 row)
47+
48+
COMMIT;
49+
-- and now show those changes
50+
SELECT data FROM pg_logical_slot_get_changes('regression_slot', NULL, NULL, 'include-xids', '0', 'skip-empty-xacts', '1');
51+
data
52+
-------------------------------------------------------
53+
BEGIN
54+
table public.xact_test: INSERT: data[text]:'main-txn'
55+
COMMIT
56+
(3 rows)
57+
3658
DROP TABLE xact_test;
3759
SELECT pg_drop_replication_slot('regression_slot');
3860
pg_drop_replication_slot

‎contrib/test_decoding/sql/xact.sql‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ SET synchronous_commit = on;
33

44
SELECT'init'FROM pg_create_logical_replication_slot('regression_slot','test_decoding');
55

6-
-- bug #13844, xids in non-decoded records need to be inspected
76
CREATETABLExact_test(datatext);
87
INSERT INTO xact_testVALUES ('before-test');
98

9+
-- bug #13844, xids in non-decoded records need to be inspected
1010
BEGIN;
1111
-- perform operation in xact that creates and logs xid, but isn't decoded
1212
SELECT*FROM xact_test FORUPDATE;
@@ -17,6 +17,17 @@ COMMIT;
1717
-- and now show those changes
1818
SELECT dataFROM pg_logical_slot_get_changes('regression_slot',NULL,NULL,'include-xids','0','skip-empty-xacts','1');
1919

20+
-- bug #14279, do not propagate null snapshot from subtransaction
21+
BEGIN;
22+
-- first insert
23+
INSERT INTO xact_testVALUES ('main-txn');
24+
SAVEPOINT foo;
25+
-- now perform operation in subxact that creates and logs xid, but isn't decoded
26+
SELECT1FROM xact_test FORUPDATELIMIT1;
27+
COMMIT;
28+
-- and now show those changes
29+
SELECT dataFROM pg_logical_slot_get_changes('regression_slot',NULL,NULL,'include-xids','0','skip-empty-xacts','1');
30+
2031
DROPTABLE xact_test;
2132

2233
SELECT pg_drop_replication_slot('regression_slot');

‎doc/src/sgml/catalogs.sgml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5905,9 +5905,9 @@
59055905
<entry>The number of distinct nonnull data values in the column.
59065906
A value greater than zero is the actual number of distinct values.
59075907
A value less than zero is the negative of a multiplier for the number
5908-
of rows in the table; for example, a column in whichvalues appear about
5909-
twice on the average could be represented by
5910-
<structfield>stadistinct</> = -0.5.
5908+
of rows in the table; for example, a column in whichabout 80% of the
5909+
values are nonnull and each nonnull value appears about twice on
5910+
average could be represented by<structfield>stadistinct</> = -0.4.
59115911
A zero value means the number of distinct values is unknown.
59125912
</entry>
59135913
</row>

‎doc/src/sgml/func.sgml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17573,14 +17573,20 @@ postgres=# SELECT * FROM pg_xlogfile_name_offset(pg_stop_backup());
1757317573
<indexterm>
1757417574
<primary>pg_replication_origin_xact_reset</primary>
1757517575
</indexterm>
17576-
<literal><function>pg_replication_origin_xact_reset()</function></literal>
17576+
<literal><function>pg_replication_origin_xact_reset(<parameter>origin_lsn</parameter> <type>pg_lsn</type>, <parameter>origin_timestamp</parameter> <type>timestamptz</type>)</function></literal>
1757717577
</entry>
1757817578
<entry>
1757917579
void
1758017580
</entry>
1758117581
<entry>
1758217582
Cancel the effects of
1758317583
<function>pg_replication_origin_xact_setup()</function>.
17584+
Note that two arguments were introduced <emphasis>by mistake</>
17585+
during the <productname>PostgreSQL</> 9.5 development cycle while
17586+
<function>pg_replication_origin_xact_reset()</function> actually
17587+
doesn't use them at all. Therefore, any dummy values except
17588+
<literal>NULL</> can be safely specified as the arguments.
17589+
This mistake will be fixed in a future release.
1758417590
</entry>
1758517591
</row>
1758617592

‎doc/src/sgml/information_schema.sgml‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2897,18 +2897,6 @@ ORDER BY c.ordinal_position;
28972897
<entry>Name of the foreign table</entry>
28982898
</row>
28992899

2900-
<row>
2901-
<entry><literal>foreign_server_catalog</literal></entry>
2902-
<entry><type>sql_identifier</type></entry>
2903-
<entry>Name of the database that the foreign server is defined in (always the current database)</entry>
2904-
</row>
2905-
2906-
<row>
2907-
<entry><literal>foreign_server_name</literal></entry>
2908-
<entry><type>sql_identifier</type></entry>
2909-
<entry>Name of the foreign server</entry>
2910-
</row>
2911-
29122900
<row>
29132901
<entry><literal>option_name</literal></entry>
29142902
<entry><type>sql_identifier</type></entry>

‎doc/src/sgml/ref/insert.sgml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -295,8 +295,7 @@ INSERT INTO <replaceable class="PARAMETER">table_name</replaceable> [ AS <replac
295295
inference, it consists of one or more <replaceable
296296
class="PARAMETER">index_column_name</replaceable> columns and/or
297297
<replaceable class="PARAMETER">index_expression</replaceable>
298-
expressions, and an optional <replaceable class="PARAMETER">
299-
index_predicate</replaceable>. All <replaceable
298+
expressions, and an optional <replaceable class="PARAMETER">index_predicate</replaceable>. All <replaceable
300299
class="PARAMETER">table_name</replaceable> unique indexes that,
301300
without regard to order, contain exactly the
302301
<parameter>conflict_target</parameter>-specified

‎doc/src/sgml/ref/pgupgrade.sgml‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -410,8 +410,7 @@ pg_upgrade.exe
410410
</step>
411411

412412
<step>
413-
<title>Upgrade Streaming Replication and Log-Shipping standby
414-
servers</title>
413+
<title>Upgrade Streaming Replication and Log-Shipping standby servers</title>
415414

416415
<para>
417416
If you have Streaming Replication (see <xref
@@ -434,8 +433,7 @@ pg_upgrade.exe
434433
</step>
435434

436435
<step>
437-
<title>Make sure the new standby data directories do <emphasis>not</>
438-
exist</title>
436+
<title>Make sure the new standby data directories do <emphasis>not</> exist</title>
439437

440438
<para>
441439
Make sure the new standby data directories do <emphasis>not</>
@@ -514,8 +512,7 @@ rsync --archive --delete --hard-links --size-only old_pgdata new_pgdata remote_d
514512
</step>
515513

516514
<step>
517-
<title>Configure streaming replication and log-shipping standby
518-
servers</title>
515+
<title>Configure streaming replication and log-shipping standby servers</title>
519516

520517
<para>
521518
Configure the servers for log shipping. (You do not need to run

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp