Merge branch 'PGPROEE10' into PGPROEE10_scheduler

Author: Vladimir Ershov

contrib/pageinspect/hashfuncs.c

@@ -313,10 +313,10 @@ hash_page_items(PG_FUNCTION_ARGS)
 
 		fctx = SRF_FIRSTCALL_INIT();
 
-		page = verify_hash_page(raw_page, LH_BUCKET_PAGE | LH_OVERFLOW_PAGE);
-
 		mctx = MemoryContextSwitchTo(fctx->multi_call_memory_ctx);
 
+		page = verify_hash_page(raw_page, LH_BUCKET_PAGE | LH_OVERFLOW_PAGE);
+
 		uargs = palloc(sizeof(struct user_args));
 
 		uargs->page = page;

doc/src/sgml/aqo.sgml

@@ -262,7 +262,7 @@ DELETE FROM aqo_data;
 </programlisting>
     <para>
       Alternatively, you can specify a particular query type to reset by
-      providing its hash value in the <literal>fspaсe_hash</literal> option. For example:
+      providing its hash value in the <literal>fspace_hash</literal> option. For example:
     </para>
     <programlisting>
 DELETE FROM aqo_data WHERE fspace_hash = (SELECT fspace_hash FROM aqo_queries 

doc/src/sgml/ddl.sgml

@@ -3077,14 +3077,14 @@ CREATE TABLE measurement (
 
 <programlisting>
 CREATE TABLE measurement_y2006m02 PARTITION OF measurement
-    FOR VALUES FROM ('2006-02-01') TO ('2006-03-01')
+    FOR VALUES FROM ('2006-02-01') TO ('2006-03-01');
 
 CREATE TABLE measurement_y2006m03 PARTITION OF measurement
-    FOR VALUES FROM ('2006-03-01') TO ('2006-04-01')
+    FOR VALUES FROM ('2006-03-01') TO ('2006-04-01');
 
 ...
 CREATE TABLE measurement_y2007m11 PARTITION OF measurement
-    FOR VALUES FROM ('2007-11-01') TO ('2007-12-01')
+    FOR VALUES FROM ('2007-11-01') TO ('2007-12-01');
 
 CREATE TABLE measurement_y2007m12 PARTITION OF measurement
     FOR VALUES FROM ('2007-12-01') TO ('2008-01-01')

doc/src/sgml/func.sgml

@@ -20405,7 +20405,6 @@ SELECT (pg_stat_file('filename')).modification;
    </para>
 
   </sect2>
-
   <sect2 id="functions-compression-control">
    <title>Compression Control Functions</title>
 
@@ -20462,87 +20461,89 @@ SELECT (pg_stat_file('filename')).modification;
         <literal><function>cfs_start_gc(n_workers integer)</function></literal>
         </entry>
        <entry><type>integer</type></entry>
-       <entry>Manually initiate GC using specified number of workers (only if background GC is disabled).
+       <entry>Starts garbage collection using the specified number of workers.
+       You can only run this function to start the garbage collection manually
+       if background garbage collection is disabled.
        </entry>
       </row>
       <row>
        <entry>
         <literal><function>cfs_enable_gc(enabled boolean)</function></literal>
         </entry>
        <entry><type>boolean</type></entry>
-       <entry>Enable or disable background GC (also can be done using <xref linkend="guc-cfs-gc"> configuation variable).
+       <entry>Enables/disables background garbage collection. Alternatively, you can use the <xref linkend="guc-cfs-gc"> configuration variable.
        </entry>
       </row>
       <row>
        <entry>
         <literal><function>cfs_gc_relation(rel regclass)</function></literal>
         </entry>
        <entry><type>integer</type></entry>
-       <entry>Perform garbage collection of particular table. Returns number of processed segments.
+       <entry>Performs garbage collection for a particular table. This function returns the number of processed segments.
        </entry>
       </row>
       <row>
        <entry>
         <literal><function>cfs_version()</function></literal>
         </entry>
        <entry><type>text</type></entry>
-       <entry>CFS version and used compression algorithm.
+       <entry>Displays the CFS version and the specific compression algorithm used.
        </entry>
       </row>
       <row>
        <entry>
         <literal><function>cfs_estimate(rel regclass)</function></literal>
         </entry>
        <entry><type>float8</type></entry>
-       <entry>Estimate effect of table compression. Returns average compress ratio for first ten blocks of the relation.
+       <entry>Estimates the effect of table compression. Returns the average compression ratio for the first ten blocks of the relation.
        </entry>
       </row>
       <row>
        <entry>
         <literal><function>cfs_compression_ratio(rel regclass)</function></literal>
         </entry>
        <entry><type>float8</type></entry>
-       <entry>Returns real compression ration for all segments of the compressed relation.
+       <entry>Returns the actual compression ratio for all segments of the compressed relation.
        </entry>
       </row>
       <row>
        <entry>
         <literal><function>cfs_fragmentation(rel regclass)</function></literal>
         </entry>
        <entry><type>float8</type></entry>
-       <entry>Returns average fragmentation of the relation files.
+       <entry>Returns the average fragmentation ratio of the relation files.
        </entry>
       </row>
       <row>
        <entry>
         <literal><function>cfs_gc_activity_processed_bytes()</function></literal>
         </entry>
        <entry><type>int64</type></entry>
-       <entry>Returns total size of pages transferred by CFS during garbage collection.
+       <entry>Returns the total size of pages processed by CFS during garbage collection.
        </entry>
       </row>
       <row>
        <entry>
         <literal><function>cfs_gc_activity_processed_pages()</function></literal>
         </entry>
        <entry><type>int64</type></entry>
-       <entry>Returns number of pages transferred by CFS during garbage collection.
+       <entry>Returns the number of pages processed by CFS during garbage collection.
        </entry>
       </row>
       <row>
        <entry>
         <literal><function>cfs_gc_activity_processed_files()</function></literal>
         </entry>
        <entry><type>int64</type></entry>
-       <entry>Returns number of files compacted by CFS during garbage collection.
+       <entry>Returns the number of files compacted by CFS during garbage collection.
        </entry>
       </row>
       <row>
        <entry>
         <literal><function>cfs_gc_activity_scanned_files()</function></literal>
         </entry>
        <entry><type>int64</type></entry>
-       <entry>Returns number of files scanned by CFS during garbage collection.
+       <entry>Returns the number of files scanned by CFS during garbage collection.
        </entry>
       </row>
      </tbody>

doc/src/sgml/in-memory.sgml

@@ -280,12 +280,7 @@ Execution time: 0.353 ms
       <literal>RESTART IDENTITY</literal>,
       <literal>CONTINUE IDENTITY</literal>, <literal>CASCADE</literal>,
       and <literal>RESTRICT</literal> options of the <command>TRUNCATE</command> command
-      are not supported by in-memory tables. To truncate an in-memory
-      table, you must specify its name directly. For example:
-    <programlisting>
-# TRUNCATE blog_views;
-TRUNCATE TABLE
-</programlisting>
+      are not supported by in-memory tables.
       </para>
 
 </sect3>

doc/src/sgml/intro.sgml

@@ -255,7 +255,7 @@
       <simpara>Lazy placement of temporary tables on disk</simpara>
     </listitem>
     <listitem>
-      <simpara>Consistent read on slaves (wait for WAL apply, see <xref linkend="sql-waitlsn">)</simpara>
+      <simpara>Consistent read on standby servers (wait for WAL apply, see <xref linkend="sql-waitlsn">)</simpara>
     </listitem>
     <listitem>
       <simpara>Utility <link linkend="app-pgrepack"><application>pg_repack</application></link> has been added</simpara>

doc/src/sgml/libpq.sgml

@@ -7612,11 +7612,10 @@ ldap://ldap.acme.com/cn=dbserver,cn=hosts?pgconnectinfo?base?(objectclass=*)
    To allow the client to verify the identity of the server, place a root
    certificate on the client and a leaf certificate signed by the root
    certificate on the server.  To allow the server to verify the identity
-   of the client, place a root certificate on the server and a leaf and
-   optional intermediate certificates signed by the root certificate on
-   the client.  Intermediate certificates (usually stored with the leaf
-   certificate) can also be used to link the leaf certificate to the
-   root certificate.
+   of the client, place a root certificate on the server and a leaf
+   certificate signed by the root certificate on the client.  One or more
+   intermediate certificates (usually stored with the leaf certificate)
+   can also be used to link the leaf certificate to the root certificate.
   </para>
 
   <para>

doc/src/sgml/ref/create_trigger.sgml

@@ -500,17 +500,17 @@ UPDATE OF <replaceable>column_name1</replaceable> [, <replaceable>column_name2</
   </para>
 
   <para>
-    Modifying a partitioned table or a table with inheritance children fires
-    statement-level triggers directly attached to that table, but not
-    statement-level triggers for its partitions or child tables.  In contrast,
-    row-level triggers are fired for all affected partitions or child tables.
-    If a statement-level trigger has been defined with transition relations
-    named by a <literal>REFERENCING</literal> clause, then before and after
-    images of rows are visible from all affected partitions or child tables.
-    In the case of inheritance children, the row images include only columns
-    that are present in the table that the trigger is attached to.  Currently,
-    row-level triggers with transition relations cannot be defined on
-    partitions or inheritance child tables.
+   Modifying a partitioned table or a table with inheritance children fires
+   statement-level triggers directly attached to that table, but not
+   statement-level triggers for its partitions or child tables.  In contrast,
+   row-level triggers are fired for all affected partitions or child tables.
+   If a statement-level trigger has been defined with transition relations
+   named by a <literal>REFERENCING</literal> clause, then before and after
+   images of rows are visible from all affected partitions or child tables.
+   In the case of inheritance children, the row images include only columns
+   that are present in the table that the trigger is attached to.  Currently,
+   row-level triggers with transition relations cannot be defined on
+   partitions or inheritance child tables.
   </para>
 
   <para>

doc/src/sgml/ref/pg_ctl-ref.sgml

@@ -405,10 +405,12 @@ doc/src/sgml/ref/pg_ctl-ref.sgml
        </para>
 
        <para>
-        When waiting for startup, <command>pg_ctl</command> repeatedly
-        attempts to connect to the server.
-        When waiting for shutdown, <command>pg_ctl</command> waits for
-        the server to remove its <acronym>PID</acronym> file.
+        When waiting, <command>pg_ctl</command> repeatedly checks the
+        server's <acronym>PID</acronym> file, sleeping for a short amount
+        of time between checks.  Startup is considered complete when
+        the <acronym>PID</acronym> file indicates that the server is ready to
+        accept connections.  Shutdown is considered complete when the server
+        removes the <acronym>PID</acronym> file.
         <command>pg_ctl</command> returns an exit code based on the
         success of the startup or shutdown.
        </para>

doc/src/sgml/ref/psql-ref.sgml

@@ -281,7 +281,9 @@ EOF
       <listitem>
       <para>
       List all available databases, then exit. Other non-connection
-      options are ignored. This is similar to the meta-command
+      options are ignored. If an explicit database name is not
+      found the <literal>postgres</literal> database, not the user's,
+      will be targeted for connection. This is similar to the meta-command
       <command>\list</command>.
       </para>
       </listitem>

doc/src/sgml/release-proee-9.6.sgml

@@ -829,7 +829,7 @@
     <para>Lazy placement of temporary tables on disk</para>
     </listitem>
     <listitem>
-    <para>Consistent read on slaves (wait for WAL apply, see <xref linkend="sql-waitlsn">)</para>
+    <para>Consistent read on standby servers (wait for WAL apply, see <xref linkend="sql-waitlsn">)</para>
     </listitem>
     <listitem>
     <para>Utility <application>pg_repack</application> has been added (See <xref linkend="app-pgrepack">)</para>

doc/src/sgml/runtime.sgml

@@ -2674,8 +2674,8 @@ pg_dump <replaceable>dbname</> -h <replaceable>hostname</> > db.sql
    </sect2>
 
    <sect2>
-   <title>Using <acronym>RDMA</acronym> for Master-Slave Replication</title>
-   <para>To enable master-slave replication over <acronym>RDMA</acronym> connections via <literal>rsocket</literal>, you need to configure master and slave nodes. For example, to allow client connections to the server 172.17.3.21 from 172.17.3.0/24 addresses on behalf of the <literal>postgres</> user, follow the steps below:</para>
+   <title>Using <acronym>RDMA</acronym> for Master-Standby Replication</title>
+   <para>To enable master-standby replication over <acronym>RDMA</acronym> connections via <literal>rsocket</literal>, you need to configure master and standby nodes. For example, to allow client connections to the server 172.17.3.21 from 172.17.3.0/24 addresses on behalf of the <literal>postgres</> user, follow the steps below:</para>
 
        <para><emphasis role="strong">To set up the master node for replication over <acronym>RDMA</acronym> connections via <literal>rsocket</literal>:</emphasis>
        </para>
@@ -2715,7 +2715,7 @@ LOG:  disconnection: session time: 0:00:00.622 user=postgres database= host=172.
 </para>
 </tip>
 
-       <para><emphasis role="strong">To set up the slave node:</emphasis>
+       <para><emphasis role="strong">To set up the standby node:</emphasis>
        </para>
        <orderedlist>
          <listitem>
@@ -2730,7 +2730,7 @@ export WITH_RSOCKET=true
            <programlisting>
 pg_basebackup -D <replaceable>datadir</> -x -R -h 172.17.3.21 -U postgres
 </programlisting>
-All the data appears on the slave node under the specified <replaceable>datadir</> directory.
+All the data appears on the standby node under the specified <replaceable>datadir</> directory.
            </para>
          </listitem>
          <listitem>
@@ -2750,7 +2750,7 @@ listen_rdma_addresses = ''
          </listitem>
        </orderedlist>
 
-<para>Once the setup is complete, start the slave node. The streaming replication is now performed over the <acronym>RDMA</acronym> connections using <literal>rsocket</literal> API.</para>
+<para>Once the setup is complete, start the standby node. The streaming replication is now performed over the <acronym>RDMA</acronym> connections using <literal>rsocket</literal> API.</para>
 
    </sect2>