Merge pull request #338 from chegong18/master

pull up glossary,HA,history and hstore.sgml

Author: ChenHuajun

postgresql/doc/src/sgml/glossary.sgml

@@ -162,7 +162,7 @@ ____________________________________________________________________________-->
    and trimmed in size by 25%. Many internal changes improved
    performance and
    maintainability. <productname>Postgres95</productname> release
-   1.0.x ran about 30-50% faster on the Wisconsin Benchmark compared
+   1.0.x ran about 30&ndash;50% faster on the Wisconsin Benchmark compared
    to <productname>POSTGRES</productname>, Version 4.2.  Apart from
    bug fixes, the following were the major enhancements:
 

postgresql/doc/src/sgml/high-availability.sgml

@@ -26,6 +26,17 @@ ____________________________________________________________________________-->
   <filename>lo</filename>模块提供管理大对象（也被称为 LO 或 BLOB）的支持。这包括一种数据类型<type>lo</type>以及一个触发器<function>lo_manage</function>。
  </para>
 
+<!--==========================orignal english content==========================
+ <para>
+  This module is considered <quote>trusted</quote>, that is, it can be
+  installed by non-superusers who have <literal>CREATE</literal> privilege
+  on the current database.
+ </para>
+____________________________________________________________________________-->
+ <para>
+  这个模块被视为<quote>trusted</quote>，也就是说，它能够由当前数据库中具有<literal>CREATE</literal>特权的非超级用户来安装。
+ </para>
+
  <sect2>
 <!--==========================orignal english content==========================
   <title>Rationale</title>

postgresql/doc/src/sgml/history.sgml

@@ -191,11 +191,12 @@ ____________________________________________________________________________-->
     If an error occurs while executing any one of these functions, the
     function will return an otherwise-impossible value, typically 0 or -1.
     A message describing the error is stored in the connection object and
-    can be retrieved with <function>PQerrorMessage</function>.
+    can be retrieved with <xref linkend="libpq-PQerrorMessage"/>.
    </para>
 ____________________________________________________________________________-->
    <para>
-    在执行任何一个这种函数期间如果发生一个错误，该函数将会返回一个其他的不可能值，典型的是0或-1。一个关于该错误的消息亦会被保存在连接对象中，可以通过<function>PQerrorMessage</function>检索到。
+    在执行任何一个这种函数期间如果发生一个错误，该函数将会返回一个其他的不可能值，典型的是0或-1。
+    一个关于该错误的消息亦会被保存在连接对象中，可以通过<xref linkend="libpq-PQerrorMessage"/>检索到。
    </para>
 
 <!--==========================orignal english content==========================
@@ -913,130 +914,153 @@ ____________________________________________________________________________-->
    <xref linkend="lo-funcs-table"/>中列出了为从 SQL 操纵大对象定制的服务器端函数。
   </para>
 
-  <table id="lo-funcs-table">
-<!--==========================orignal english content==========================
-   <title>SQL-Oriented Large Object Functions</title>
-____________________________________________________________________________-->
-   <title>面向 SQL 的大对象函数</title>
-   <tgroup cols="5">
-    <thead>
-<!--==========================orignal english content==========================
-     <row>
-      <entry>Function</entry>
-      <entry>Return Type</entry>
-      <entry>Description</entry>
-      <entry>Example</entry>
-      <entry>Result</entry>
-     </row>
-____________________________________________________________________________-->
-     <row>
-      <entry>函数</entry>
-      <entry>返回类型</entry>
-      <entry>描述</entry>
-      <entry>实例</entry>
-      <entry>结果</entry>
-     </row>
-    </thead>
-
-    <tbody>
-<!--==========================orignal english content==========================
-     <row>
-      <entry>
-       <indexterm>
-        <primary>lo_from_bytea</primary>
-       </indexterm>
-       <literal><function>lo_from_bytea(<parameter>loid</parameter> <type>oid</type>, <parameter>string</parameter> <type>bytea</type>)</function></literal>
-      </entry>
-      <entry><type>oid</type></entry>
-      <entry>
-       Create a large object and store data there, returning its OID.
-       Pass <literal>0</literal> to have the system choose an OID.
-      </entry>
-      <entry><literal>lo_from_bytea(0, '\xffffff00')</literal></entry>
-      <entry><literal>24528</literal></entry>
-     </row>
-____________________________________________________________________________-->
-     <row>
-      <entry>
-       <indexterm>
-        <primary>lo_from_bytea</primary>
-       </indexterm>
-       <literal><function>lo_from_bytea(<parameter>loid</parameter> <type>oid</type>, <parameter>string</parameter> <type>bytea</type>)</function></literal>
-      </entry>
-      <entry><type>oid</type></entry>
-      <entry>
-       创建一个大对象并且在其中存储数据，返回它的 OID。
-       传递<literal>0</literal>会让系统选择一个 OID。
-      </entry>
-      <entry><literal>lo_from_bytea(0, '\xffffff00')</literal></entry>
-      <entry><literal>24528</literal></entry>
-     </row>
-
-<!--==========================orignal english content==========================
-     <row>
-      <entry>
-       <indexterm>
-        <primary>lo_put</primary>
-       </indexterm>
-       <literal><function>lo_put(<parameter>loid</parameter> <type>oid</type>, <parameter>offset</parameter> <type>bigint</type>, <parameter>str</parameter> <type>bytea</type>)</function></literal>
-      </entry>
-      <entry><type>void</type></entry>
-      <entry>
-       Write data at the given offset.
-      </entry>
-      <entry><literal>lo_put(24528, 1, '\xaa')</literal></entry>
-      <entry></entry>
-     </row>
-____________________________________________________________________________-->
-     <row>
-      <entry>
-       <indexterm>
-        <primary>lo_put</primary>
-       </indexterm>
-       <literal><function>lo_put(<parameter>loid</parameter> <type>oid</type>, <parameter>offset</parameter> <type>bigint</type>, <parameter>str</parameter> <type>bytea</type>)</function></literal>
-      </entry>
-      <entry><type>void</type></entry>
-      <entry>
-       在给定的偏移位置写入数据。
-      </entry>
-      <entry><literal>lo_put(24528, 1, '\xaa')</literal></entry>
-      <entry></entry>
-     </row>
-
-<!--==========================orignal english content==========================
-     <row>
-      <entry>
-       <indexterm>
-        <primary>lo_get</primary>
-       </indexterm>
-       <literal><function>lo_get(<parameter>loid</parameter> <type>oid</type> <optional>, <parameter>from</parameter> <type>bigint</type>, <parameter>for</parameter> <type>int</type></optional>)</function></literal>
-      </entry>
-      <entry><type>bytea</type></entry>
-      <entry>
-       Extract contents or a substring thereof.
-      </entry>
-      <entry><literal>lo_get(24528, 0, 3)</literal></entry>
-      <entry><literal>\xffaaff</literal></entry>
-     </row>
-____________________________________________________________________________-->
-     <row>
-      <entry>
-       <indexterm>
-        <primary>lo_get</primary>
-       </indexterm>
-       <literal><function>lo_get(<parameter>loid</parameter> <type>oid</type> <optional>, <parameter>from</parameter> <type>bigint</type>, <parameter>for</parameter> <type>int</type></optional>)</function></literal>
-      </entry>
-      <entry><type>bytea</type></entry>
-      <entry>
-       在其中抽取内容或一个子串。
-      </entry>
-      <entry><literal>lo_get(24528, 0, 3)</literal></entry>
-      <entry><literal>\xffaaff</literal></entry>
-     </row>
-
-    </tbody>
-   </tgroup>
-  </table>
+   <table id="lo-funcs-table">
+<!--==========================orignal english content==========================
+    <title>SQL-Oriented Large Object Functions</title>
+____________________________________________________________________________-->
+    <title>面向 SQL 的大对象函数</title>
+    <tgroup cols="1">
+     <thead>
+<!--==========================orignal english content==========================
+      <row>
+       <entry role="func_table_entry"><para role="func_signature">
+        Function
+       </para>
+       <para>
+        Description
+       </para>
+       <para>
+        Example(s)
+       </para></entry>
+      </row>
+____________________________________________________________________________-->
+      <row>
+       <entry role="func_table_entry"><para role="func_signature">
+        函数
+       </para>
+       <para>
+        描述
+       </para>
+       <para>
+        例子
+       </para></entry>
+      </row>
+     </thead>
+
+     <tbody>
+<!--==========================orignal english content==========================
+      <row>
+       <entry role="func_table_entry"><para role="func_signature">
+        <indexterm>
+         <primary>lo_from_bytea</primary>
+        </indexterm>
+        <function>lo_from_bytea</function> ( <parameter>loid</parameter> <type>oid</type>, <parameter>data</parameter> <type>bytea</type> )
+        <returnvalue>oid</returnvalue>
+       </para>
+       <para>
+        Creates a large object and stores <parameter>data</parameter> in it.
+        If <parameter>loid</parameter> is zero then the system will choose a
+        free OID, otherwise that OID is used (with an error if some large
+        object already has that OID).  On success, the large object's OID is
+        returned.
+       </para>
+       <para>
+        <literal>lo_from_bytea(0, '\xffffff00')</literal>
+        <returnvalue>24528</returnvalue>
+       </para></entry>
+      </row>
+____________________________________________________________________________-->
+      <row>
+       <entry role="func_table_entry"><para role="func_signature">
+        <indexterm>
+         <primary>lo_from_bytea</primary>
+        </indexterm>
+        <function>lo_from_bytea</function> ( <parameter>loid</parameter> <type>oid</type>, <parameter>data</parameter> <type>bytea</type> )
+        <returnvalue>oid</returnvalue>
+       </para>
+       <para>
+        创建一个大对象并在其中存储<parameter>数据</parameter>。
+        如果<parameter>loid</parameter>为0，则系统将选择一个空闲OID，否则该OID已被使用(如果某个大对象已经拥有该OID，则会出现错误)。在成功时，将返回大对象的OID。
+       </para>
+       <para>
+        <literal>lo_from_bytea(0, '\xffffff00')</literal>
+        <returnvalue>24528</returnvalue>
+       </para></entry>
+      </row>
+
+<!--==========================orignal english content==========================
+      <row>
+       <entry role="func_table_entry"><para role="func_signature">
+        <indexterm>
+         <primary>lo_put</primary>
+        </indexterm>
+        <function>lo_put</function> ( <parameter>loid</parameter> <type>oid</type>, <parameter>offset</parameter> <type>bigint</type>, <parameter>data</parameter> <type>bytea</type> )
+        <returnvalue>void</returnvalue>
+       </para>
+       <para>
+        Writes <parameter>data</parameter> starting at the given offset within
+        the large object; the large object is enlarged if necessary.
+       </para>
+       <para>
+        <literal>lo_put(24528, 1, '\xaa')</literal>
+        <returnvalue></returnvalue>
+       </para></entry>
+      </row>
+____________________________________________________________________________-->
+      <row>
+       <entry role="func_table_entry"><para role="func_signature">
+        <indexterm>
+         <primary>lo_put</primary>
+        </indexterm>
+        <function>lo_put</function> ( <parameter>loid</parameter> <type>oid</type>, <parameter>offset</parameter> <type>bigint</type>, <parameter>data</parameter> <type>bytea</type> )
+        <returnvalue>void</returnvalue>
+       </para>
+       <para>
+        在大对象中写入从给定偏移量开始的<parameter>数据</parameter>;如有必要，可以把大对象扩大。
+       </para>
+       <para>
+        <literal>lo_put(24528, 1, '\xaa')</literal>
+        <returnvalue></returnvalue>
+       </para></entry>
+      </row>
+
+<!--==========================orignal english content==========================
+      <row>
+       <entry role="func_table_entry"><para role="func_signature">
+        <indexterm>
+         <primary>lo_get</primary>
+        </indexterm>
+        <function>lo_get</function> ( <parameter>loid</parameter> <type>oid</type> <optional>, <parameter>offset</parameter> <type>bigint</type>, <parameter>length</parameter> <type>integer</type> </optional> )
+        <returnvalue>bytea</returnvalue>
+       </para>
+       <para>
+        Extracts the large object's contents, or a substring thereof.
+       </para>
+       <para>
+        <literal>lo_get(24528, 0, 3)</literal>
+        <returnvalue>\xffaaff</returnvalue>
+       </para></entry>
+      </row>
+____________________________________________________________________________-->
+      <row>
+       <entry role="func_table_entry"><para role="func_signature">
+        <indexterm>
+         <primary>lo_get</primary>
+        </indexterm>
+        <function>lo_get</function> ( <parameter>loid</parameter> <type>oid</type> <optional>, <parameter>offset</parameter> <type>bigint</type>, <parameter>length</parameter> <type>integer</type> </optional> )
+        <returnvalue>bytea</returnvalue>
+       </para>
+       <para>
+        提取大对象的内容，或在其中的子字符串。
+       </para>
+       <para>
+        <literal>lo_get(24528, 0, 3)</literal>
+        <returnvalue>\xffaaff</returnvalue>
+       </para></entry>
+      </row>
+     </tbody>
+    </tgroup>
+   </table>
 
 <!--==========================orignal english content==========================
   <para>
@@ -1194,19 +1218,19 @@ ____________________________________________________________________________-->
    <title>用<application>libpq</application>操作大对象的例子程序</title>
 <!--==========================orignal english content==========================
 <programlisting><![CDATA[
-/*-&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;-&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;-&minus;-&minus;-&minus;-&minus;-
  *
  * testlo.c
  *    test using large objects with libpq
  *
- * Portions Copyright (c) 1996-2019, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2020, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
  * IDENTIFICATION
  *    src/test/examples/testlo.c
  *
- *-&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;-&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;-&minus;-&minus;-&minus;-&minus;-
  */
 #include <stdio.h>
 #include <stdlib.h>
@@ -1471,19 +1495,19 @@ main(int argc, char **argv)
 </programlisting>
 ____________________________________________________________________________-->
 <programlisting><![CDATA[
-/*-------------------------------------------------------------------------
+/*-----------------------------------------------------------------
  *
  * testlo.c
- *    测试通过 libpq 使用大对象
+ *    测试通过libpq实用大对象
  *
- * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2020, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
  * IDENTIFICATION
  *    src/test/examples/testlo.c
  *
- *-------------------------------------------------------------------------
+ *-----------------------------------------------------------------
  */
 #include <stdio.h>
 #include <stdlib.h>
@@ -1496,10 +1520,10 @@ ____________________________________________________________________________-->
 #include "libpq-fe.h"
 #include "libpq/libpq-fs.h"
 
-#define BUFSIZE          1024
+#define BUFSIZE         1024
 
 /*
- * importFile
+ * importFile -
  *    把文件 "in_filename" 作为一个大对象 "lobjOid" 载入到数据库
  *
  */
@@ -1613,6 +1637,7 @@ overwrite(PGconn *conn, Oid lobjId, int start, int len)
     lo_close(conn, lobj_fd);
 }
 
+
 /*
  * exportFile -
  *    把大对象 "lobjOid" 导出成文件 "out_filename"