updated to xaggr.sgml

Author: chegong18

postgresql/doc/src/sgml/test-decoding.sgml

@@ -65,7 +65,7 @@ ____________________________________________________________________________-->
 
 <programlisting>
 postgres=# SELECT * FROM pg_logical_slot_get_changes('test_slot', NULL, NULL, 'include-xids', '0');
- location  | xid |                       data
+   lsn     | xid |                       data
 -----------+-----+--------------------------------------------------
  0/16D30F8 | 691 | BEGIN
  0/16D32A0 | 691 | table public.data: INSERT: id[int4]:2 data[text]:'arg'
@@ -79,4 +79,48 @@ postgres=# SELECT * FROM pg_logical_slot_get_changes('test_slot', NULL, NULL, 'i
 </programlisting>
  </para>
 
+<!--==========================orignal english content==========================
+<para>
+  We can also get the changes of the in-progress transaction, and the typical
+  output might be:
+
+<programlisting>
+postgres[33712]=#* SELECT * FROM pg_logical_slot_get_changes('test_slot', NULL, NULL, 'stream-changes', '1');
+    lsn    | xid |                       data                       
+-&minus;-&minus;-&minus;-&minus;-&minus;-+-&minus;-&minus;-+-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;-&minus;
+ 0/16B21F8 | 503 | opening a streamed block for transaction TXN 503
+ 0/16B21F8 | 503 | streaming change for TXN 503
+ 0/16B2300 | 503 | streaming change for TXN 503
+ 0/16B2408 | 503 | streaming change for TXN 503
+ 0/16BEBA0 | 503 | closing a streamed block for transaction TXN 503
+ 0/16B21F8 | 503 | opening a streamed block for transaction TXN 503
+ 0/16BECA8 | 503 | streaming change for TXN 503
+ 0/16BEDB0 | 503 | streaming change for TXN 503
+ 0/16BEEB8 | 503 | streaming change for TXN 503
+ 0/16BEBA0 | 503 | closing a streamed block for transaction TXN 503
+(10 rows)
+</programlisting>
+ </para>
+____________________________________________________________________________-->
+<para>
+  我们也能获得正在进行事务的改变，典型输出可能是：
+
+<programlisting>
+postgres[33712]=#* SELECT * FROM pg_logical_slot_get_changes('test_slot', NULL, NULL, 'stream-changes', '1');
+    lsn    | xid |                       data                       
+-----------+-----+--------------------------------------------------
+ 0/16B21F8 | 503 | opening a streamed block for transaction TXN 503
+ 0/16B21F8 | 503 | streaming change for TXN 503
+ 0/16B2300 | 503 | streaming change for TXN 503
+ 0/16B2408 | 503 | streaming change for TXN 503
+ 0/16BEBA0 | 503 | closing a streamed block for transaction TXN 503
+ 0/16B21F8 | 503 | opening a streamed block for transaction TXN 503
+ 0/16BECA8 | 503 | streaming change for TXN 503
+ 0/16BEDB0 | 503 | streaming change for TXN 503
+ 0/16BEEB8 | 503 | streaming change for TXN 503
+ 0/16BEBA0 | 503 | closing a streamed block for transaction TXN 503
+(10 rows)
+</programlisting>
+ </para>
+
 </sect1>

postgresql/doc/src/sgml/trigger.sgml

@@ -191,6 +191,21 @@ ____________________________________________________________________________-->
     触发器也可以根据它们是否在操作<firstterm>之前</firstterm>、<firstterm>之后</firstterm>触发，或者被触发来<firstterm>取代</firstterm>操作来分类。它们分别指<literal>BEFORE</literal>触发器、<literal>AFTER</literal> 触发器以及<literal>INSTEAD OF</literal>触发器。语句级<literal>BEFORE</literal>触发器在语句开始做任何事情之前被触发，而语句级<literal>AFTER</literal>触发器则在语句做完所有事情之后被触发。这些触发器类型可以被定义在表、视图或外部表上。行级<literal>BEFORE</literal>触发器在每一个行被操作之前被触发，而行级<literal>AFTER</literal>触发器在语句结束之后被触发（但在任何语句级<literal>AFTER</literal>触发器之前）。这些触发器类型只能被定义在表和外部表上，但不能定义在视图上。<literal>INSTEAD OF</literal>触发器只能被定义在视图上，并且只能定义在行级，当视图中的每一行被标识为需要被操作时，它们会立即触发。
    </para>
 
+<!--==========================orignal english content==========================
+   <para>
+    The execution of an <literal>AFTER</literal> trigger can be deferred
+    to the end of the transaction, rather than the end of the statement,
+    if it was defined as a <firstterm>constraint trigger</firstterm>.
+    In all cases, a trigger is executed as part of the same transaction as
+    the statement that triggered it, so if either the statement or the
+    trigger causes an error, the effects of both will be rolled back.
+   </para>
+____________________________________________________________________________-->
+   <para>
+    一个<literal>AFTER</literal>触发器的执行可以推迟到事务的最后，而不是语句的最后，如果它被定义为<firstterm>constraint trigger</firstterm>。
+    在所有情况下，触发器作为触发它的语句的同一个事务的一部分来执行，所以无论语句或触发器导致错误，两者的后果都将会回滚。
+   </para>
+
 <!--==========================orignal english content==========================
    <para>
     A statement that targets a parent table in an inheritance or partitioning
@@ -598,7 +613,7 @@ ____________________________________________________________________________-->
        trigger <emphasis>will</emphasis> see the effects of data
        changes for rows previously processed in the same outer
        command.  This requires caution, since the ordering of these
-       change events is not in general predictable; a SQL command that
+       change events is not in general predictable; an SQL command that
        affects multiple rows can visit the rows in any order.
       </para>
      </listitem>