翻译 mvcc.sgml parallel.sgml pgstandby.sgml

Author: ChenHuajun

postgresql/doc/src/sgml/mvcc.sgml

@@ -1345,7 +1345,7 @@ ____________________________________________________________________________-->
 
   <sect2 id="locking-tables">
 <!--==========================orignal english content==========================
-   <title>Table-level Locks</title>
+   <title>Table-Level Locks</title>
 ____________________________________________________________________________-->
    <title>表级锁</title>
 
@@ -1390,7 +1390,7 @@ ____________________________________________________________________________-->
 
      <variablelist>
 <!--==========================orignal english content==========================
-      <title>Table-level Lock Modes</title>
+      <title>Table-Level Lock Modes</title>
 ____________________________________________________________________________-->
       <title>表级锁模式</title>
       <varlistentry>
@@ -1527,14 +1527,19 @@ ____________________________________________________________________________-->
         <para>
          Acquired by <command>VACUUM</command> (without <option>FULL</option>),
          <command>ANALYZE</command>, <command>CREATE INDEX CONCURRENTLY</command>,
-         <command>CREATE STATISTICS</command> and
-         <command>ALTER TABLE VALIDATE</command> and other
-         <command>ALTER TABLE</command> variants (for full details see
-         <xref linkend="sql-altertable"/>).
+         <command>REINDEX CONCURRENTLY</command>,
+         <command>CREATE STATISTICS</command>, and certain <command>ALTER
+         INDEX</command> and <command>ALTER TABLE</command> variants (for full
+         details see <xref linkend="sql-alterindex"/> and <xref
+         linkend="sql-altertable"/>).
         </para>
 ____________________________________________________________________________-->
         <para>
-         由<command>VACUUM</command>（不带<option>FULL</option>）、<command>ANALYZE</command>、<command>CREATE INDEX CONCURRENTLY</command>、<command>CREATE STATISTICS</command>和<command>ALTER TABLE VALIDATE</command>以及其他<command>ALTER TABLE</command>的变体获得。
+         由<command>VACUUM</command>（不带<option>FULL</option>）、<command>ANALYZE</command>、
+         <command>CREATE INDEX CONCURRENTLY</command>、<command>REINDEX CONCURRENTLY</command>、
+         <command>CREATE STATISTICS</command>以及某些<command>ALTER INDEX</command>和
+         <command>ALTER TABLE</command>的变体获得(完整的详细请参考<xref linkend="sql-alterindex"/>
+         和<xref linkend="sql-altertable"/>)。
         </para>
        </listitem>
       </varlistentry>
@@ -1601,14 +1606,13 @@ ____________________________________________________________________________-->
 
 <!--==========================orignal english content==========================
         <para>
-         Acquired by <command>CREATE COLLATION</command>,
-         <command>CREATE TRIGGER</command>, and many forms of
+         Acquired by <command>CREATE TRIGGER</command> and some forms of
          <command>ALTER TABLE</command> (see <xref linkend="sql-altertable"/>).
         </para>
 ____________________________________________________________________________-->
         <para>
-         由<command>CREATE COLLATION</command>、<command>CREATE TRIGGER</command>和很多
-         <command>ALTER TABLE</command>的很多形式所获得（见
+         由<command>CREATE TRIGGER</command>和某些形式的
+         <command>ALTER TABLE</command>所获得（见
          <xref linkend="sql-altertable"/>）。
         </para>
        </listitem>
@@ -1684,14 +1688,15 @@ ____________________________________________________________________________-->
          <command>CLUSTER</command>, <command>VACUUM FULL</command>,
          and <command>REFRESH MATERIALIZED VIEW</command> (without
          <option>CONCURRENTLY</option>)
-         commands. Many forms of <command>ALTER TABLE</command> also acquire
+         commands. Many forms of <command>ALTER INDEX</command> and <command>ALTER TABLE</command> also acquire
          a lock at this level. This is also the default lock mode for
          <command>LOCK TABLE</command> statements that do not specify
          a mode explicitly.
         </para>
 ____________________________________________________________________________-->
         <para>
-         由<command>ALTER TABLE</command>、<command>DROP TABLE</command>、<command>TRUNCATE</command>、<command>REINDEX</command>、<command>CLUSTER</command>、<command>VACUUM FULL</command>和<command>REFRESH MATERIALIZED VIEW</command>（不带<option>CONCURRENTLY</option>）命令获取。<command>ALTER TABLE</command>的很多形式也在这个层面上获得锁（见<xref linkend="sql-altertable"/>）。这也是未显式指定模式的<command>LOCK TABLE</command>命令的默认锁模式。
+         由<command>ALTER TABLE</command>、<command>DROP TABLE</command>、<command>TRUNCATE</command>、<command>REINDEX</command>、<command>CLUSTER</command>、<command>VACUUM FULL</command>和<command>REFRESH MATERIALIZED VIEW</command>（不带<option>CONCURRENTLY</option>）命令获取。
+         很多形式的<command>ALTER INDEX</command>和<command>ALTER TABLE</command>也在这个层面上获得锁（见<xref linkend="sql-altertable"/>）。这也是未显式指定模式的<command>LOCK TABLE</command>命令的默认锁模式。
         </para>
        </listitem>
       </varlistentry>
@@ -1970,7 +1975,7 @@ ____________________________________________________________________________-->
 
    <sect2 id="locking-rows">
 <!--==========================orignal english content==========================
-    <title>Row-level Locks</title>
+    <title>Row-Level Locks</title>
 ____________________________________________________________________________-->
     <title>行级锁</title>
 
@@ -2148,7 +2153,7 @@ ____________________________________________________________________________-->
 
     <table tocentry="1" id="row-lock-compatibility">
 <!--==========================orignal english content==========================
-     <title>Conflicting Row-level Locks</title>
+     <title>Conflicting Row-Level Locks</title>
 ____________________________________________________________________________-->
      <title>冲突的行级锁</title>
      <tgroup cols="5">
@@ -2253,7 +2258,7 @@ ____________________________________________________________________________-->
 
    <sect2 id="locking-pages">
 <!--==========================orignal english content==========================
-    <title>Page-level Locks</title>
+    <title>Page-Level Locks</title>
 ____________________________________________________________________________-->
     <title>页级锁</title>
 
@@ -2617,7 +2622,7 @@ ____________________________________________________________________________-->
 
    <sect2 id="serializable-consistency">
 <!--==========================orignal english content==========================
-    <title>Enforcing Consistency With Serializable Transactions</title>
+    <title>Enforcing Consistency with Serializable Transactions</title>
 ____________________________________________________________________________-->
     <title>用可序列化事务来强制一致性</title>
 
@@ -2678,7 +2683,7 @@ ____________________________________________________________________________-->
 
    <sect2 id="non-serializable-consistency">
 <!--==========================orignal english content==========================
-    <title>Enforcing Consistency With Explicit Blocking Locks</title>
+    <title>Enforcing Consistency with Explicit Blocking Locks</title>
 ____________________________________________________________________________-->
     <title>使用显式锁定强制一致性</title>
 

postgresql/doc/src/sgml/parallel.sgml

@@ -188,19 +188,7 @@ ____________________________________________________________________________-->
       <para>
         <xref linkend="guc-max-parallel-workers-per-gather"/>必须被设置为大于零的值。这是一种特殊情况，更加普遍的原则是所用的工作者数量不能超过<varname>max_parallel_workers_per_gather</varname>所配置的数量。
       </para>
-    </listitem>
 
-    <listitem>
-<!--==========================orignal english content==========================
-      <para>
-        <xref linkend="guc-dynamic-shared-memory-type"/> must be set to a
-        value other than <literal>none</literal>.  Parallel query requires dynamic
-        shared memory in order to pass data between cooperating processes.
-      </para>
-____________________________________________________________________________-->
-      <para>
-        <xref linkend="guc-dynamic-shared-memory-type"/>必须被设置为除<literal>none</literal>之外的值。并行查询要求动态共享内存以便在合作的进程之间传递数据。
-      </para>
     </listitem>
   </itemizedlist>
 
@@ -292,18 +280,6 @@ ____________________________________________________________________________-->
         该查询运行在另一个已经存在的并行查询内部。例如，如果一个被并行查询调用的函数自己发出一个 SQL 查询，那么该查询将不会使用并行计划。这是当前实现的一个限制，但是或许不值得移除这个限制，因为它会导致单个查询使用大量的进程。
       </para>
     </listitem>
-
-    <listitem>
-<!--==========================orignal english content==========================
-      <para>
-        The transaction isolation level is serializable.  This is
-        a limitation of the current implementation.
-      </para>
-____________________________________________________________________________-->
-      <para>
-        事务隔离级别是可串行化。这是当前实现的一个限制。
-      </para>
-    </listitem>
   </itemizedlist>
 
 <!--==========================orignal english content==========================
@@ -366,21 +342,6 @@ ____________________________________________________________________________-->
         客户端发送了一个执行消息，并且消息中要求取元组的数量不为零。执行消息可见<link linkend="protocol-flow-ext-query">扩展查询协议</link>中的讨论。因为<link linkend="libpq">libpq</link>当前没有提供方法来发送这种消息，所以这种情况只可能发生在不依赖 libpq 的客户端中。如果这种情况经常发生，那在它可能发生的会话中设置 <xref linkend="guc-max-parallel-workers-per-gather"/>为零是一个很好的主意，这样可以避免产生连续运行时次优的查询计划。
       </para>
     </listitem>
-
-    <listitem>
-<!--==========================orignal english content==========================
-      <para>
-        The transaction isolation level is serializable.  This situation
-        does not normally arise, because parallel query plans are not
-        generated when the transaction isolation level is serializable.
-        However, it can happen if the transaction isolation level is changed to
-        serializable after the plan is generated and before it is executed.
-      </para>
-____________________________________________________________________________-->
-      <para> 
-        事务隔离级别是可串行化。这种情况通常不会出现，因为当事务隔离级别是可串行化时不会产生并行查询计划。不过，如果在产生计划之后并且在执行计划之前把事务隔离级别改成可串行化，这种情况就有可能发生。
-      </para>
-    </listitem>
   </itemizedlist>
  </sect1>
 
@@ -444,7 +405,7 @@ ____________________________________________________________________________-->
         scan</emphasis>, the cooperating processes take turns reading data from the
         index.  Currently, parallel index scans are supported only for
         btree indexes.  Each process will claim a single index block and will
-        scan and return all tuples referenced by that block; other process can
+        scan and return all tuples referenced by that block; other processes can
         at the same time be returning tuples from a different index block.
         The results of a parallel btree scan are returned in sorted order
         within each worker process.
@@ -656,7 +617,7 @@ ____________________________________________________________________________-->
     involve appending multiple results sets can therefore achieve
     coarse-grained parallelism even when efficient partial plans are not
     available.  For example, consider a query against a partitioned table
-    which can be only be implemented efficiently by using an index that does
+    which can only be implemented efficiently by using an index that does
     not support parallel scans.  The planner might choose a <literal>Parallel
     Append</literal> of regular <literal>Index Scan</literal> plans; each
     individual index scan would have to be executed to completion by a single

postgresql/doc/src/sgml/pgstandby.sgml

@@ -89,7 +89,7 @@ ____________________________________________________________________________-->
   <para>
    To configure a standby
    server to use <application>pg_standby</application>, put this into its
-   <filename>recovery.conf</filename> configuration file:
+   <filename>postgresql.conf</filename> configuration file:
 <programlisting>
 restore_command = 'pg_standby <replaceable>archiveDir</replaceable> %f %p %r'
 </programlisting>
@@ -98,7 +98,7 @@ restore_command = 'pg_standby <replaceable>archiveDir</replaceable> %f %p %r'
   </para>
 ____________________________________________________________________________-->
   <para>
-   要配置一台后备服务器去使用<application>pg_standby</application>，可以把下面的内容放在<filename>recovery.conf</filename>配置文件中：
+   要配置一台后备服务器去使用<application>pg_standby</application>，可以把下面的内容放在<filename>postgresql.conf</filename>配置文件中：
 <programlisting>
 restore_command = 'pg_standby <replaceable>archiveDir</replaceable> %f %p %r'
 </programlisting>