database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-29 16:21:20 +03:00
Code

Fix indentation of verbatim block elements

Browse Source 
Block elements with verbatim formatting (literallayout, programlisting,
screen, synopsis) should be aligned at column 0 independent of the surrounding
SGML, because whitespace is significant, and indenting them creates erratic
whitespace in the output.  The CSS stylesheets already take care of indenting
the output.

Assorted markup improvements to go along with it.
This commit is contained in:
Peter Eisentraut 2010-07-29 19:34:41 +00:00
parent 984d56b80f
commit 66424a2848
55 changed files with 2372 additions and 2478 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
doc/src/sgml/auto-explain.sgml
View File

@ -1,4 +1,4 @@
<!-- $PostgreSQL: pgsql/doc/src/sgml/auto-explain.sgml,v 1.8 2010/04/03 07:22:52 petere Exp $ -->
<!-- $PostgreSQL: pgsql/doc/src/sgml/auto-explain.sgml,v 1.9 2010/07/29 19:34:40 petere Exp $ -->
<sect1 id="auto-explain">
<title>auto_explain</title>
@ -187,7 +187,7 @@ auto_explain.log_min_duration = '3s'
This might produce log output such as:
</para>
<programlisting><![CDATA[
<screen><![CDATA[
LOG: duration: 3.651 ms plan:
Query Text: SELECT count(*)
FROM pg_class, pg_index
@ -200,8 +200,7 @@ auto_explain.log_min_duration = '3s'
Buckets: 1024 Batches: 1 Memory Usage: 4kB
-> Seq Scan on pg_index (cost=0.00..3.02 rows=92 width=4) (actual time=0.008..3.187 rows=92 loops=1)
Filter: indisunique
]]>
</programlisting>
]]></screen>
</sect2>
<sect2>

2
doc/src/sgml/citext.sgml
View File

@ -1,4 +1,4 @@
<!-- $PostgreSQL: pgsql/doc/src/sgml/citext.sgml,v 1.4 2010/06/29 22:29:13 momjian Exp $ -->
<!-- $PostgreSQL: pgsql/doc/src/sgml/citext.sgml,v 1.5 2010/07/29 19:34:40 petere Exp $ -->
<sect1 id="citext">
<title>citext</title>

8
doc/src/sgml/client-auth.sgml
View File

@ -1,4 +1,4 @@
<!-- $PostgreSQL: pgsql/doc/src/sgml/client-auth.sgml,v 1.139 2010/06/29 22:29:13 momjian Exp $ -->
<!-- $PostgreSQL: pgsql/doc/src/sgml/client-auth.sgml,v 1.140 2010/07/29 19:34:40 petere Exp $ -->
<chapter id="client-authentication">
<title>Client Authentication</title>
@ -1353,11 +1353,11 @@ omicron bryanh guest1
Since LDAP often uses commas and spaces to separate the different
parts of a DN, it is often necessary to use double-quoted parameter
values when configuring LDAP options, for example:
<programlisting>
ldapserver=ldap.example.net ldapprefix="cn=" ldapsuffix=", dc=example, dc=net"
</programlisting>
</para>
</note>
<synopsis>
ldapserver=ldap.example.net ldapprefix="cn=" ldapsuffix=", dc=example, dc=net"
</synopsis>
</sect2>

15
doc/src/sgml/config.sgml
View File

@ -1,4 +1,4 @@
<!-- $PostgreSQL: pgsql/doc/src/sgml/config.sgml,v 1.301 2010/07/27 19:01:16 petere Exp $ -->
<!-- $PostgreSQL: pgsql/doc/src/sgml/config.sgml,v 1.302 2010/07/29 19:34:40 petere Exp $ -->
<chapter Id="runtime-config">
<title>Server Configuration</title>
@ -5808,29 +5808,20 @@ plruby.use_strict = true # generates error: unknown class name
type a count of the number of granted locks and waiting locks is
also dumped as well as the totals. An example of the log file output
is shown here:
</para>
<para>
<screen>
LOG: LockAcquire: new: lock(0xb7acd844) id(24688,24696,0,0,0,1)
grantMask(0) req(0,0,0,0,0,0,0)=0 grant(0,0,0,0,0,0,0)=0
wait(0) type(AccessShareLock)
</para>
<para>
LOG: GrantLock: lock(0xb7acd844) id(24688,24696,0,0,0,1)
grantMask(2) req(1,0,0,0,0,0,0)=1 grant(1,0,0,0,0,0,0)=1
wait(0) type(AccessShareLock)
</para>
<para>
LOG: UnGrantLock: updated: lock(0xb7acd844) id(24688,24696,0,0,0,1)
grantMask(0) req(0,0,0,0,0,0,0)=0 grant(0,0,0,0,0,0,0)=0
wait(0) type(AccessShareLock)
</para>
<para>
LOG: CleanUpLock: deleting: lock(0xb7acd844) id(24688,24696,0,0,0,1)
grantMask(0) req(0,0,0,0,0,0,0)=0 grant(0,0,0,0,0,0,0)=0
wait(0) type(INVALID)
</para>
<para>
</screen>
Details of the structure being dumped may be found in
src/include/storage/lock.h
</para>

101
doc/src/sgml/cube.sgml
View File

@ -1,4 +1,4 @@
<!-- $PostgreSQL: pgsql/doc/src/sgml/cube.sgml,v 1.7 2009/12/08 20:08:30 mha Exp $ -->
<!-- $PostgreSQL: pgsql/doc/src/sgml/cube.sgml,v 1.8 2010/07/29 19:34:40 petere Exp $ -->
<sect1 id="cube">
<title>cube</title>
@ -98,47 +98,46 @@
<para>
The <filename>cube</> module includes a GiST index operator class for
<type>cube</> values.
The operators supported by the GiST opclass include:
The operators supported by the GiST opclass are shown in <xref linkend="cube-gist-operators">.
</para>
<itemizedlist>
<listitem>
<programlisting>
a = b Same as
</programlisting>
<para>
The cubes a and b are identical.
</para>
</listitem>
<listitem>
<programlisting>
a &amp;&amp; b Overlaps
</programlisting>
<para>
The cubes a and b overlap.
</para>
</listitem>
<listitem>
<programlisting>
a @&gt; b Contains
</programlisting>
<para>
The cube a contains the cube b.
</para>
</listitem>
<listitem>
<programlisting>
a &lt;@ b Contained in
</programlisting>
<para>
The cube a is contained in the cube b.
</para>
</listitem>
</itemizedlist>
<table id="cube-gist-operators">
<title>Cube GiST operators</title>
<tgroup cols="2">
<thead>
<row>
<entry>Operator</entry>
<entry>Description</entry>
</row>
</thead>
<tbody>
<row>
<entry><literal>a = b</></entry>
<entry>The cubes a and b are identical.</entry>
</row>
<row>
<entry><literal>a &amp;&amp; b</></entry>
<entry>The cubes a and b overlap.</entry>
</row>
<row>
<entry><literal>a @&gt; b</></entry>
<entry>The cube a contains the cube b.</entry>
</row>
<row>
<entry><literal>a &lt;@ b</></entry>
<entry>The cube a is contained in the cube b.</entry>
</row>
</tbody>
</tgroup>
</table>
<para>
(Before PostgreSQL 8.2, the containment operators @&gt; and &lt;@ were
respectively called @ and ~. These names are still available, but are
(Before PostgreSQL 8.2, the containment operators <literal>@&gt;</> and <literal>&lt;@</> were
respectively called <literal>@</> and <literal>~</>. These names are still available, but are
deprecated and will eventually be retired. Notice that the old names
are reversed from the convention formerly followed by the core geometric
datatypes!)
@ -147,10 +146,28 @@ a &lt;@ b Contained in
<para>
The standard B-tree operators are also provided, for example
<programlisting>
[a, b] &lt; [c, d] Less than
[a, b] &gt; [c, d] Greater than
</programlisting>
<informaltable>
<tgroup cols="2">
<thead>
<row>
<entry>Operator</entry>
<entry>Description</entry>
</row>
</thead>
<tbody>
<row>
<entry><literal>[a, b] &lt; [c, d]</literal></entry>
<entry>Less than</entry>
</row>
<row>
<entry><literal>[a, b] &gt; [c, d]</literal></entry>
<entry>Greater than</entry>
</row>
</tbody>
</tgroup>
</informaltable>
These operators do not make a lot of sense for any practical
purpose but sorting. These operators first compare (a) to (c),

6
doc/src/sgml/datatype.sgml
View File

@ -1,4 +1,4 @@
<!-- $PostgreSQL: pgsql/doc/src/sgml/datatype.sgml,v 1.254 2010/07/27 19:01:16 petere Exp $ -->
<!-- $PostgreSQL: pgsql/doc/src/sgml/datatype.sgml,v 1.255 2010/07/29 19:34:40 petere Exp $ -->
<chapter id="datatype">
<title>Data Types</title>
@ -1584,7 +1584,7 @@ SELECT E'\\xDEADBEEF';
<para>
The <type>interval</type> type has an additional option, which is
to restrict the set of stored fields by writing one of these phrases:
<programlisting>
<literallayout class="monospaced">
YEAR
MONTH
DAY
@ -1598,7 +1598,7 @@ SELECT E'\\xDEADBEEF';
HOUR TO MINUTE
HOUR TO SECOND
MINUTE TO SECOND
</programlisting>
</literallayout>
Note that if both <replaceable>fields</replaceable> and
<replaceable>p</replaceable> are specified, the
<replaceable>fields</replaceable> must include <literal>SECOND</>,

161
doc/src/sgml/dblink.sgml
View File

@ -1,4 +1,4 @@
<!-- $PostgreSQL: pgsql/doc/src/sgml/dblink.sgml,v 1.13 2010/06/15 20:29:01 tgl Exp $ -->
<!-- $PostgreSQL: pgsql/doc/src/sgml/dblink.sgml,v 1.14 2010/07/29 19:34:40 petere Exp $ -->
<sect1 id="dblink">
<title>dblink</title>
@ -116,14 +116,14 @@
<refsect1>
<title>Example</title>
<programlisting>
select dblink_connect('dbname=postgres');
<screen>
SELECT dblink_connect('dbname=postgres');
dblink_connect
----------------
OK
(1 row)
select dblink_connect('myconn', 'dbname=postgres');
SELECT dblink_connect('myconn', 'dbname=postgres');
dblink_connect
----------------
OK
@ -175,7 +175,7 @@
DROP USER dblink_regression_test;
DROP SERVER fdtest;
DROP FOREIGN DATA WRAPPER postgresql;
</programlisting>
</screen>
</refsect1>
</refentry>
@ -287,19 +287,19 @@
<refsect1>
<title>Example</title>
<programlisting>
test=# select dblink_disconnect();
<screen>
SELECT dblink_disconnect();
dblink_disconnect
-------------------
OK
(1 row)
select dblink_disconnect('myconn');
SELECT dblink_disconnect('myconn');
dblink_disconnect
-------------------
OK
(1 row)
</programlisting>
</screen>
</refsect1>
</refentry>
@ -441,12 +441,12 @@ SELECT *
instead of having to spell it out in every query. For example,
<programlisting>
create view myremote_pg_proc as
select *
from dblink('dbname=postgres', 'select proname, prosrc from pg_proc')
as t1(proname name, prosrc text);
CREATE VIEW myremote_pg_proc AS
SELECT *
FROM dblink('dbname=postgres', 'select proname, prosrc from pg_proc')
AS t1(proname name, prosrc text);
select * from myremote_pg_proc where proname like 'bytea%';
SELECT * FROM myremote_pg_proc WHERE proname LIKE 'bytea%';
</programlisting>
</para>
</refsect1>
@ -454,9 +454,9 @@ SELECT *
<refsect1>
<title>Example</title>
<programlisting>
select * from dblink('dbname=postgres', 'select proname, prosrc from pg_proc')
as t1(proname name, prosrc text) where proname like 'bytea%';
<screen>
SELECT * FROM dblink('dbname=postgres', 'select proname, prosrc from pg_proc')
AS t1(proname name, prosrc text) WHERE proname LIKE 'bytea%';
proname | prosrc
------------+------------
byteacat | byteacat
@ -473,14 +473,14 @@ SELECT *
byteaout | byteaout
(12 rows)
select dblink_connect('dbname=postgres');
SELECT dblink_connect('dbname=postgres');
dblink_connect
----------------
OK
(1 row)
select * from dblink('select proname, prosrc from pg_proc')
as t1(proname name, prosrc text) where proname like 'bytea%';
SELECT * FROM dblink('select proname, prosrc from pg_proc')
AS t1(proname name, prosrc text) WHERE proname LIKE 'bytea%';
proname | prosrc
------------+------------
byteacat | byteacat
@ -497,14 +497,14 @@ SELECT *
byteaout | byteaout
(12 rows)
select dblink_connect('myconn', 'dbname=regression');
SELECT dblink_connect('myconn', 'dbname=regression');
dblink_connect
----------------
OK
(1 row)
select * from dblink('myconn', 'select proname, prosrc from pg_proc')
as t1(proname name, prosrc text) where proname like 'bytea%';
SELECT * FROM dblink('myconn', 'select proname, prosrc from pg_proc')
AS t1(proname name, prosrc text) WHERE proname LIKE 'bytea%';
proname | prosrc
------------+------------
bytearecv | bytearecv
@ -522,7 +522,7 @@ SELECT *
byteain | byteain
byteaout | byteaout
(14 rows)
</programlisting>
</screen>
</refsect1>
</refentry>
@ -622,32 +622,32 @@ SELECT *
<refsect1>
<title>Example</title>
<programlisting>
select dblink_connect('dbname=dblink_test_standby');
<screen>
SELECT dblink_connect('dbname=dblink_test_standby');
dblink_connect
----------------
OK
(1 row)
select dblink_exec('insert into foo values(21,''z'',''{"a0","b0","c0"}'');');
SELECT dblink_exec('insert into foo values(21,''z'',''{"a0","b0","c0"}'');');
dblink_exec
-----------------
INSERT 943366 1
(1 row)
select dblink_connect('myconn', 'dbname=regression');
SELECT dblink_connect('myconn', 'dbname=regression');
dblink_connect
----------------
OK
(1 row)
select dblink_exec('myconn', 'insert into foo values(21,''z'',''{"a0","b0","c0"}'');');
SELECT dblink_exec('myconn', 'insert into foo values(21,''z'',''{"a0","b0","c0"}'');');
dblink_exec
------------------
INSERT 6432584 1
(1 row)
select dblink_exec('myconn', 'insert into pg_class values (''foo'')',false);
SELECT dblink_exec('myconn', 'insert into pg_class values (''foo'')',false);
NOTICE: sql error
DETAIL: ERROR: null value in column "relnamespace" violates not-null constraint
@ -655,7 +655,7 @@ SELECT *
-------------
ERROR
(1 row)
</programlisting>
</screen>
</refsect1>
</refentry>
@ -763,19 +763,19 @@ SELECT *
<refsect1>
<title>Example</title>
<programlisting>
test=# select dblink_connect('dbname=postgres');
<screen>
SELECT dblink_connect('dbname=postgres');
dblink_connect
----------------
OK
(1 row)
test=# select dblink_open('foo', 'select proname, prosrc from pg_proc');
SELECT dblink_open('foo', 'select proname, prosrc from pg_proc');
dblink_open
-------------
OK
(1 row)
</programlisting>
</screen>
</refsect1>
</refentry>
@ -880,20 +880,20 @@ SELECT *
<refsect1>
<title>Example</title>
<programlisting>
test=# select dblink_connect('dbname=postgres');
<screen>
SELECT dblink_connect('dbname=postgres');
dblink_connect
----------------
OK
(1 row)
test=# select dblink_open('foo', 'select proname, prosrc from pg_proc where proname like ''bytea%''');
SELECT dblink_open('foo', 'select proname, prosrc from pg_proc where proname like ''bytea%''');
dblink_open
-------------
OK
(1 row)
test=# select * from dblink_fetch('foo', 5) as (funcname name, source text);
SELECT * FROM dblink_fetch('foo', 5) AS (funcname name, source text);
funcname | source
----------+----------
byteacat | byteacat
@ -903,7 +903,7 @@ SELECT *
byteagt | byteagt
(5 rows)
test=# select * from dblink_fetch('foo', 5) as (funcname name, source text);
SELECT * FROM dblink_fetch('foo', 5) AS (funcname name, source text);
funcname | source
-----------+-----------
byteain | byteain
@ -913,18 +913,18 @@ SELECT *
byteane | byteane
(5 rows)
test=# select * from dblink_fetch('foo', 5) as (funcname name, source text);
SELECT * FROM dblink_fetch('foo', 5) AS (funcname name, source text);
funcname | source
------------+------------
byteanlike | byteanlike
byteaout | byteaout
(2 rows)
test=# select * from dblink_fetch('foo', 5) as (funcname name, source text);
SELECT * FROM dblink_fetch('foo', 5) AS (funcname name, source text);
funcname | source
----------+--------
(0 rows)
</programlisting>
</screen>
</refsect1>
</refentry>
@ -1013,25 +1013,25 @@ SELECT *
<refsect1>
<title>Example</title>
<programlisting>
test=# select dblink_connect('dbname=postgres');
<screen>
SELECT dblink_connect('dbname=postgres');
dblink_connect
----------------
OK
(1 row)
test=# select dblink_open('foo', 'select proname, prosrc from pg_proc');
SELECT dblink_open('foo', 'select proname, prosrc from pg_proc');
dblink_open
-------------
OK
(1 row)
test=# select dblink_close('foo');
SELECT dblink_close('foo');
dblink_close
--------------
OK
(1 row)
</programlisting>
</screen>
</refsect1>
</refentry>
@ -1326,19 +1326,19 @@ SELECT *
<refsect1>
<title>Example</title>
<programlisting>
test=# SELECT dblink_exec('LISTEN virtual');
<screen>
SELECT dblink_exec('LISTEN virtual');
dblink_exec
-------------
LISTEN
(1 row)
test=# SELECT * FROM dblink_get_notify();
SELECT * FROM dblink_get_notify();
notify_name | be_pid | extra
-------------+--------+-------
(0 rows)
test=# NOTIFY virtual;
NOTIFY virtual;
NOTIFY
SELECT * FROM dblink_get_notify();
@ -1346,7 +1346,7 @@ SELECT * FROM dblink_get_notify();
-------------+--------+-------
virtual | 1229 |
(1 row)
</programlisting>
</screen>
</refsect1>
</refentry>
@ -1439,21 +1439,21 @@ SELECT * FROM dblink_get_notify();
<refsect1>
<title>Example</title>
<programlisting>
<screen>
contrib_regression=# SELECT dblink_connect('dtest1', 'dbname=contrib_regression');
dblink_connect
----------------
OK
(1 row)
contrib_regression=# SELECT * from
contrib_regression-# dblink_send_query('dtest1', 'select * from foo where f1 &lt; 3') as t1;
contrib_regression=# SELECT * FROM
contrib_regression-# dblink_send_query('dtest1', 'select * from foo where f1 &lt; 3') AS t1;
t1
----
1
(1 row)
contrib_regression=# SELECT * from dblink_get_result('dtest1') as t1(f1 int, f2 text, f3 text[]);
contrib_regression=# SELECT * FROM dblink_get_result('dtest1') AS t1(f1 int, f2 text, f3 text[]);
f1 | f2 | f3
----+----+------------
0 | a | {a0,b0,c0}
@ -1461,19 +1461,19 @@ SELECT * FROM dblink_get_notify();
2 | c | {a2,b2,c2}
(3 rows)
contrib_regression=# SELECT * from dblink_get_result('dtest1') as t1(f1 int, f2 text, f3 text[]);
contrib_regression=# SELECT * FROM dblink_get_result('dtest1') AS t1(f1 int, f2 text, f3 text[]);
f1 | f2 | f3
----+----+----
(0 rows)
contrib_regression=# SELECT * from
dblink_send_query('dtest1', 'select * from foo where f1 &lt; 3; select * from foo where f1 &gt; 6') as t1;
contrib_regression=# SELECT * FROM
contrib_regression-# dblink_send_query('dtest1', 'select * from foo where f1 &lt; 3; select * from foo where f1 &gt; 6') AS t1;
t1
----
1
(1 row)
contrib_regression=# SELECT * from dblink_get_result('dtest1') as t1(f1 int, f2 text, f3 text[]);
contrib_regression=# SELECT * FROM dblink_get_result('dtest1') AS t1(f1 int, f2 text, f3 text[]);
f1 | f2 | f3
----+----+------------
0 | a | {a0,b0,c0}
@ -1481,7 +1481,7 @@ SELECT * FROM dblink_get_notify();
2 | c | {a2,b2,c2}
(3 rows)
contrib_regression=# SELECT * from dblink_get_result('dtest1') as t1(f1 int, f2 text, f3 text[]);
contrib_regression=# SELECT * FROM dblink_get_result('dtest1') AS t1(f1 int, f2 text, f3 text[]);
f1 | f2 | f3
----+----+---------------
7 | h | {a7,b7,c7}
@ -1490,11 +1490,11 @@ SELECT * FROM dblink_get_notify();
10 | k | {a10,b10,c10}
(4 rows)
contrib_regression=# SELECT * from dblink_get_result('dtest1') as t1(f1 int, f2 text, f3 text[]);
contrib_regression=# SELECT * FROM dblink_get_result('dtest1') AS t1(f1 int, f2 text, f3 text[]);
f1 | f2 | f3
----+----+----
(0 rows)
</programlisting>
</screen>
</refsect1>
</refentry>
@ -1630,18 +1630,23 @@ CREATE TYPE dblink_pkey_results AS (position int, colname text);
<refsect1>
<title>Example</title>
<programlisting>
test=# create table foobar(f1 int, f2 int, f3 int,
test(# primary key(f1,f2,f3));
<screen>
CREATE TABLE foobar (
f1 int,
f2 int,
f3 int,
PRIMARY KEY (f1, f2, f3)
);
CREATE TABLE
test=# select * from dblink_get_pkey('foobar');
SELECT * FROM dblink_get_pkey('foobar');
position | colname
----------+---------
1 | f1
2 | f2
3 | f3
(3 rows)
</programlisting>
</screen>
</refsect1>
</refentry>
@ -1766,13 +1771,13 @@ test=# select * from dblink_get_pkey('foobar');
<refsect1>
<title>Example</title>
<programlisting>
test=# select dblink_build_sql_insert('foo', '1 2', 2, '{"1", "a"}', '{"1", "b''a"}');
<screen>
SELECT dblink_build_sql_insert('foo', '1 2', 2, '{"1", "a"}', '{"1", "b''a"}');
dblink_build_sql_insert
--------------------------------------------------
INSERT INTO foo(f1,f2,f3) VALUES('1','b''a','1')
(1 row)
</programlisting>
</screen>
</refsect1>
</refentry>
@ -1880,13 +1885,13 @@ test=# select * from dblink_get_pkey('foobar');
<refsect1>
<title>Example</title>
<programlisting>
test=# select dblink_build_sql_delete('"MyFoo"', '1 2', 2, '{"1", "b"}');
<screen>
SELECT dblink_build_sql_delete('"MyFoo"', '1 2', 2, '{"1", "b"}');
dblink_build_sql_delete
---------------------------------------------
DELETE FROM "MyFoo" WHERE f1='1' AND f2='b'
(1 row)
</programlisting>
</screen>
</refsect1>
</refentry>
@ -2013,13 +2018,13 @@ test=# select * from dblink_get_pkey('foobar');
<refsect1>
<title>Example</title>
<programlisting>
test=# select dblink_build_sql_update('foo', '1 2', 2, '{"1", "a"}', '{"1", "b"}');
<screen>
SELECT dblink_build_sql_update('foo', '1 2', 2, '{"1", "a"}', '{"1", "b"}');
dblink_build_sql_update
-------------------------------------------------------------
UPDATE foo SET f1='1',f2='b',f3='1' WHERE f1='1' AND f2='b'
(1 row)
</programlisting>
</screen>
</refsect1>
</refentry>

2
doc/src/sgml/ddl.sgml
View File

@ -1,4 +1,4 @@
<!-- $PostgreSQL: pgsql/doc/src/sgml/ddl.sgml,v 1.93 2010/04/06 02:18:04 momjian Exp $ -->
<!-- $PostgreSQL: pgsql/doc/src/sgml/ddl.sgml,v 1.94 2010/07/29 19:34:40 petere Exp $ -->
<chapter id="ddl">
<title>Data Definition</title>

2
doc/src/sgml/dict-xsyn.sgml
View File

@ -1,4 +1,4 @@
<!-- $PostgreSQL: pgsql/doc/src/sgml/dict-xsyn.sgml,v 1.3 2009/08/05 18:06:49 tgl Exp $ -->
<!-- $PostgreSQL: pgsql/doc/src/sgml/dict-xsyn.sgml,v 1.4 2010/07/29 19:34:40 petere Exp $ -->
<sect1 id="dict-xsyn">
<title>dict_xsyn</title>

16
doc/src/sgml/ecpg.sgml
View File

@ -1,4 +1,4 @@
<!-- $PostgreSQL: pgsql/doc/src/sgml/ecpg.sgml,v 1.100 2010/05/13 14:16:41 mha Exp $ -->
<!-- $PostgreSQL: pgsql/doc/src/sgml/ecpg.sgml,v 1.101 2010/07/29 19:34:40 petere Exp $ -->
<chapter id="ecpg">
<title><application>ECPG</application> - Embedded <acronym>SQL</acronym> in C</title>
@ -5208,13 +5208,13 @@ EXEC SQL UPDATE Tbl SET col = MYNUMBER;
<para>
Example:
<programlisting>
exec sql ifndef TZVAR;
exec sql SET TIMEZONE TO 'GMT';
exec sql elif TZNAME;
exec sql SET TIMEZONE TO TZNAME;
exec sql else;
exec sql SET TIMEZONE TO TZVAR;
exec sql endif;
EXEC SQL ifndef TZVAR;
EXEC SQL SET TIMEZONE TO 'GMT';
EXEC SQL elif TZNAME;
EXEC SQL SET TIMEZONE TO TZNAME;
EXEC SQL else;
EXEC SQL SET TIMEZONE TO TZVAR;
EXEC SQL endif;
</programlisting>
</para>

2
doc/src/sgml/func.sgml
View File

@ -1,4 +1,4 @@
<!-- $PostgreSQL: pgsql/doc/src/sgml/func.sgml,v 1.521 2010/07/03 17:21:48 momjian Exp $ -->
<!-- $PostgreSQL: pgsql/doc/src/sgml/func.sgml,v 1.522 2010/07/29 19:34:40 petere Exp $ -->
<chapter id="functions">
<title>Functions and Operators</title>

30
doc/src/sgml/fuzzystrmatch.sgml
View File

@ -1,4 +1,4 @@
<!-- $PostgreSQL: pgsql/doc/src/sgml/fuzzystrmatch.sgml,v 1.5 2009/04/06 15:43:00 tgl Exp $ -->
<!-- $PostgreSQL: pgsql/doc/src/sgml/fuzzystrmatch.sgml,v 1.6 2010/07/29 19:34:40 petere Exp $ -->
<sect1 id="fuzzystrmatch">
<title>fuzzystrmatch</title>
@ -34,10 +34,10 @@
for working with Soundex codes:
</para>
<programlisting>
<synopsis>
soundex(text) returns text
difference(text, text) returns int
</programlisting>
</synopsis>
<para>
The <function>soundex</> function converts a string to its Soundex code.
@ -80,10 +80,10 @@ SELECT * FROM s WHERE difference(s.nm, 'john') &gt; 2;
This function calculates the Levenshtein distance between two strings:
</para>
<programlisting>
<synopsis>
levenshtein(text source, text target, int ins_cost, int del_cost, int sub_cost) returns int
levenshtein(text source, text target) returns int
</programlisting>
</synopsis>
<para>
Both <literal>source</literal> and <literal>target</literal> can be any
@ -97,7 +97,7 @@ SELECT * FROM s WHERE difference(s.nm, 'john') &gt; 2;
Examples:
</para>
<programlisting>
<screen>
test=# SELECT levenshtein('GUMBO', 'GAMBOL');
levenshtein
-------------
@ -109,7 +109,7 @@ test=# SELECT levenshtein('GUMBO', 'GAMBOL', 2,1,1);
-------------
3
(1 row)
</programlisting>
</screen>
</sect2>
<sect2>
@ -125,9 +125,9 @@ test=# SELECT levenshtein('GUMBO', 'GAMBOL', 2,1,1);
This function calculates the metaphone code of an input string:
</para>
<programlisting>
<synopsis>
metaphone(text source, int max_output_length) returns text
</programlisting>
</synopsis>
<para>
<literal>source</literal> has to be a non-null string with a maximum of
@ -140,13 +140,13 @@ test=# SELECT levenshtein('GUMBO', 'GAMBOL', 2,1,1);
Example:
</para>
<programlisting>
<screen>
test=# SELECT metaphone('GUMBO', 4);
metaphone
-----------
KM
(1 row)
</programlisting>
</screen>
</sect2>
<sect2>
@ -160,10 +160,10 @@ test=# SELECT metaphone('GUMBO', 4);
These functions compute the primary and alternate codes:
</para>
<programlisting>
<synopsis>
dmetaphone(text source) returns text
dmetaphone_alt(text source) returns text
</programlisting>
</synopsis>
<para>
There is no length limit on the input strings.
@ -173,13 +173,13 @@ test=# SELECT metaphone('GUMBO', 4);
Example:
</para>
<programlisting>
<screen>
test=# select dmetaphone('gumbo');
dmetaphone
------------
KMP
(1 row)
</programlisting>
</screen>
</sect2>
</sect1>

28
doc/src/sgml/hstore.sgml
View File

@ -1,4 +1,4 @@
<!-- $PostgreSQL: pgsql/doc/src/sgml/hstore.sgml,v 1.12 2010/07/02 20:36:49 rhaas Exp $ -->
<!-- $PostgreSQL: pgsql/doc/src/sgml/hstore.sgml,v 1.13 2010/07/29 19:34:40 petere Exp $ -->
<sect1 id="hstore">
<title>hstore</title>
@ -24,11 +24,11 @@
includes zero or more <replaceable>key</> <literal>=&gt;</>
<replaceable>value</> pairs separated by commas. Some examples:
<programlisting>
<synopsis>
k =&gt; v
foo =&gt; bar, baz =&gt; whatever
"1-a" =&gt; "anything at all"
</programlisting>
</synopsis>
The order of the pairs is not significant (and may not be reproduced on
output). Whitespace between pairs or around the <literal>=&gt;</> sign is
@ -43,7 +43,7 @@
there is no guarantee as to which will be kept:
<programlisting>
% select 'a=&gt;1,a=&gt;2'::hstore;
SELECT 'a=&gt;1,a=&gt;2'::hstore;
hstore
----------
"a"=&gt;"1"
@ -58,7 +58,7 @@
</programlisting>
The <literal>NULL</> keyword is case-insensitive. Double-quote the
<literal>NULL</> to treat it as the ordinary string "NULL".
<literal>NULL</> to treat it as the ordinary string <quote>NULL</quote>.
</para>
<note>
@ -448,21 +448,20 @@ CREATE INDEX hidx ON testhstore USING HASH (h);
<para>
Add a key, or update an existing key with a new value:
</para>
<programlisting>
UPDATE tab SET h = h || ('c' =&gt; '3');
</programlisting>
</para>
<para>
Delete a key:
</para>
<programlisting>
UPDATE tab SET h = delete(h, 'k1');
</programlisting>
</para>
<para>
Convert a <type>record</> to an <type>hstore</>:
</para>
<programlisting>
CREATE TABLE test (col1 integer, col2 text, col3 text);
INSERT INTO test VALUES (123, 'foo', 'bar');
@ -473,10 +472,10 @@ SELECT hstore(t) FROM test AS t;
"col1"=&gt;"123", "col2"=&gt;"foo", "col3"=&gt;"bar"
(1 row)
</programlisting>
</para>
<para>
Convert an <type>hstore</> to a predefined <type>record</> type:
</para>
<programlisting>
CREATE TABLE test (col1 integer, col2 text, col3 text);
@ -487,10 +486,10 @@ SELECT * FROM populate_record(null::test,
456 | zzz |
(1 row)
</programlisting>
</para>
<para>
Modify an existing record using the values from an <type>hstore</>:
</para>
<programlisting>
CREATE TABLE test (col1 integer, col2 text, col3 text);
INSERT INTO test VALUES (123, 'foo', 'bar');
@ -501,6 +500,7 @@ SELECT (r).* FROM (SELECT t #= '"col3"=&gt;"baz"' AS r FROM test t) s;
123 | foo | baz
(1 row)
</programlisting>
</para>
</sect2>
<sect2>
@ -515,21 +515,20 @@ SELECT (r).* FROM (SELECT t #= '"col3"=&gt;"baz"' AS r FROM test t) s;
<para>
Simple example:
</para>
<programlisting>
SELECT * FROM each('aaa=&gt;bq, b=&gt;NULL, ""=&gt;1');
</programlisting>
</para>
<para>
Using a table:
</para>
<programlisting>
SELECT (each(h)).key, (each(h)).value INTO stat FROM testhstore;
</programlisting>
</para>
<para>
Online statistics:
</para>
<programlisting>
SELECT key, count(*) FROM
(SELECT (each(h)).key FROM testhstore) AS stat
@ -548,6 +547,7 @@ SELECT key, count(*) FROM
org | 189
...................
</programlisting>
</para>
</sect2>
<sect2>
@ -572,10 +572,10 @@ SELECT key, count(*) FROM
performance penalty when processing data that has not yet been modified by
the new code. It is possible to force an upgrade of all values in a table
column by doing an <literal>UPDATE</> statement as follows:
</para>
<programlisting>
UPDATE tablename SET hstorecol = hstorecol || '';
</programlisting>
</para>
<para>
Another way to do it is:

2
doc/src/sgml/indexam.sgml
View File

@ -1,4 +1,4 @@
<!-- $PostgreSQL: pgsql/doc/src/sgml/indexam.sgml,v 2.33 2010/02/08 04:33:51 tgl Exp $ -->
<!-- $PostgreSQL: pgsql/doc/src/sgml/indexam.sgml,v 2.34 2010/07/29 19:34:40 petere Exp $ -->
<chapter id="indexam">
<title>Index Access Method Interface Definition</title>

64
doc/src/sgml/install-win32.sgml
View File

@ -1,4 +1,4 @@
<!-- $PostgreSQL: pgsql/doc/src/sgml/install-win32.sgml,v 1.58 2010/07/27 19:01:16 petere Exp $ -->
<!-- $PostgreSQL: pgsql/doc/src/sgml/install-win32.sgml,v 1.59 2010/07/29 19:34:40 petere Exp $ -->
<chapter id="install-win32">
<title>Installation from Source Code on <productname>Windows</productname></title>
@ -102,9 +102,9 @@
and then apply any changes from <filename>config.pl</filename>. For example,
to specify the location of your <productname>Python</productname> installation,
put the following in <filename>config.pl</filename>:
<screen>
<programlisting>
$config->{python} = 'c:\python26';
</screen>
</programlisting>
You only need to specify those parameters that are different from what's in
<filename>config_default.pl</filename>.
</para>
@ -114,9 +114,9 @@
<filename>buildenv.pl</filename> and put the required commands there. For
example, to add the path for bison when it's not in the PATH, create a file
containing:
<screen>
<programlisting>
$ENV{PATH}=$ENV{PATH} . ';c:\some\where\bison\bin';
</screen>
</programlisting>
</para>
<sect2>
@ -293,41 +293,29 @@
To build all of PostgreSQL in release configuration (the default), run the
command:
<screen>
<userinput>
build
</userinput>
<userinput>build</userinput>
</screen>
To build all of PostgreSQL in debug configuration, run the command:
<screen>
<userinput>
build DEBUG
</userinput>
<userinput>build DEBUG</userinput>
</screen>
To build just a single project, for example psql, run the commands:
<screen>
<userinput>
build psql
</userinput>
<userinput>
build DEBUG psql
</userinput>
<userinput>build psql</userinput>
<userinput>build DEBUG psql</userinput>
</screen>
To change the default build configuration to debug, put the following
in the <filename>buildenv.pl</filename> file:
<screen>
<userinput>
<programlisting>
$ENV{CONFIG}="Debug";
</userinput>
</screen>
</programlisting>
</para>
<para>
It is also possible to build from inside the Visual Studio GUI. In this
case, you need to run:
<screen>
<userinput>
perl mkvcbuild.pl
</userinput>
<userinput>perl mkvcbuild.pl</userinput>
</screen>
from the command prompt, and then open the generated
<filename>pgsql.sln</filename> (in the root directory of the source tree)
@ -355,9 +343,7 @@
install these files using the standard layout, and also generate the files
required to initialize and use the database, run the command:
<screen>
<userinput>
install c:\destination\directory
</userinput>
<userinput>install c:\destination\directory</userinput>
</screen>
</para>
</sect2>
@ -374,26 +360,16 @@
the following commands from the <filename>src\tools\msvc</filename>
directory:
<screen>
<userinput>
vcregress check
</userinput>
<userinput>
vcregress installcheck
</userinput>
<userinput>
vcregress plcheck
</userinput>
<userinput>
vcregress contribcheck
</userinput>
<userinput>vcregress check</userinput>
<userinput>vcregress installcheck</userinput>
<userinput>vcregress plcheck</userinput>
<userinput>vcregress contribcheck</userinput>
</screen>
To change the schedule used (default is parallel), append it to the
command line like:
<screen>
<userinput>
vcregress check serial
</userinput>
<userinput>vcregress check serial</userinput>
</screen>
For more information about the regression tests, see
@ -448,9 +424,9 @@
</variablelist>
Edit the <filename>buildenv.pl</filename> file, and add a variable for the
location of the root directory, for example:
<screen>
<programlisting>
$ENV{DOCROOT}='c:\docbook';
</screen>
</programlisting>
To build the documentation, run the command
<filename>builddoc.bat</filename>. Note that this will actually run the
build twice, in order to generate the indexes. The generated HTML files

16
doc/src/sgml/intagg.sgml
View File

@ -1,4 +1,4 @@
<!-- $PostgreSQL: pgsql/doc/src/sgml/intagg.sgml,v 1.4 2008/11/14 19:58:45 tgl Exp $ -->
<!-- $PostgreSQL: pgsql/doc/src/sgml/intagg.sgml,v 1.5 2010/07/29 19:34:40 petere Exp $ -->
<sect1 id="intagg">
<title>intagg</title>
@ -44,7 +44,6 @@
<para>
Many database systems have the notion of a one to many table. Such a table
usually sits between two indexed tables, for example:
</para>
<programlisting>
CREATE TABLE left (id INT PRIMARY KEY, ...);
@ -52,16 +51,13 @@ CREATE TABLE right (id INT PRIMARY KEY, ...);
CREATE TABLE one_to_many(left INT REFERENCES left, right INT REFERENCES right);
</programlisting>
<para>
It is typically used like this:
</para>
<programlisting>
SELECT right.* from right JOIN one_to_many ON (right.id = one_to_many.right)
WHERE one_to_many.left = <replaceable>item</>;
</programlisting>
<para>
This will return all the items in the right hand table for an entry
in the left hand table. This is a very common construct in SQL.
</para>
@ -74,35 +70,29 @@ CREATE TABLE one_to_many(left INT REFERENCES left, right INT REFERENCES right);
left hand entry. If you have a very dynamic system, there is not much you
can do. However, if you have some data which is fairly static, you can
create a summary table with the aggregator.
</para>
<programlisting>
CREATE TABLE summary as
CREATE TABLE summary AS
SELECT left, int_array_aggregate(right) AS right
FROM one_to_many
GROUP BY left;
</programlisting>
<para>
This will create a table with one row per left item, and an array
of right items. Now this is pretty useless without some way of using
the array; that's why there is an array enumerator. You can do
</para>
<programlisting>
SELECT left, int_array_enum(right) FROM summary WHERE left = <replaceable>item</>;
</programlisting>
<para>
The above query using <function>int_array_enum</> produces the same results
as
</para>
<programlisting>
SELECT left, right FROM one_to_many WHERE left = <replaceable>item</>;
</programlisting>
<para>
The difference is that the query against the summary table has to get
only one row from the table, whereas the direct query against
<structname>one_to_many</> must index scan and fetch a row for each entry.
@ -112,7 +102,6 @@ SELECT left, right FROM one_to_many WHERE left = <replaceable>item</>;
On one system, an <command>EXPLAIN</> showed a query with a cost of 8488 was
reduced to a cost of 329. The original query was a join involving the
<structname>one_to_many</> table, which was replaced by:
</para>
<programlisting>
SELECT right, count(right) FROM
@ -123,6 +112,7 @@ SELECT right, count(right) FROM
GROUP BY right
ORDER BY count DESC;
</programlisting>
</para>
</sect2>

2
doc/src/sgml/intarray.sgml
View File

@ -1,4 +1,4 @@
<!-- $PostgreSQL: pgsql/doc/src/sgml/intarray.sgml,v 1.10 2010/05/05 15:10:25 heikki Exp $ -->
<!-- $PostgreSQL: pgsql/doc/src/sgml/intarray.sgml,v 1.11 2010/07/29 19:34:40 petere Exp $ -->
<sect1 id="intarray">
<title>intarray</title>

28
doc/src/sgml/isn.sgml
View File

@ -1,4 +1,4 @@
<!-- $PostgreSQL: pgsql/doc/src/sgml/isn.sgml,v 1.5 2009/05/18 11:08:24 petere Exp $ -->
<!-- $PostgreSQL: pgsql/doc/src/sgml/isn.sgml,v 1.6 2010/07/29 19:34:40 petere Exp $ -->
<sect1 id="isn">
<title>isn</title>
@ -342,24 +342,20 @@ SELECT isbn13(id) FROM test;
<para>
The information to implement this module was collected from
several sites, including:
</para>
<programlisting>
http://www.isbn-international.org/
http://www.issn.org/
http://www.ismn-international.org/
http://www.wikipedia.org/
</programlisting>
<itemizedlist>
<listitem><para><ulink url="http://www.isbn-international.org/"></ulink></para></listitem>
<listitem><para><ulink url="http://www.issn.org/"></ulink></para></listitem>
<listitem><para><ulink url="http://www.ismn-international.org/"></ulink></para></listitem>
<listitem><para><ulink url="http://www.wikipedia.org/"></ulink></para></listitem>
</itemizedlist>
<para>
The prefixes used for hyphenation were also compiled from:
</para>
<programlisting>
http://www.gs1.org/productssolutions/idkeys/support/prefix_list.html
http://www.isbn-international.org/en/identifiers.html
http://www.ismn-international.org/ranges.html
</programlisting>
<itemizedlist>
<listitem><para><ulink url="http://www.gs1.org/productssolutions/idkeys/support/prefix_list.html"></ulink></para></listitem>
<listitem><para><ulink url="http://www.isbn-international.org/en/identifiers.html"></ulink></para></listitem>
<listitem><para><ulink url="http://www.ismn-international.org/ranges.html"></ulink></para></listitem>
</itemizedlist>
<para>
Care was taken during the creation of the algorithms and they
were meticulously verified against the suggested algorithms
in the official ISBN, ISMN, ISSN User Manuals.

40
doc/src/sgml/libpq.sgml
View File

@ -1,4 +1,4 @@
<!-- $PostgreSQL: pgsql/doc/src/sgml/libpq.sgml,v 1.316 2010/07/27 19:01:16 petere Exp $ -->
<!-- $PostgreSQL: pgsql/doc/src/sgml/libpq.sgml,v 1.317 2010/07/29 19:34:40 petere Exp $ -->
<chapter id="libpq">
<title><application>libpq</application> - C Library</title>
@ -692,13 +692,9 @@ PGconn *PQsetdb(char *pghost,
<synopsis>
PGconn *PQconnectStartParams(const char **keywords, const char **values, int expand_dbname);
</synopsis>
<synopsis>
PGconn *PQconnectStart(const char *conninfo);
</synopsis>
<synopsis>
PostgresPollingStatusType PQconnectPoll(PGconn *conn);
</synopsis>
</para>
@ -1039,8 +1035,7 @@ PQconninfoOption *PQconninfoParse(const char *conninfo, char **errmsg);
<synopsis>
int PQresetStart(PGconn *conn);
</synopsis>
<synopsis>
PostgresPollingStatusType PQresetPoll(PGconn *conn);
</synopsis>
</para>
@ -2938,7 +2933,8 @@ PQfnumber(res, "\"BAR\"") <lineannotation>1</lineannotation>
void PQprint(FILE *fout, /* output stream */
const PGresult *res,
const PQprintOpt *po);
typedef struct {
typedef struct
{
pqbool header; /* print output field headings and row count */
pqbool align; /* fill align the fields */
pqbool standard; /* old brain dead format */
@ -3111,7 +3107,7 @@ typedef struct {
<listitem>
<para>
<synopsis>
size_t PQescapeLiteral(PGconn *conn, char *str, size_t len)
size_t PQescapeLiteral(PGconn *conn, char *str, size_t len);
</synopsis>
</para>
@ -3175,7 +3171,7 @@ typedef struct {
<listitem>
<para>
<synopsis>
size_t PQescapeIdentifier(PGconn *conn, char *str, size_t len)
size_t PQescapeIdentifier(PGconn *conn, char *str, size_t len);
</synopsis>
</para>
@ -4144,10 +4140,12 @@ typedef struct {
const PQArgBlock *args,
int nargs);
typedef struct {
typedef struct
{
int len;
int isint;
union {
union
{
int *ptr;
int integer;
} u;
@ -4233,7 +4231,8 @@ typedef struct {
<synopsis>
PGnotify *PQnotifies(PGconn *conn);
typedef struct pgNotify {
typedef struct pgNotify
{
char *relname; /* notification channel name */
int be_pid; /* process ID of notifying server process */
char *extra; /* notification payload string */
@ -4891,7 +4890,8 @@ char *pg_encoding_to_char(int <replaceable>encoding_id</replaceable>);
Determines the verbosity of messages returned by
<function>PQerrorMessage</> and <function>PQresultErrorMessage</>.
<synopsis>
typedef enum {
typedef enum
{
PQERRORS_TERSE,
PQERRORS_DEFAULT,
PQERRORS_VERBOSE
@ -6438,7 +6438,7 @@ user=admin
<para>
A sample LDAP entry that has been created with the LDIF file
<synopsis>
<programlisting>
version:1
dn:cn=mydatabase,dc=mycompany,dc=com
changetype:add
@ -6450,24 +6450,24 @@ user=admin
uniqueMember:dbname=mydb
uniqueMember:user=mydb_user
uniqueMember:sslmode=require
</synopsis>
</programlisting>
might be queried with the following LDAP URL:
<synopsis>
<programlisting>
ldap://ldap.mycompany.com/dc=mycompany,dc=com?uniqueMember?one?(cn=mydatabase)
</synopsis>
</programlisting>
</para>
<para>
You can also mix regular service file entries with LDAP lookups.
A complete example for a stanza in <filename>pg_service.conf</filename>
would be:
<synopsis>
<programlisting>
# only host and port are stored in LDAP, specify dbname and user explicitly
[customerdb]
dbname=customer
user=appuser
ldap://ldap.acme.com/cn=dbserver,cn=hosts?pgconnectinfo?base?(objectclass=*)
</synopsis>
</programlisting>
</para>
</sect1>

2
doc/src/sgml/lo.sgml
View File

@ -1,4 +1,4 @@
<!-- $PostgreSQL: pgsql/doc/src/sgml/lo.sgml,v 1.3 2007/12/06 04:12:10 tgl Exp $ -->
<!-- $PostgreSQL: pgsql/doc/src/sgml/lo.sgml,v 1.4 2010/07/29 19:34:40 petere Exp $ -->
<sect1 id="lo">
<title>lo</title>

64
doc/src/sgml/ltree.sgml
View File

@ -1,4 +1,4 @@
<!-- $PostgreSQL: pgsql/doc/src/sgml/ltree.sgml,v 1.4 2010/03/17 17:12:31 petere Exp $ -->
<!-- $PostgreSQL: pgsql/doc/src/sgml/ltree.sgml,v 1.5 2010/07/29 19:34:40 petere Exp $ -->
<sect1 id="ltree">
<title>ltree</title>
@ -58,32 +58,32 @@
for matching <type>ltree</> values. A simple word matches that
label within a path. A star symbol (<literal>*</>) matches zero
or more labels. For example:
<programlisting>
<synopsis>
foo <lineannotation>Match the exact label path <literal>foo</></lineannotation>
*.foo.* <lineannotation>Match any label path containing the label <literal>foo</></lineannotation>
*.foo <lineannotation>Match any label path whose last label is <literal>foo</></lineannotation>
</programlisting>
</synopsis>
</para>
<para>
Star symbols can also be quantified to restrict how many labels
they can match:
<programlisting>
<synopsis>
*{<replaceable>n</>} <lineannotation>Match exactly <replaceable>n</> labels</lineannotation>
*{<replaceable>n</>,} <lineannotation>Match at least <replaceable>n</> labels</lineannotation>
*{<replaceable>n</>,<replaceable>m</>} <lineannotation>Match at least <replaceable>n</> but not more than <replaceable>m</> labels</lineannotation>
*{,<replaceable>m</>} <lineannotation>Match at most <replaceable>m</> labels &mdash; same as </lineannotation> *{0,<replaceable>m</>}
</programlisting>
</synopsis>
</para>
<para>
There are several modifiers that can be put at the end of a non-star
label in <type>lquery</> to make it match more than just the exact match:
<programlisting>
<synopsis>
@ <lineannotation>Match case-insensitively, for example <literal>a@</> matches <literal>A</></lineannotation>
* <lineannotation>Match any label with this prefix, for example <literal>foo*</> matches <literal>foobar</></lineannotation>
% <lineannotation>Match initial underscore-separated words</lineannotation>
</programlisting>
</synopsis>
The behavior of <literal>%</> is a bit complicated. It tries to match
words rather than the entire label. For example
<literal>foo_bar%</> matches <literal>foo_bar_baz</> but not
@ -559,7 +559,7 @@ CREATE INDEX path_idx ON test USING btree(path);
the hierarchy shown below:
</para>
<programlisting>
<literallayout class="monospaced">
Top
/ | \
Science Hobbies Collections
@ -569,14 +569,12 @@ CREATE INDEX path_idx ON test USING btree(path);
Astrophysics Cosmology Astronomy
/ | \
Galaxies Stars Astronauts
</programlisting>
</literallayout>
<para>
We can do inheritance:
</para>
<programlisting>
ltreetest=# select path from test where path &lt;@ 'Top.Science';
<screen>
ltreetest=&gt; SELECT path FROM test WHERE path &lt;@ 'Top.Science';
path
------------------------------------
Top.Science
@ -584,14 +582,13 @@ ltreetest=# select path from test where path &lt;@ 'Top.Science';
Top.Science.Astronomy.Astrophysics
Top.Science.Astronomy.Cosmology
(4 rows)
</programlisting>
</screen>
</para>
<para>
Here are some examples of path matching:
</para>
<programlisting>
ltreetest=# select path from test where path ~ '*.Astronomy.*';
<screen>
ltreetest=&gt; SELECT path FROM test WHERE path ~ '*.Astronomy.*';
path
-----------------------------------------------
Top.Science.Astronomy
@ -603,20 +600,20 @@ ltreetest=# select path from test where path ~ '*.Astronomy.*';
Top.Collections.Pictures.Astronomy.Astronauts
(7 rows)
ltreetest=# select path from test where path ~ '*.!pictures@.*.Astronomy.*';
ltreetest=&gt; SELECT path FROM test WHERE path ~ '*.!pictures@.*.Astronomy.*';
path
------------------------------------
Top.Science.Astronomy
Top.Science.Astronomy.Astrophysics
Top.Science.Astronomy.Cosmology
(3 rows)
</programlisting>
</screen>
</para>
<para>
Here are some examples of full text search:
</para>
<programlisting>
ltreetest=# select path from test where path @ 'Astro*% &amp; !pictures@';
<screen>
ltreetest=&gt; SELECT path FROM test WHERE path @ 'Astro*% &amp; !pictures@';
path
------------------------------------
Top.Science.Astronomy
@ -625,45 +622,46 @@ ltreetest=# select path from test where path @ 'Astro*% &amp; !pictures@';
Top.Hobbies.Amateurs_Astronomy
(4 rows)
ltreetest=# select path from test where path @ 'Astro* &amp; !pictures@';
ltreetest=&gt; SELECT path FROM test WHERE path @ 'Astro* &amp; !pictures@';
path
------------------------------------
Top.Science.Astronomy
Top.Science.Astronomy.Astrophysics
Top.Science.Astronomy.Cosmology
(3 rows)
</programlisting>
</screen>
</para>
<para>
Path construction using functions:
</para>
<programlisting>
ltreetest=# select subpath(path,0,2)||'Space'||subpath(path,2) from test where path &lt;@ 'Top.Science.Astronomy';
<screen>
ltreetest=&gt; SELECT subpath(path,0,2)||'Space'||subpath(path,2) FROM test WHERE path &lt;@ 'Top.Science.Astronomy';
?column?
------------------------------------------
Top.Science.Space.Astronomy
Top.Science.Space.Astronomy.Astrophysics
Top.Science.Space.Astronomy.Cosmology
(3 rows)
</programlisting>
</screen>
</para>
<para>
We could simplify this by creating a SQL function that inserts a label
at a specified position in a path:
</para>
<programlisting>
<screen>
CREATE FUNCTION ins_label(ltree, int, text) RETURNS ltree
AS 'select subpath($1,0,$2) || $3 || subpath($1,$2);'
LANGUAGE SQL IMMUTABLE;
ltreetest=# select ins_label(path,2,'Space') from test where path &lt;@ 'Top.Science.Astronomy';
ltreetest=&gt; SELECT ins_label(path,2,'Space') FROM test WHERE path &lt;@ 'Top.Science.Astronomy';
ins_label
------------------------------------------
Top.Science.Space.Astronomy
Top.Science.Space.Astronomy.Astrophysics
Top.Science.Space.Astronomy.Cosmology
(3 rows)
</programlisting>
</screen>
</para>
</sect2>
<sect2>

2
doc/src/sgml/monitoring.sgml
View File

@ -1,4 +1,4 @@
<!-- $PostgreSQL: pgsql/doc/src/sgml/monitoring.sgml,v 1.80 2010/04/26 19:56:55 tgl Exp $ -->
<!-- $PostgreSQL: pgsql/doc/src/sgml/monitoring.sgml,v 1.81 2010/07/29 19:34:40 petere Exp $ -->
<chapter id="monitoring">
<title>Monitoring Database Activity</title>

6
doc/src/sgml/oid2name.sgml
View File

@ -1,4 +1,4 @@
<!-- $PostgreSQL: pgsql/doc/src/sgml/oid2name.sgml,v 1.8 2010/05/25 15:55:28 momjian Exp $ -->
<!-- $PostgreSQL: pgsql/doc/src/sgml/oid2name.sgml,v 1.9 2010/07/29 19:34:40 petere Exp $ -->
<sect1 id="oid2name">
<title>oid2name</title>
@ -147,7 +147,7 @@
<sect2>
<title>Examples</title>
<programlisting>
<screen>
$ # what's in this database server, anyway?
$ oid2name
All databases:
@ -264,7 +264,7 @@ From database "alvherre":
Filenode Table Name
----------------------
155156 foo
</programlisting>
</screen>
</sect2>
<sect2>

33
doc/src/sgml/pageinspect.sgml
View File

@ -1,4 +1,4 @@
<!-- $PostgreSQL: pgsql/doc/src/sgml/pageinspect.sgml,v 1.6 2009/06/08 16:22:44 tgl Exp $ -->
<!-- $PostgreSQL: pgsql/doc/src/sgml/pageinspect.sgml,v 1.7 2010/07/29 19:34:40 petere Exp $ -->
<sect1 id="pageinspect">
<title>pageinspect</title>
@ -62,15 +62,12 @@
<para>
A page image obtained with <function>get_raw_page</function> should be
passed as argument. For example:
</para>
<programlisting>
<screen>
test=# SELECT * FROM page_header(get_raw_page('pg_class', 0));
lsn | tli | flags | lower | upper | special | pagesize | version | prune_xid
-----------+-----+-------+-------+-------+---------+----------+---------+-----------
0/24A1B50 | 1 | 1 | 232 | 368 | 8192 | 8192 | 4 | 0
</programlisting>
<para>
</screen>
The returned columns correspond to the fields in the
<structname>PageHeaderData</> struct.
See <filename>src/include/storage/bufpage.h</> for details.
@ -93,11 +90,9 @@ test=# SELECT * FROM page_header(get_raw_page('pg_class', 0));
<para>
A heap page image obtained with <function>get_raw_page</function> should
be passed as argument. For example:
</para>
<programlisting>
<screen>
test=# SELECT * FROM heap_page_items(get_raw_page('pg_class', 0));
</programlisting>
<para>
</screen>
See <filename>src/include/storage/itemid.h</> and
<filename>src/include/access/htup.h</> for explanations of the fields
returned.
@ -114,8 +109,7 @@ test=# SELECT * FROM heap_page_items(get_raw_page('pg_class', 0));
<para>
<function>bt_metap</function> returns information about a btree
index's metapage. For example:
</para>
<programlisting>
<screen>
test=# SELECT * FROM bt_metap('pg_cast_oid_index');
-[ RECORD 1 ]-----
magic | 340322
@ -124,7 +118,8 @@ root | 1
level | 0
fastroot | 1
fastlevel | 0
</programlisting>
</screen>
</para>
</listitem>
</varlistentry>
@ -137,8 +132,7 @@ fastlevel | 0
<para>
<function>bt_page_stats</function> returns summary information about
single pages of btree indexes. For example:
</para>
<programlisting>
<screen>
test=# SELECT * FROM bt_page_stats('pg_cast_oid_index', 1);
-[ RECORD 1 ]-+-----
blkno | 1
@ -152,7 +146,8 @@ btpo_prev | 0
btpo_next | 0
btpo | 0
btpo_flags | 3
</programlisting>
</screen>
</para>
</listitem>
</varlistentry>
@ -165,8 +160,7 @@ btpo_flags | 3
<para>
<function>bt_page_items</function> returns detailed information about
all of the items on a btree index page. For example:
</para>
<programlisting>
<screen>
test=# SELECT * FROM bt_page_items('pg_cast_oid_index', 1);
itemoffset | ctid | itemlen | nulls | vars | data
------------+---------+---------+-------+------+-------------
@ -178,7 +172,8 @@ test=# SELECT * FROM bt_page_items('pg_cast_oid_index', 1);
6 | (0,6) | 12 | f | f | 28 27 00 00
7 | (0,7) | 12 | f | f | 29 27 00 00
8 | (0,8) | 12 | f | f | 2a 27 00 00
</programlisting>
</screen>
</para>
</listitem>
</varlistentry>

12
doc/src/sgml/pgarchivecleanup.sgml
View File

@ -1,4 +1,4 @@
<!-- $PostgreSQL: pgsql/doc/src/sgml/pgarchivecleanup.sgml,v 1.1 2010/06/14 17:25:24 sriggs Exp $ -->
<!-- $PostgreSQL: pgsql/doc/src/sgml/pgarchivecleanup.sgml,v 1.2 2010/07/29 19:34:40 petere Exp $ -->
<sect1 id="pgarchivecleanup">
<title>pg_archivecleanup</title>
@ -38,11 +38,9 @@
To configure a standby
server to use <application>pg_archivecleanup</>, put this into its
<filename>recovery.conf</filename> configuration file:
</para>
<programlisting>
archive_cleanup_command = 'pg_archivecleanup <replaceable>archiveDir</> %r'
</programlisting>
<para>
where <replaceable>archiveDir</> is the directory from which WAL segment
files should be restored.
</para>
@ -58,11 +56,9 @@ archive_cleanup_command = 'pg_archivecleanup <replaceable>archiveDir</> %r'
</para>
<para>
The full syntax of <application>pg_archivecleanup</>'s command line is
</para>
<synopsis>
pg_archivecleanup <optional> <replaceable>option</> ... </optional> <replaceable>archivelocation</> <replaceable>restartwalfile</>
</synopsis>
<para>
When used as a standalone program all WAL files logically preceding the
<literal>restartwalfile</> will be removed <replaceable>archivelocation</>.
In this mode, if you specify a .backup filename, then only the file prefix
@ -70,7 +66,6 @@ pg_archivecleanup <optional> <replaceable>option</> ... </optional> <replaceable
all WAL files archived prior to a specific base backup without error.
For example, the following example will remove all files older than
WAL filename 000000010000003700000010:
</para>
<programlisting>
pg_archivecleanup -d archive 000000010000003700000010.00000020.backup
@ -78,7 +73,6 @@ pg_archivecleanup: keep WAL files 000000010000003700000010 and later
pg_archivecleanup: removing "archive/00000001000000370000000F"
pg_archivecleanup: removing "archive/00000001000000370000000E"
</programlisting>
<para>
<application>pg_archivecleanup</application> assumes that
<replaceable>archivelocation</> is a directory readable and writable by the
server-owning user.
@ -110,12 +104,10 @@ pg_archivecleanup: removing "archive/00000001000000370000000E"
<sect2>
<title>Examples</title>
<para>On Linux or Unix systems, you might use:</para>
<para>On Linux or Unix systems, you might use:
<programlisting>
archive_cleanup_command = 'pg_archivecleanup -d .../archive %r 2>>cleanup.log'
</programlisting>
<para>
where the archive directory is physically located on the standby server,
so that the <literal>archive_command</> is accessing it across NFS,
but the files are local to the standby.

20
doc/src/sgml/pgbench.sgml
View File

@ -1,4 +1,4 @@
<!-- $PostgreSQL: pgsql/doc/src/sgml/pgbench.sgml,v 1.16 2010/05/25 15:55:28 momjian Exp $ -->
<!-- $PostgreSQL: pgsql/doc/src/sgml/pgbench.sgml,v 1.17 2010/07/29 19:34:40 petere Exp $ -->
<sect1 id="pgbench">
<title>pgbench</title>
@ -22,7 +22,7 @@
<para>
Typical output from pgbench looks like:
<programlisting>
<screen>
transaction type: TPC-B (sort of)
scaling factor: 10
query mode: simple
@ -32,7 +32,7 @@ number of transactions per client: 1000
number of transactions actually processed: 10000/10000
tps = 85.184871 (including connections establishing)
tps = 85.296346 (excluding connections establishing)
</programlisting>
</screen>
The first six lines report some of the most important parameter
settings. The next line reports the number of transactions completed
@ -77,16 +77,14 @@ pgbench -i <optional> <replaceable>other-options</> </optional> <replaceable>dbn
<para>
At the default <quote>scale factor</> of 1, the tables initially
contain this many rows:
</para>
<programlisting>
<screen>
table # of rows
---------------------------------
pgbench_branches 1
pgbench_tellers 10
pgbench_accounts 100000
pgbench_history 0
</programlisting>
<para>
</screen>
You can (and, for most purposes, probably should) increase the number
of rows by using the <literal>-s</> (scale factor) option. The
<literal>-F</> (fillfactor) option might also be used at this point.
@ -630,9 +628,9 @@ END;
<para>
The format of the log is:
<programlisting>
<synopsis>
<replaceable>client_id</> <replaceable>transaction_no</> <replaceable>time</> <replaceable>file_no</> <replaceable>time_epoch</> <replaceable>time_us</>
</programlisting>
</synopsis>
where <replaceable>time</> is the elapsed transaction time in microseconds,
<replaceable>file_no</> identifies which script file was used
@ -646,12 +644,12 @@ END;
<para>
Here are example outputs:
<programlisting>
<screen>
0 199 2241 0 1175850568 995598
0 200 2465 0 1175850568 998079
0 201 2513 0 1175850569 608
0 202 2038 0 1175850569 2663
</programlisting>
</screen>
</para>
</sect2>

7
doc/src/sgml/pgbuffercache.sgml
View File

@ -1,4 +1,4 @@
<!-- $PostgreSQL: pgsql/doc/src/sgml/pgbuffercache.sgml,v 2.6 2010/02/07 20:48:09 tgl Exp $ -->
<!-- $PostgreSQL: pgsql/doc/src/sgml/pgbuffercache.sgml,v 2.7 2010/07/29 19:34:40 petere Exp $ -->
<sect1 id="pgbuffercache">
<title>pg_buffercache</title>
@ -134,7 +134,7 @@
<sect2>
<title>Sample output</title>
<programlisting>
<screen>
regression=# SELECT c.relname, count(*) AS buffers
FROM pg_buffercache b INNER JOIN pg_class c
ON b.relfilenode = pg_relation_filenode(c.oid) AND
@ -143,6 +143,7 @@
GROUP BY c.relname
ORDER BY 2 DESC
LIMIT 10;
relname | buffers
---------------------------------+---------
tenk2 | 345
@ -156,7 +157,7 @@
pg_depend | 22
pg_depend_reference_index | 20
(10 rows)
</programlisting>
</screen>
</sect2>
<sect2>

70
doc/src/sgml/pgcrypto.sgml
View File

@ -1,4 +1,4 @@
<!-- $PostgreSQL: pgsql/doc/src/sgml/pgcrypto.sgml,v 1.9 2010/06/29 22:29:14 momjian Exp $ -->
<!-- $PostgreSQL: pgsql/doc/src/sgml/pgcrypto.sgml,v 1.10 2010/07/29 19:34:40 petere Exp $ -->
<sect1 id="pgcrypto">
<title>pgcrypto</title>
@ -37,12 +37,12 @@
<para>
If you want the digest as a hexadecimal string, use
<function>encode()</> on the result. For example:
</para>
<programlisting>
CREATE OR REPLACE FUNCTION sha1(bytea) returns text AS $$
SELECT encode(digest($1, 'sha1'), 'hex')
$$ LANGUAGE SQL STRICT IMMUTABLE;
</programlisting>
</para>
</sect3>
<sect3>
@ -176,17 +176,15 @@
</para>
<para>
Example of setting a new password:
</para>
<programlisting>
UPDATE ... SET pswhash = crypt('new password', gen_salt('md5'));
</programlisting>
</para>
<para>
Example of authentication:
</para>
<programlisting>
SELECT pswhash = crypt('entered password', pswhash) FROM ... ;
</programlisting>
<para>
This returns <literal>true</> if the entered password is correct.
</para>
</sect3>
@ -625,10 +623,10 @@
Options are named to be similar to GnuPG. An option's value should be
given after an equal sign; separate options from each other with commas.
For example:
</para>
<programlisting>
pgp_sym_encrypt(data, psw, 'compress-algo=1, cipher-algo=aes256')
</programlisting>
</para>
<para>
All of the options except <literal>convert-crlf</literal> apply only to
@ -648,11 +646,11 @@
<para>
Which cipher algorithm to use.
</para>
<programlisting>
<literallayout>
Values: bf, aes128, aes192, aes256 (OpenSSL-only: <literal>3des</literal>, <literal>cast5</literal>)
Default: aes128
Applies to: pgp_sym_encrypt, pgp_pub_encrypt
</programlisting>
</literallayout>
</sect4>
<sect4>
@ -662,14 +660,14 @@
Which compression algorithm to use. Only available if
<productname>PostgreSQL</productname> was built with zlib.
</para>
<programlisting>
<literallayout>
Values:
0 - no compression
1 - ZIP compression
2 - ZLIB compression (= ZIP plus meta-data and block CRCs)
Default: 0
Applies to: pgp_sym_encrypt, pgp_pub_encrypt
</programlisting>
</literallayout>
</sect4>
<sect4>
@ -679,11 +677,11 @@
How much to compress. Higher levels compress smaller but are slower.
0 disables compression.
</para>
<programlisting>
<literallayout>
Values: 0, 1-9
Default: 6
Applies to: pgp_sym_encrypt, pgp_pub_encrypt
</programlisting>
</literallayout>
</sect4>
<sect4>
@ -696,11 +694,11 @@
<literal>\r\n</literal> line-feeds. Use this to get fully RFC-compliant
behavior.
</para>
<programlisting>
<literallayout>
Values: 0, 1
Default: 0
Applies to: pgp_sym_encrypt, pgp_pub_encrypt, pgp_sym_decrypt, pgp_pub_decrypt
</programlisting>
</literallayout>
</sect4>
<sect4>
@ -712,11 +710,11 @@
the addition of SHA-1 protected packets to RFC 4880.
Recent gnupg.org and pgp.com software supports it fine.
</para>
<programlisting>
<literallayout>
Values: 0, 1
Default: 0
Applies to: pgp_sym_encrypt, pgp_pub_encrypt
</programlisting>
</literallayout>
</sect4>
<sect4>
@ -727,11 +725,11 @@
session key; this is for symmetric-key encryption, which by default
uses the S2K key directly.
</para>
<programlisting>
<literallayout>
Values: 0, 1
Default: 0
Applies to: pgp_sym_encrypt
</programlisting>
</literallayout>
</sect4>
<sect4>
@ -740,14 +738,14 @@
<para>
Which S2K algorithm to use.
</para>
<programlisting>
<literallayout>
Values:
0 - Without salt. Dangerous!
1 - With salt but with fixed iteration count.
3 - Variable iteration count.
Default: 3
Applies to: pgp_sym_encrypt
</programlisting>
</literallayout>
</sect4>
<sect4>
@ -756,11 +754,11 @@
<para>
Which digest algorithm to use in S2K calculation.
</para>
<programlisting>
<literallayout>
Values: md5, sha1
Default: sha1
Applies to: pgp_sym_encrypt
</programlisting>
</literallayout>
</sect4>
<sect4>
@ -769,11 +767,11 @@
<para>
Which cipher to use for encrypting separate session key.
</para>
<programlisting>
<literallayout>
Values: bf, aes, aes128, aes192, aes256
Default: use cipher-algo
Applies to: pgp_sym_encrypt
</programlisting>
</literallayout>
</sect4>
<sect4>
@ -785,11 +783,11 @@
be done, but the message will be tagged as UTF-8. Without this option
it will not be.
</para>
<programlisting>
<literallayout>
Values: 0, 1
Default: 0
Applies to: pgp_sym_encrypt, pgp_pub_encrypt
</programlisting>
</literallayout>
</sect4>
</sect3>
@ -798,10 +796,10 @@
<para>
To generate a new key:
</para>
<programlisting>
gpg --gen-key
</programlisting>
</para>
<para>
The preferred key type is <quote>DSA and Elgamal</>.
</para>
@ -812,22 +810,22 @@
</para>
<para>
To list keys:
</para>
<programlisting>
gpg --list-secret-keys
</programlisting>
</para>
<para>
To export a public key in ascii-armor format:
</para>
<programlisting>
gpg -a --export KEYID > public.key
</programlisting>
</para>
<para>
To export a secret key in ascii-armor format:
</para>
<programlisting>
gpg -a --export-secret-keys KEYID > secret.key
</programlisting>
</para>
<para>
You need to use <function>dearmor()</> on these keys before giving them to
the PGP functions. Or if you can handle binary data, you can drop
@ -917,22 +915,17 @@
Encrypt/decrypt data using the cipher method specified by
<parameter>type</parameter>. The syntax of the
<parameter>type</parameter> string is:
</para>
<synopsis>
<replaceable>algorithm</> <optional> <literal>-</> <replaceable>mode</> </optional> <optional> <literal>/pad:</> <replaceable>padding</> </optional>
</synopsis>
<para>
where <replaceable>algorithm</> is one of:
</para>
<itemizedlist>
<listitem><para><literal>bf</literal> &mdash; Blowfish</para></listitem>
<listitem><para><literal>aes</literal> &mdash; AES (Rijndael-128)</para></listitem>
</itemizedlist>
<para>
and <replaceable>mode</> is one of:
</para>
<itemizedlist>
<listitem>
<para>
@ -946,9 +939,7 @@
</para>
</listitem>
</itemizedlist>
<para>
and <replaceable>padding</> is one of:
</para>
<itemizedlist>
<listitem>
<para>
@ -961,13 +952,14 @@
</para>
</listitem>
</itemizedlist>
</para>
<para>
So, for example, these are equivalent:
</para>
<programlisting>
encrypt(data, 'fooz', 'bf')
encrypt(data, 'fooz', 'bf-cbc/pad:pkcs')
</programlisting>
</para>
<para>
In <function>encrypt_iv</> and <function>decrypt_iv</>, the
<parameter>iv</> parameter is the initial value for the CBC mode;

7
doc/src/sgml/pgfreespacemap.sgml
View File

@ -1,4 +1,4 @@
<!-- $PostgreSQL: pgsql/doc/src/sgml/pgfreespacemap.sgml,v 2.6 2010/04/23 23:21:43 rhaas Exp $ -->
<!-- $PostgreSQL: pgsql/doc/src/sgml/pgfreespacemap.sgml,v 2.7 2010/07/29 19:34:40 petere Exp $ -->
<sect1 id="pgfreespacemap">
<title>pg_freespacemap</title>
@ -75,7 +75,7 @@
<sect2>
<title>Sample output</title>
<programlisting>
<screen>
postgres=# SELECT * FROM pg_freespace('foo');
blkno | avail
-------+-------
@ -106,8 +106,7 @@ postgres=# SELECT * FROM pg_freespace('foo', 7);
--------------
1216
(1 row)
</programlisting>
</screen>
</sect2>
<sect2>

6
doc/src/sgml/pgrowlocks.sgml
View File

@ -1,4 +1,4 @@
<!-- $PostgreSQL: pgsql/doc/src/sgml/pgrowlocks.sgml,v 1.5 2009/05/18 11:08:24 petere Exp $ -->
<!-- $PostgreSQL: pgsql/doc/src/sgml/pgrowlocks.sgml,v 1.6 2010/07/29 19:34:40 petere Exp $ -->
<sect1 id="pgrowlocks">
<title>pgrowlocks</title>
@ -114,7 +114,7 @@ SELECT * FROM accounts AS a, pgrowlocks('accounts') AS p
<sect2>
<title>Sample output</title>
<programlisting>
<screen>
test=# SELECT * FROM pgrowlocks('t1');
locked_row | lock_type | locker | multi | xids | pids
------------+-----------+--------+-------+-----------+---------------
@ -123,7 +123,7 @@ test=# SELECT * FROM pgrowlocks('t1');
(0,3) | Exclusive | 804 | f | {804} | {29066}
(0,4) | Exclusive | 804 | f | {804} | {29066}
(4 rows)
</programlisting>
</screen>
</sect2>
<sect2>

16
doc/src/sgml/pgstandby.sgml
View File

@ -1,4 +1,4 @@
<!-- $PostgreSQL: pgsql/doc/src/sgml/pgstandby.sgml,v 2.11 2010/05/25 15:55:28 momjian Exp $ -->
<!-- $PostgreSQL: pgsql/doc/src/sgml/pgstandby.sgml,v 2.12 2010/07/29 19:34:40 petere Exp $ -->
<sect1 id="pgstandby">
<title>pg_standby</title>
@ -50,21 +50,17 @@
To configure a standby
server to use <application>pg_standby</>, put this into its
<filename>recovery.conf</filename> configuration file:
</para>
<programlisting>
restore_command = 'pg_standby <replaceable>archiveDir</> %f %p %r'
</programlisting>
<para>
where <replaceable>archiveDir</> is the directory from which WAL segment
files should be restored.
</para>
<para>
The full syntax of <application>pg_standby</>'s command line is
</para>
<synopsis>
pg_standby <optional> <replaceable>option</> ... </optional> <replaceable>archivelocation</> <replaceable>nextwalfile</> <replaceable>xlogfilepath</> <optional> <replaceable>restartwalfile</> </optional>
</synopsis>
<para>
When used within <literal>restore_command</literal>, the <literal>%f</> and
<literal>%p</> macros should be specified for <replaceable>nextwalfile</>
and <replaceable>xlogfilepath</> respectively, to provide the actual file
@ -235,7 +231,7 @@ pg_standby <optional> <replaceable>option</> ... </optional> <replaceable>archiv
<sect2>
<title>Examples</title>
<para>On Linux or Unix systems, you might use:</para>
<para>On Linux or Unix systems, you might use:
<programlisting>
archive_command = 'cp %p .../archive/%f'
@ -244,12 +240,10 @@ restore_command = 'pg_standby -d -s 2 -t /tmp/pgsql.trigger.5442 .../archive %f
recovery_end_command = 'rm -f /tmp/pgsql.trigger.5442'
</programlisting>
<para>
where the archive directory is physically located on the standby server,
so that the <literal>archive_command</> is accessing it across NFS,
but the files are local to the standby (enabling use of <literal>ln</>).
This will:
</para>
<itemizedlist>
<listitem>
<para>
@ -279,8 +273,9 @@ recovery_end_command = 'rm -f /tmp/pgsql.trigger.5442'
</para>
</listitem>
</itemizedlist>
</para>
<para>On Windows, you might use:</para>
<para>On Windows, you might use:
<programlisting>
archive_command = 'copy %p ...\\archive\\%f'
@ -289,12 +284,10 @@ restore_command = 'pg_standby -d -s 5 -t C:\pgsql.trigger.5442 ...\archive %f %p
recovery_end_command = 'del C:\pgsql.trigger.5442'
</programlisting>
<para>
Note that backslashes need to be doubled in the
<literal>archive_command</>, but <emphasis>not</emphasis> in the
<literal>restore_command</> or <literal>recovery_end_command</>.
This will:
</para>
<itemizedlist>
<listitem>
<para>
@ -329,6 +322,7 @@ recovery_end_command = 'del C:\pgsql.trigger.5442'
</para>
</listitem>
</itemizedlist>
</para>
<para>
The <literal>copy</> command on Windows sets the final file size

8
doc/src/sgml/pgstatstatements.sgml
View File

@ -1,4 +1,4 @@
<!-- $PostgreSQL: pgsql/doc/src/sgml/pgstatstatements.sgml,v 1.6 2010/01/08 00:38:20 itagaki Exp $ -->
<!-- $PostgreSQL: pgsql/doc/src/sgml/pgstatstatements.sgml,v 1.7 2010/07/29 19:34:40 petere Exp $ -->
<sect1 id="pgstatstatements">
<title>pg_stat_statements</title>
@ -279,7 +279,6 @@
<filename>postgresql.conf</> file,
you will need to add <literal>pg_stat_statements</> to
<xref linkend="guc-custom-variable-classes">. Typical usage might be:
</para>
<programlisting>
# postgresql.conf
@ -289,12 +288,13 @@ custom_variable_classes = 'pg_stat_statements'
pg_stat_statements.max = 10000
pg_stat_statements.track = all
</programlisting>
</para>
</sect2>
<sect2>
<title>Sample output</title>
<programlisting>
<screen>
bench=# SELECT pg_stat_statements_reset();
$ pgbench -i bench
@ -334,7 +334,7 @@ calls | 1
total_time | 0.08142
rows | 0
hit_percent | 34.4947735191637631
</programlisting>
</screen>
</sect2>
<sect2>

4
doc/src/sgml/pgstattuple.sgml
View File

@ -1,4 +1,4 @@
<!-- $PostgreSQL: pgsql/doc/src/sgml/pgstattuple.sgml,v 1.5 2009/05/18 11:08:24 petere Exp $ -->
<!-- $PostgreSQL: pgsql/doc/src/sgml/pgstattuple.sgml,v 1.6 2010/07/29 19:34:40 petere Exp $ -->
<sect1 id="pgstattuple">
<title>pgstattuple</title>
@ -141,7 +141,6 @@ free_percent | 1.95
<para>
<function>pgstatindex</function> returns a record showing information
about a btree index. For example:
</para>
<programlisting>
test=> SELECT * FROM pgstatindex('pg_cast_oid_index');
-[ RECORD 1 ]------+------
@ -156,6 +155,7 @@ deleted_pages | 0
avg_leaf_density | 50.27
leaf_fragmentation | 0
</programlisting>
</para>
<para>
The output columns are:

8
doc/src/sgml/pgtrgm.sgml
View File

@ -1,4 +1,4 @@
<!-- $PostgreSQL: pgsql/doc/src/sgml/pgtrgm.sgml,v 2.2 2007/12/10 05:32:51 tgl Exp $ -->
<!-- $PostgreSQL: pgsql/doc/src/sgml/pgtrgm.sgml,v 2.3 2010/07/29 19:34:40 petere Exp $ -->
<sect1 id="pgtrgm">
<title>pg_trgm</title>
@ -149,14 +149,12 @@ CREATE INDEX trgm_idx ON test_trgm USING gin (t gin_trgm_ops);
<para>
At this point, you will have an index on the <structfield>t</> column that
you can use for similarity searching. A typical query is
</para>
<programlisting>
SELECT t, similarity(t, '<replaceable>word</>') AS sml
FROM test_trgm
WHERE t % '<replaceable>word</>'
ORDER BY sml DESC, t;
</programlisting>
<para>
This will return all values in the text column that are sufficiently
similar to <replaceable>word</>, sorted from best match to worst. The
index will be used to make this a fast operation even over very large data
@ -185,14 +183,12 @@ SELECT t, similarity(t, '<replaceable>word</>') AS sml
<para>
The first step is to generate an auxiliary table containing all
the unique words in the documents:
</para>
<programlisting>
CREATE TABLE words AS SELECT word FROM
ts_stat('SELECT to_tsvector(''simple'', bodytext) FROM documents');
</programlisting>
<para>
where <structname>documents</> is a table that has a text field
<structfield>bodytext</> that we wish to search. The reason for using
the <literal>simple</> configuration with the <function>to_tsvector</>
@ -202,13 +198,11 @@ CREATE TABLE words AS SELECT word FROM
<para>
Next, create a trigram index on the word column:
</para>
<programlisting>
CREATE INDEX words_idx ON words USING gin(word gin_trgm_ops);
</programlisting>
<para>
Now, a <command>SELECT</command> query similar to the previous example can
be used to suggest spellings for misspelled words in user search terms.
A useful extra test is to require that the selected words are also of

11
doc/src/sgml/plperl.sgml
View File

@ -1,4 +1,4 @@
<!-- $PostgreSQL: pgsql/doc/src/sgml/plperl.sgml,v 2.86 2010/07/08 21:35:33 petere Exp $ -->
<!-- $PostgreSQL: pgsql/doc/src/sgml/plperl.sgml,v 2.87 2010/07/29 19:34:40 petere Exp $ -->
<chapter id="plperl">
<title>PL/Perl - Perl Procedural Language</title>
@ -530,9 +530,6 @@ $plan = spi_prepare('SELECT * FROM test WHERE id &gt; $1 AND name = $2',
The advantage of prepared queries is that is it possible to use one prepared plan for more
than one query execution. After the plan is not needed anymore, it can be freed with
<literal>spi_freeplan</literal>:
</para>
<para>
<programlisting>
CREATE OR REPLACE FUNCTION init() RETURNS VOID AS $$
$_SHARED{my_plan} = spi_prepare('SELECT (now() + $1)::date AS now',
@ -559,9 +556,6 @@ SELECT done();
------------+------------+------------
2005-12-10 | 2005-12-11 | 2005-12-12
</programlisting>
</para>
<para>
Note that the parameter subscript in <literal>spi_prepare</literal> is defined via
$1, $2, $3, etc, so avoid declaring query strings in double quotes that might easily
lead to hard-to-catch bugs.
@ -569,9 +563,6 @@ SELECT done();
<para>
Another example illustrates usage of an optional parameter in <literal>spi_exec_prepared</literal>:
</para>
<para>
<programlisting>
CREATE TABLE hosts AS SELECT id, ('192.168.1.'||id)::inet AS address
FROM generate_series(1,3) AS id;

2
doc/src/sgml/plpgsql.sgml
View File

@ -1,4 +1,4 @@
<!-- $PostgreSQL: pgsql/doc/src/sgml/plpgsql.sgml,v 1.155 2010/07/27 20:02:06 rhaas Exp $ -->
<!-- $PostgreSQL: pgsql/doc/src/sgml/plpgsql.sgml,v 1.156 2010/07/29 19:34:40 petere Exp $ -->
<chapter id="plpgsql">
<title><application>PL/pgSQL</application> - <acronym>SQL</acronym> Procedural Language</title>

2
doc/src/sgml/ref/alter_domain.sgml
View File

@ -1,5 +1,5 @@
<!--
$PostgreSQL: pgsql/doc/src/sgml/ref/alter_domain.sgml,v 1.25 2010/04/03 07:22:56 petere Exp $
$PostgreSQL: pgsql/doc/src/sgml/ref/alter_domain.sgml,v 1.26 2010/07/29 19:34:40 petere Exp $
PostgreSQL documentation
-->

2
doc/src/sgml/ref/alter_sequence.sgml
View File

@ -1,5 +1,5 @@
<!--
$PostgreSQL: pgsql/doc/src/sgml/ref/alter_sequence.sgml,v 1.25 2010/04/03 07:22:57 petere Exp $
$PostgreSQL: pgsql/doc/src/sgml/ref/alter_sequence.sgml,v 1.26 2010/07/29 19:34:40 petere Exp $
PostgreSQL documentation
-->

2
doc/src/sgml/ref/alter_type.sgml
View File

@ -1,5 +1,5 @@
<!--
$PostgreSQL: pgsql/doc/src/sgml/ref/alter_type.sgml,v 1.8 2010/04/03 07:22:57 petere Exp $
$PostgreSQL: pgsql/doc/src/sgml/ref/alter_type.sgml,v 1.9 2010/07/29 19:34:40 petere Exp $
PostgreSQL documentation
-->

2
doc/src/sgml/ref/create_index.sgml
View File

@ -1,5 +1,5 @@
<!--
$PostgreSQL: pgsql/doc/src/sgml/ref/create_index.sgml,v 1.74 2010/04/03 07:22:58 petere Exp $
$PostgreSQL: pgsql/doc/src/sgml/ref/create_index.sgml,v 1.75 2010/07/29 19:34:40 petere Exp $
PostgreSQL documentation
-->

6
doc/src/sgml/ref/grant.sgml
View File

@ -1,5 +1,5 @@
<!--
$PostgreSQL: pgsql/doc/src/sgml/ref/grant.sgml,v 1.83 2010/04/03 07:23:01 petere Exp $
$PostgreSQL: pgsql/doc/src/sgml/ref/grant.sgml,v 1.84 2010/07/29 19:34:41 petere Exp $
PostgreSQL documentation
-->
@ -492,7 +492,7 @@ GRANT <replaceable class="PARAMETER">role_name</replaceable> [, ...] TO <replace
(1 row)
</programlisting>
The entries shown by <command>\dp</command> are interpreted thus:
<programlisting>
<literallayout class="monospaced">
rolename=xxxx -- privileges granted to a role
=xxxx -- privileges granted to PUBLIC
@ -512,7 +512,7 @@ GRANT <replaceable class="PARAMETER">role_name</replaceable> [, ...] TO <replace
* -- grant option for preceding privilege
/yyyy -- role that granted this privilege
</programlisting>
</literallayout>
The above example display would be seen by user <literal>miriam</> after
creating table <literal>mytable</> and doing:

2
doc/src/sgml/release-8.1.sgml
View File

@ -1,4 +1,4 @@
<!-- $PostgreSQL: pgsql/doc/src/sgml/release-8.1.sgml,v 1.7 2010/05/13 21:26:59 tgl Exp $ -->
<!-- $PostgreSQL: pgsql/doc/src/sgml/release-8.1.sgml,v 1.8 2010/07/29 19:34:40 petere Exp $ -->
<!-- See header comment in release.sgml about typical markup -->
<sect1 id="release-8-1-21">

14
doc/src/sgml/release-old.sgml
View File

@ -1,4 +1,4 @@
<!-- $PostgreSQL: pgsql/doc/src/sgml/release-old.sgml,v 1.1 2009/05/02 20:17:19 tgl Exp $ -->
<!-- $PostgreSQL: pgsql/doc/src/sgml/release-old.sgml,v 1.2 2010/07/29 19:34:40 petere Exp $ -->
<!-- See header comment in release.sgml about typical markup -->
<sect1 id="release-7-3-21">
@ -6587,20 +6587,20 @@ Initial release.
<para>
Timing with <function>fsync()</function> disabled:
<programlisting>
<literallayout class="monospaced">
Time System
02:00 Dual Pentium Pro 180, 224MB, UW-SCSI, Linux 2.0.36, gcc 2.7.2.3 -O2 -m486
04:38 Sparc Ultra 1 143MHz, 64MB, Solaris 2.6
</programlisting>
</literallayout>
</para>
<para>
Timing with <function>fsync()</function> enabled:
<programlisting>
<literallayout class="monospaced">
Time System
04:21 Dual Pentium Pro 180, 224MB, UW-SCSI, Linux 2.0.36, gcc 2.7.2.3 -O2 -m486
</programlisting>
</literallayout>
For the <systemitem class="osname">Linux</systemitem> system above, using <acronym>UW-SCSI</acronym> disks rather than (older) <acronym>IDE</acronym>
disks leads to a 50% improvement in speed on the regression test.
@ -6616,10 +6616,10 @@ since some additional regression tests have been included.
In general, however, 6.4 should be slightly faster than the previous release (thanks, Bruce!).
</para>
<para>
<programlisting>
<literallayout class="monospaced">
Time System
02:26 Dual Pentium Pro 180, 96MB, UW-SCSI, Linux 2.0.30, gcc 2.7.2.1 -O2 -m486
</programlisting>
</literallayout>
</para>
</sect2>

180
doc/src/sgml/seg.sgml
View File

@ -1,4 +1,4 @@
<!-- $PostgreSQL: pgsql/doc/src/sgml/seg.sgml,v 1.6 2009/12/08 20:08:30 mha Exp $ -->
<!-- $PostgreSQL: pgsql/doc/src/sgml/seg.sgml,v 1.7 2010/07/29 19:34:40 petere Exp $ -->
<sect1 id="seg">
<title>seg</title>
@ -39,13 +39,13 @@
6.50, and you input this reading into the database. What do you get
when you fetch it? Watch:
<programlisting>
<screen>
test=> select 6.50 :: float8 as "pH";
pH
---
6.5
(1 row)
</programlisting>
</screen>
In the world of measurements, 6.50 is not the same as 6.5. It may
sometimes be critically different. The experimenters usually write
@ -65,13 +65,13 @@ test=> select 6.50 :: float8 as "pH";
<para>
Check this out:
<programlisting>
<screen>
test=> select '6.25 .. 6.50'::seg as "pH";
pH
------------
6.25 .. 6.50
(1 row)
</programlisting>
</screen>
</para>
</sect2>
@ -234,85 +234,75 @@ test=> select '6.25 .. 6.50'::seg as "pH";
<para>
The <filename>seg</> module includes a GiST index operator class for
<type>seg</> values.
The operators supported by the GiST opclass include:
The operators supported by the GiST opclass are shown in <xref linkend="seg-gist-operators">.
</para>
<itemizedlist>
<listitem>
<programlisting>
[a, b] &lt;&lt; [c, d] Is left of
</programlisting>
<para>
[a, b] is entirely to the left of [c, d]. That is,
[a, b] &lt;&lt; [c, d] is true if b &lt; c and false otherwise
</para>
</listitem>
<listitem>
<programlisting>
[a, b] &gt;&gt; [c, d] Is right of
</programlisting>
<para>
[a, b] is entirely to the right of [c, d]. That is,
[a, b] &gt;&gt; [c, d] is true if a &gt; d and false otherwise
</para>
</listitem>
<listitem>
<programlisting>
[a, b] &amp;&lt; [c, d] Overlaps or is left of
</programlisting>
<para>
This might be better read as <quote>does not extend to right of</quote>.
It is true when b &lt;= d.
</para>
</listitem>
<listitem>
<programlisting>
[a, b] &amp;&gt; [c, d] Overlaps or is right of
</programlisting>
<para>
This might be better read as <quote>does not extend to left of</quote>.
It is true when a &gt;= c.
</para>
</listitem>
<listitem>
<programlisting>
[a, b] = [c, d] Same as
</programlisting>
<para>
The segments [a, b] and [c, d] are identical, that is, a = c and b = d
</para>
</listitem>
<listitem>
<programlisting>
[a, b] &amp;&amp; [c, d] Overlaps
</programlisting>
<para>
The segments [a, b] and [c, d] overlap.
</para>
</listitem>
<listitem>
<programlisting>
[a, b] @&gt; [c, d] Contains
</programlisting>
<para>
The segment [a, b] contains the segment [c, d], that is,
a &lt;= c and b &gt;= d
</para>
</listitem>
<listitem>
<programlisting>
[a, b] &lt;@ [c, d] Contained in
</programlisting>
<para>
The segment [a, b] is contained in [c, d], that is,
a &gt;= c and b &lt;= d
</para>
</listitem>
</itemizedlist>
<table id="seg-gist-operators">
<title>Seg GiST operators</title>
<tgroup cols="2">
<thead>
<row>
<entry>Operator</entry>
<entry>Description</entry>
</row>
</thead>
<tbody>
<row>
<entry><literal>[a, b] &lt;&lt; [c, d]</literal></entry>
<entry>[a, b] is entirely to the left of [c, d]. That is, [a,
b] &lt;&lt; [c, d] is true if b &lt; c and false otherwise.</entry>
</row>
<row>
<entry><literal>[a, b] &gt;&gt; [c, d]</literal></entry>
<entry>[a, b] is entirely to the right of [c, d]. That is, [a,
b] &gt;&gt; [c, d] is true if a &gt; d and false otherwise.</entry>
</row>
<row>
<entry><literal>[a, b] &amp;&lt; [c, d]</literal></entry>
<entry>Overlaps or is left of &mdash; This might be better read
as <quote>does not extend to right of</quote>. It is true when
b &lt;= d.</entry>
</row>
<row>
<entry><literal>[a, b] &amp;&gt; [c, d]</literal></entry>
<entry>Overlaps or is right of &mdash; This might be better read
as <quote>does not extend to left of</quote>. It is true when
a &gt;= c.</entry>
</row>
<row>
<entry><literal>[a, b] = [c, d]</literal></entry>
<entry>Same as &mdash; The segments [a, b] and [c, d] are
identical, that is, a = c and b = d.</entry>
</row>
<row>
<entry><literal>[a, b] &amp;&amp; [c, d]</literal></entry>
<entry>The segments [a, b] and [c, d] overlap.</entry>
</row>
<row>
<entry><literal>[a, b] @&gt; [c, d]</literal></entry>
<entry>The segment [a, b] contains the segment [c, d], that is,
a &lt;= c and b &gt;= d.</entry>
</row>
<row>
<entry><literal>[a, b] &lt;@ [c, d]</literal></entry>
<entry>The segment [a, b] is contained in [c, d], that is, a
&gt;= c and b &lt;= d.</entry>
</row>
</tbody>
</tgroup>
</table>
<para>
(Before PostgreSQL 8.2, the containment operators @&gt; and &lt;@ were
respectively called @ and ~. These names are still available, but are
(Before PostgreSQL 8.2, the containment operators <literal>@&gt;</> and <literal>&lt;@</> were
respectively called <literal>@</> and <literal>~</>. These names are still available, but are
deprecated and will eventually be retired. Notice that the old names
are reversed from the convention formerly followed by the core geometric
datatypes!)
@ -321,10 +311,28 @@ test=> select '6.25 .. 6.50'::seg as "pH";
<para>
The standard B-tree operators are also provided, for example
<programlisting>
[a, b] &lt; [c, d] Less than
[a, b] &gt; [c, d] Greater than
</programlisting>
<informaltable>
<tgroup cols="2">
<thead>
<row>
<entry>Operator</entry>
<entry>Description</entry>
</row>
</thead>
<tbody>
<row>
<entry><literal>[a, b] &lt; [c, d]</literal></entry>
<entry>Less than</entry>
</row>
<row>
<entry><literal>[a, b] &gt; [c, d]</literal></entry>
<entry>Greater than</entry>
</row>
</tbody>
</tgroup>
</informaltable>
These operators do not make a lot of sense for any practical
purpose but sorting. These operators first compare (a) to (c),
@ -347,12 +355,12 @@ test=> select '6.25 .. 6.50'::seg as "pH";
for the boundaries. For example, it adds an extra digit to the lower
boundary if the resulting interval includes a power of ten:
<programlisting>
<screen>
postgres=> select '10(+-)1'::seg as seg;
seg
---------
9.0 .. 11 -- should be: 9 .. 11
</programlisting>
</screen>
</para>
<para>

104
doc/src/sgml/sql.sgml
View File

@ -1,4 +1,4 @@
<!-- $PostgreSQL: pgsql/doc/src/sgml/sql.sgml,v 1.48 2009/04/27 16:27:36 momjian Exp $ -->
<!-- $PostgreSQL: pgsql/doc/src/sgml/sql.sgml,v 1.49 2010/07/29 19:34:40 petere Exp $ -->
<chapter id="sql-intro">
<title>SQL</title>
@ -151,7 +151,7 @@
<example>
<title id="supplier-fig">The Suppliers and Parts Database</title>
<programlisting>
<screen>
SUPPLIER: SELLS:
SNO | SNAME | CITY SNO | PNO
----+---------+-------- -----+-----
@ -168,7 +168,7 @@ PART: 4 | 3
2 | Nut | 8
3 | Bolt | 15
4 | Cam | 25
</programlisting>
</screen>
</example>
</para>
@ -530,14 +530,14 @@ attributes are taken from. We often write a relation scheme as
necessary for a join.
Let the following two tables be given:
<programlisting>
<screen>
R: S:
A | B | C C | D | E
---+---+--- ---+---+---
1 | 2 | 3 3 | a | b
4 | 5 | 6 6 | c | d
7 | 8 | 9
</programlisting>
</screen>
</para>
</example>
@ -546,7 +546,7 @@ R: S:
<classname>R</classname> &times; <classname>S</classname> and
get:
<programlisting>
<screen>
R x S:
A | B | R.C | S.C | D | E
---+---+-----+-----+---+---
@ -556,7 +556,7 @@ R x S:
4 | 5 | 6 | 6 | c | d
7 | 8 | 9 | 3 | a | b
7 | 8 | 9 | 6 | c | d
</programlisting>
</screen>
</para>
<para>
@ -564,12 +564,12 @@ R x S:
&sigma;<subscript>R.C=S.C</subscript>(R &times; S)
we get:
<programlisting>
<screen>
A | B | R.C | S.C | D | E
---+---+-----+-----+---+---
1 | 2 | 3 | 3 | a | b
4 | 5 | 6 | 6 | c | d
</programlisting>
</screen>
</para>
<para>
@ -579,12 +579,12 @@ R x S:
&pi;<subscript>R.A,R.B,R.C,S.D,S.E</subscript>(&sigma;<subscript>R.C=S.C</subscript>(R &times; S))
and get:
<programlisting>
<screen>
A | B | C | D | E
---+---+---+---+---
1 | 2 | 3 | a | b
4 | 5 | 6 | c | d
</programlisting>
</screen>
</para>
</listitem>
@ -615,7 +615,7 @@ t<subscript>r</subscript>(A,B)=t&and;t<subscript>r</subscript>(C,D)=t<subscript>
<para id="divide-example">
Given the following tables
<programlisting>
<screen>
R: S:
A | B | C | D C | D
---+---+---+--- ---+---
@ -625,17 +625,17 @@ R: S:
e | d | c | d
e | d | e | f
a | b | d | e
</programlisting>
</screen>
R &divide; S
is derived as
<programlisting>
<screen>
A | B
---+---
a | b
e | d
</programlisting>
</screen>
</para>
</listitem>
</itemizedlist>
@ -670,12 +670,12 @@ R: S:
(<xref linkend="supplier-fig" endterm="supplier-fig">)
we will obtain the following result:
<programlisting>
<screen>
SNAME
-------
Smith
Adams
</programlisting>
</screen>
</para>
</example>
</sect2>
@ -893,12 +893,12 @@ SELECT * FROM PART
and get the table:
<programlisting>
<screen>
PNO | PNAME | PRICE
-----+---------+--------
3 | Bolt | 15
4 | Cam | 25
</programlisting>
</screen>
</para>
<para>
@ -915,12 +915,12 @@ SELECT PNAME, PRICE
In this case the result is:
<programlisting>
<screen>
PNAME | PRICE
--------+--------
Bolt | 15
Cam | 25
</programlisting>
</screen>
Note that the <acronym>SQL</acronym> <command>SELECT</command>
corresponds to the <quote>projection</quote> in relational algebra
@ -941,11 +941,11 @@ SELECT PNAME, PRICE
will lead to the result:
<programlisting>
<screen>
PNAME | PRICE
--------+--------
Bolt | 15
</programlisting>
</screen>
</para>
<para>
@ -961,13 +961,13 @@ SELECT PNAME, PRICE * 2 AS DOUBLE
and we get:
<programlisting>
<screen>
PNAME | DOUBLE
--------+---------
Screw | 20
Nut | 16
Bolt | 30
</programlisting>
</screen>
Note that the word DOUBLE after the keyword AS is the new title of the
second column. This technique can be used for every element of the
@ -1001,7 +1001,7 @@ SELECT S.SNAME, P.PNAME
and get the following table as a result:
<programlisting>
<screen>
SNAME | PNAME
-------+-------
Smith | Screw
@ -1012,7 +1012,7 @@ SELECT S.SNAME, P.PNAME
Blake | Nut
Blake | Bolt
Blake | Cam
</programlisting>
</screen>
</para>
<para>
@ -1035,12 +1035,12 @@ SELECT S.SNAME, P.PNAME
<para>
Another way to perform joins is to use the SQL JOIN syntax as follows:
<programlisting>
select sname, pname from supplier
SELECT sname, pname from supplier
JOIN sells USING (sno)
JOIN part USING (pno);
</programlisting>
giving again:
<programlisting>
<screen>
sname | pname
-------+-------
Smith | Screw
@ -1052,7 +1052,7 @@ select sname, pname from supplier
Jones | Cam
Blake | Cam
(8 rows)
</programlisting>
</screen>
</para>
<para>
@ -1276,11 +1276,11 @@ SELECT AVG(PRICE) AS AVG_PRICE
<para>
The result is:
<programlisting>
<screen>
AVG_PRICE
-----------
14.5
</programlisting>
</screen>
</para>
<para>
@ -1294,11 +1294,11 @@ SELECT COUNT(PNO)
and get:
<programlisting>
<screen>
COUNT
-------
4
</programlisting>
</screen>
</para>
</example>
@ -1344,14 +1344,14 @@ SELECT S.SNO, S.SNAME, COUNT(SE.PNO)
and get:
<programlisting>
<screen>
SNO | SNAME | COUNT
-----+-------+-------
1 | Smith | 2
2 | Jones | 1
3 | Adams | 2
4 | Blake | 3
</programlisting>
</screen>
</para>
<para>
@ -1359,7 +1359,7 @@ SELECT S.SNO, S.SNAME, COUNT(SE.PNO)
First the join of the
tables SUPPLIER and SELLS is derived:
<programlisting>
<screen>
S.SNO | S.SNAME | SE.PNO
-------+---------+--------
1 | Smith | 1
@ -1370,14 +1370,14 @@ SELECT S.SNO, S.SNAME, COUNT(SE.PNO)
4 | Blake | 2
4 | Blake | 3
4 | Blake | 4
</programlisting>
</screen>
</para>
<para>
Next we partition the tuples into groups by putting all tuples
together that agree on both attributes S.SNO and S.SNAME:
<programlisting>
<screen>
S.SNO | S.SNAME | SE.PNO
-------+---------+--------
1 | Smith | 1
@ -1391,7 +1391,7 @@ SELECT S.SNO, S.SNAME, COUNT(SE.PNO)
4 | Blake | 2
| 3
| 4
</programlisting>
</screen>
</para>
<para>
@ -1452,13 +1452,13 @@ SELECT S.SNO, S.SNAME, COUNT(SE.PNO)
and get:
<programlisting>
<screen>
SNO | SNAME | COUNT
-----+-------+-------
1 | Smith | 2
3 | Adams | 2
4 | Blake | 3
</programlisting>
</screen>
</para>
</example>
</para>
@ -1492,12 +1492,12 @@ SELECT *
<para>
The result is:
<programlisting>
<screen>
PNO | PNAME | PRICE
-----+---------+--------
3 | Bolt | 15
4 | Cam | 25
</programlisting>
</screen>
</para>
<para>
@ -1600,12 +1600,12 @@ UNION
gives the result:
<programlisting>
<screen>
SNO | SNAME | CITY
-----+-------+--------
2 | Jones | Paris
3 | Adams | Vienna
</programlisting>
</screen>
</para>
<para>
@ -1623,11 +1623,11 @@ INTERSECT
gives the result:
<programlisting>
<screen>
SNO | SNAME | CITY
-----+-------+--------
2 | Jones | Paris
</programlisting>
</screen>
The only tuple returned by both parts of the query is the one having SNO=2.
</para>
@ -1647,12 +1647,12 @@ EXCEPT
gives the result:
<programlisting>
<screen>
SNO | SNAME | CITY
-----+-------+--------
2 | Jones | Paris
3 | Adams | Vienna
</programlisting>
</screen>
</para>
</example>
</para>
@ -1896,11 +1896,11 @@ SELECT * FROM London_Suppliers
which will return the following table:
<programlisting>
<screen>
SNAME | PNAME
-------+-------
Smith | Screw
</programlisting>
</screen>
</para>
<para>

6
doc/src/sgml/sslinfo.sgml
View File

@ -1,4 +1,4 @@
<!-- $PostgreSQL: pgsql/doc/src/sgml/sslinfo.sgml,v 1.4 2010/07/27 23:43:42 rhaas Exp $ -->
<!-- $PostgreSQL: pgsql/doc/src/sgml/sslinfo.sgml,v 1.5 2010/07/29 19:34:40 petere Exp $ -->
<sect1 id="sslinfo">
<title>sslinfo</title>
@ -147,7 +147,7 @@ ssl_client_dn_field(fieldname text) returns text
converted into ASN1 object identifiers using the OpenSSL object
database. The following values are acceptable:
</para>
<programlisting>
<literallayout class="monospaced">
commonName (alias CN)
surname (alias SN)
name
@ -169,7 +169,7 @@ x500UniqueIdentifier
pseudonym
role
emailAddress
</programlisting>
</literallayout>
<para>
All of these fields are optional, except <structfield>commonName</>.
It depends

4
doc/src/sgml/stylesheet.css
View File

@ -1,4 +1,4 @@
/* $PostgreSQL: pgsql/doc/src/sgml/stylesheet.css,v 1.9 2009/08/26 21:18:29 petere Exp $ */
/* $PostgreSQL: pgsql/doc/src/sgml/stylesheet.css,v 1.10 2010/07/29 19:34:40 petere Exp $ */
/* color scheme similar to www.postgresql.org */
@ -85,7 +85,7 @@ DIV.EXAMPLE {
/* miscellaneous */
.SCREEN, .SYNOPSIS, .PROGRAMLISTING {
PRE.LITERALLAYOUT, .SCREEN, .SYNOPSIS, .PROGRAMLISTING {
margin-left: 4ex;
}

70
doc/src/sgml/tablefunc.sgml
View File

@ -1,4 +1,4 @@
<!-- $PostgreSQL: pgsql/doc/src/sgml/tablefunc.sgml,v 1.4 2007/12/06 04:12:10 tgl Exp $ -->
<!-- $PostgreSQL: pgsql/doc/src/sgml/tablefunc.sgml,v 1.5 2010/07/29 19:34:40 petere Exp $ -->
<sect1 id="tablefunc">
<title>tablefunc</title>
@ -94,9 +94,9 @@
<sect3>
<title><function>normal_rand</function></title>
<programlisting>
<synopsis>
normal_rand(int numvals, float8 mean, float8 stddev) returns setof float8
</programlisting>
</synopsis>
<para>
<function>normal_rand</> produces a set of normally distributed random
@ -115,7 +115,7 @@ normal_rand(int numvals, float8 mean, float8 stddev) returns setof float8
standard deviation of 3:
</para>
<programlisting>
<screen>
test=# SELECT * FROM normal_rand(1000, 5, 3);
normal_rand
----------------------
@ -131,16 +131,16 @@ test=# SELECT * FROM normal_rand(1000, 5, 3);
9.71308014517282
2.49639286969028
(1000 rows)
</programlisting>
</screen>
</sect3>
<sect3>
<title><function>crosstab(text)</function></title>
<programlisting>
<synopsis>
crosstab(text sql)
crosstab(text sql, int N)
</programlisting>
</synopsis>
<para>
The <function>crosstab</> function is used to produce <quote>pivot</>
@ -180,8 +180,6 @@ row2 val21 val22 val23 ...
<para>
For example, the provided query might produce a set something like:
</para>
<programlisting>
row_name cat value
----------+-------+-------
@ -194,29 +192,25 @@ row2 val21 val22 val23 ...
row2 cat3 val7
row2 cat4 val8
</programlisting>
</para>
<para>
The <function>crosstab</> function is declared to return <type>setof
record</type>, so the actual names and types of the output columns must be
defined in the <literal>FROM</> clause of the calling <command>SELECT</>
statement, for example:
</para>
<programlisting>
SELECT * FROM crosstab('...') AS ct(row_name text, category_1 text, category_2 text);
</programlisting>
<para>
This example produces a set something like:
</para>
<programlisting>
&lt;== value columns ==&gt;
row_name category_1 category_2
---------+------------+------------
----------+------------+------------
row1 val1 val2
row2 val5 val6
</programlisting>
</para>
<para>
The <literal>FROM</> clause must define the output as one
@ -250,8 +244,6 @@ row_name category_1 category_2
<para>
Here is a complete example:
</para>
<programlisting>
CREATE TABLE ct(id SERIAL, rowid TEXT, attribute TEXT, value TEXT);
INSERT INTO ct(rowid, attribute, value) VALUES('test1','att1','val1');
@ -277,6 +269,7 @@ AS ct(row_name text, category_1 text, category_2 text, category_3 text);
test2 | val6 | val7 |
(2 rows)
</programlisting>
</para>
<para>
You can avoid always having to write out a <literal>FROM</> clause to
@ -291,9 +284,9 @@ AS ct(row_name text, category_1 text, category_2 text, category_3 text);
<sect3>
<title><function>crosstab<replaceable>N</>(text)</function></title>
<programlisting>
<synopsis>
crosstab<replaceable>N</>(text sql)
</programlisting>
</synopsis>
<para>
The <function>crosstab<replaceable>N</></> functions are examples of how
@ -327,8 +320,6 @@ CREATE TYPE tablefunc_crosstab_N AS (
<para>
For instance, the example given in the previous section would also
work as
</para>
<programlisting>
SELECT *
FROM crosstab3(
@ -337,13 +328,13 @@ FROM crosstab3(
where attribute = ''att2'' or attribute = ''att3''
order by 1,2');
</programlisting>
</para>
<para>
These functions are provided mostly for illustration purposes. You
can create your own return types and functions based on the
underlying <function>crosstab()</> function. There are two ways
to do it:
</para>
<itemizedlist>
<listitem>
@ -355,8 +346,6 @@ FROM crosstab3(
<function>crosstab</> C function. For example, if your source data
produces row names that are <type>text</>, and values that are
<type>float8</>, and you want 5 value columns:
</para>
<programlisting>
CREATE TYPE my_crosstab_float8_5_cols AS (
my_row_name text,
@ -371,16 +360,16 @@ FROM crosstab3(
RETURNS setof my_crosstab_float8_5_cols
AS '$libdir/tablefunc','crosstab' LANGUAGE C STABLE STRICT;
</programlisting>
</para>
</listitem>
<listitem>
<para>
Use <literal>OUT</> parameters to define the return type implicitly.
The same example could also be done this way:
</para>
<programlisting>
CREATE OR REPLACE FUNCTION crosstab_float8_5_cols(IN text,
CREATE OR REPLACE FUNCTION crosstab_float8_5_cols(
IN text,
OUT my_row_name text,
OUT my_category_1 float8,
OUT my_category_2 float8,
@ -390,17 +379,19 @@ FROM crosstab3(
RETURNS setof record
AS '$libdir/tablefunc','crosstab' LANGUAGE C STABLE STRICT;
</programlisting>
</para>
</listitem>
</itemizedlist>
</para>
</sect3>
<sect3>
<title><function>crosstab(text, text)</function></title>
<programlisting>
<synopsis>
crosstab(text source_sql, text category_sql)
</programlisting>
</synopsis>
<para>
The main limitation of the single-parameter form of <function>crosstab</>
@ -432,7 +423,6 @@ crosstab(text source_sql, text category_sql)
<para>
For example, <parameter>source_sql</parameter> might produce a set
something like:
</para>
<programlisting>
SELECT row_name, extra_col, cat, value FROM foo ORDER BY 1;
@ -446,6 +436,7 @@ crosstab(text source_sql, text category_sql)
row2 extra2 cat3 val7
row2 extra2 cat4 val8
</programlisting>
</para>
<para>
<parameter>category_sql</parameter> is a SQL statement that produces
@ -453,7 +444,6 @@ crosstab(text source_sql, text category_sql)
It must produce at least one row, or an error will be generated.
Also, it must not produce duplicate values, or an error will be
generated. <parameter>category_sql</parameter> might be something like:
</para>
<programlisting>
SELECT DISTINCT cat FROM foo ORDER BY 1;
@ -464,23 +454,22 @@ SELECT DISTINCT cat FROM foo ORDER BY 1;
cat3
cat4
</programlisting>
</para>
<para>
The <function>crosstab</> function is declared to return <type>setof
record</type>, so the actual names and types of the output columns must be
defined in the <literal>FROM</> clause of the calling <command>SELECT</>
statement, for example:
</para>
<programlisting>
SELECT * FROM crosstab('...', '...')
AS ct(row_name text, extra text, cat1 text, cat2 text, cat3 text, cat4 text);
</programlisting>
</para>
<para>
This will produce a result something like:
</para>
<programlisting>
&lt;== value columns ==&gt;
row_name extra cat1 cat2 cat3 cat4
@ -488,6 +477,7 @@ SELECT DISTINCT cat FROM foo ORDER BY 1;
row1 extra1 val1 val2 val4
row2 extra2 val5 val6 val7 val8
</programlisting>
</para>
<para>
The <literal>FROM</> clause must define the proper number of output
@ -527,8 +517,6 @@ SELECT DISTINCT cat FROM foo ORDER BY 1;
<para>
Here are two complete examples:
</para>
<programlisting>
create table sales(year int, month int, qty int);
insert into sales values(2007, 1, 1000);
@ -593,6 +581,7 @@ AS
test2 | Sun Mar 02 00:00:00 2003 | 53 | FAIL | Sat Mar 01 00:00:00 2003 | 3.1234
(2 rows)
</programlisting>
</para>
<para>
You can create predefined functions to avoid having to write out
@ -606,11 +595,11 @@ AS
<sect3>
<title><function>connectby</function></title>
<programlisting>
<synopsis>
connectby(text relname, text keyid_fld, text parent_keyid_fld
[, text orderby_fld ], text start_with, int max_depth
[, text branch_delim ])
</programlisting>
</synopsis>
<para>
The <function>connectby</> function produces a display of hierarchical
@ -731,8 +720,6 @@ connectby(text relname, text keyid_fld, text parent_keyid_fld
<para>
Here is an example:
</para>
<programlisting>
CREATE TABLE connectby_tree(keyid text, parent_keyid text, pos int);
@ -798,6 +785,7 @@ SELECT * FROM connectby('connectby_tree', 'keyid', 'parent_keyid', 'pos', 'row2'
row8 | row6 | 3 | 6
(6 rows)
</programlisting>
</para>
</sect3>
</sect2>

220
doc/src/sgml/textsearch.sgml
View File

@ -1,4 +1,4 @@
<!-- $PostgreSQL: pgsql/doc/src/sgml/textsearch.sgml,v 1.56 2010/04/03 07:22:56 petere Exp $ -->
<!-- $PostgreSQL: pgsql/doc/src/sgml/textsearch.sgml,v 1.57 2010/07/29 19:34:40 petere Exp $ -->
<chapter id="textsearch">
<title>Full Text Search</title>
@ -625,12 +625,12 @@ LIMIT 10;
text search configuration.
Here is a simple example:
<programlisting>
<screen>
SELECT to_tsvector('english', 'a fat cat sat on a mat - it ate a fat rats');
to_tsvector
-----------------------------------------------------
'ate':9 'cat':3 'fat':2,11 'mat':7 'rat':12 'sat':4
</programlisting>
</screen>
</para>
<para>
@ -738,32 +738,32 @@ UPDATE tt SET ti =
the specified or default configuration, and discards any tokens that are
stop words according to the configuration. For example:
<programlisting>
<screen>
SELECT to_tsquery('english', 'The &amp; Fat &amp; Rats');
to_tsquery
---------------
'fat' &amp; 'rat'
</programlisting>
</screen>
As in basic <type>tsquery</> input, weight(s) can be attached to each
lexeme to restrict it to match only <type>tsvector</> lexemes of those
weight(s). For example:
<programlisting>
<screen>
SELECT to_tsquery('english', 'Fat | Rats:AB');
to_tsquery
------------------
'fat' | 'rat':AB
</programlisting>
</screen>
Also, <literal>*</> can be attached to a lexeme to specify prefix matching:
<programlisting>
<screen>
SELECT to_tsquery('supern:*A &amp; star:A*B');
to_tsquery
--------------------------
'supern':*A &amp; 'star':*AB
</programlisting>
</screen>
Such a lexeme will match any word in a <type>tsvector</> that begins
with the given string.
@ -776,12 +776,12 @@ SELECT to_tsquery('supern:*A &amp; star:A*B');
In the example below, a thesaurus contains the rule <literal>supernovae
stars : sn</literal>:
<programlisting>
<screen>
SELECT to_tsquery('''supernovae stars'' &amp; !crab');
to_tsquery
---------------
'sn' &amp; !'crab'
</programlisting>
</screen>
Without quotes, <function>to_tsquery</function> will generate a syntax
error for tokens that are not separated by an AND or OR operator.
@ -806,23 +806,23 @@ SELECT to_tsquery('''supernovae stars'' &amp; !crab');
<para>
Example:
<programlisting>
<screen>
SELECT plainto_tsquery('english', 'The Fat Rats');
plainto_tsquery
-----------------
'fat' &amp; 'rat'
</programlisting>
</screen>
Note that <function>plainto_tsquery</> cannot
recognize Boolean operators, weight labels, or prefix-match labels
in its input:
<programlisting>
<screen>
SELECT plainto_tsquery('english', 'The Fat &amp; Rats:C');
plainto_tsquery
---------------------
'fat' &amp; 'rat' &amp; 'c'
</programlisting>
</screen>
Here, all the input punctuation was discarded as being space symbols.
</para>
@ -913,9 +913,9 @@ SELECT plainto_tsquery('english', 'The Fat &amp; Rats:C');
heavily depending on how they are labeled. The weight arrays specify
how heavily to weigh each category of word, in the order:
<programlisting>
<synopsis>
{D-weight, C-weight, B-weight, A-weight}
</programlisting>
</synopsis>
If no <replaceable class="PARAMETER">weights</replaceable> are provided,
then these defaults are used:
@ -996,7 +996,7 @@ SELECT plainto_tsquery('english', 'The Fat &amp; Rats:C');
<para>
Here is an example that selects only the ten highest-ranked matches:
<programlisting>
<screen>
SELECT title, ts_rank_cd(textsearch, query) AS rank
FROM apod, to_tsquery('neutrino|(dark &amp; matter)') query
WHERE query @@ textsearch
@ -1014,11 +1014,11 @@ LIMIT 10;
Hot Gas and Dark Matter | 1.6123
Ice Fishing for Cosmic Neutrinos | 1.6
Weak Lensing Distorts the Universe | 0.818218
</programlisting>
</screen>
This is the same example using normalized ranking:
<programlisting>
<screen>
SELECT title, ts_rank_cd(textsearch, query, 32 /* rank/(rank+1) */ ) AS rank
FROM apod, to_tsquery('neutrino|(dark &amp; matter)') query
WHERE query @@ textsearch
@ -1036,7 +1036,7 @@ LIMIT 10;
Hot Gas and Dark Matter | 0.617195790024749
Ice Fishing for Cosmic Neutrinos | 0.615384618911517
Weak Lensing Distorts the Universe | 0.450010798361481
</programlisting>
</screen>
</para>
<para>
@ -1148,7 +1148,7 @@ MaxFragments=0, FragmentDelimiter=" ... "
<para>
For example:
<programlisting>
<screen>
SELECT ts_headline('english',
'The most common type of search
is to find all documents containing given query terms
@ -1173,7 +1173,7 @@ query.',
containing given &lt;query&gt; terms
and return them in order of their &lt;similarity&gt; to the
&lt;query&gt;.
</programlisting>
</screen>
</para>
<para>
@ -1417,7 +1417,7 @@ FROM (SELECT id, body, q, ts_rank_cd(ti, q) AS rank
(returns &gt; 0), or contains only stop words (returns 0).
Examples:
<programlisting>
<screen>
SELECT numnode(plainto_tsquery('the any'));
NOTICE: query contains only stopword(s) or doesn't contain lexeme(s), ignored
numnode
@ -1428,7 +1428,7 @@ SELECT numnode('foo &amp; bar'::tsquery);
numnode
---------
3
</programlisting>
</screen>
</para>
</listitem>
</varlistentry>
@ -1452,12 +1452,12 @@ SELECT numnode('foo &amp; bar'::tsquery);
unindexable queries, for example those containing only stop words
or only negated terms. For example:
<programlisting>
<screen>
SELECT querytree(to_tsquery('!defined'));
querytree
-----------
</programlisting>
</screen>
</para>
</listitem>
</varlistentry>
@ -1508,12 +1508,12 @@ SELECT querytree(to_tsquery('!defined'));
wherever it appears in <replaceable
class="PARAMETER">query</replaceable>. For example:
<programlisting>
<screen>
SELECT ts_rewrite('a &amp; b'::tsquery, 'a'::tsquery, 'c'::tsquery);
ts_rewrite
------------
'b' &amp; 'c'
</programlisting>
</screen>
</para>
</listitem>
</varlistentry>
@ -1536,7 +1536,7 @@ SELECT ts_rewrite('a &amp; b'::tsquery, 'a'::tsquery, 'c'::tsquery);
(the target) are replaced by the second column value (the substitute)
within the current <replaceable>query</> value. For example:
<programlisting>
<screen>
CREATE TABLE aliases (t tsquery PRIMARY KEY, s tsquery);
INSERT INTO aliases VALUES('a', 'c');
@ -1544,7 +1544,7 @@ SELECT ts_rewrite('a &amp; b'::tsquery, 'SELECT t,s FROM aliases');
ts_rewrite
------------
'b' &amp; 'c'
</programlisting>
</screen>
</para>
<para>
@ -1561,7 +1561,7 @@ SELECT ts_rewrite('a &amp; b'::tsquery, 'SELECT t,s FROM aliases');
Let's consider a real-life astronomical example. We'll expand query
<literal>supernovae</literal> using table-driven rewriting rules:
<programlisting>
<screen>
CREATE TABLE aliases (t tsquery primary key, s tsquery);
INSERT INTO aliases VALUES(to_tsquery('supernovae'), to_tsquery('supernovae|sn'));
@ -1569,11 +1569,11 @@ SELECT ts_rewrite(to_tsquery('supernovae &amp; crab'), 'SELECT * FROM aliases');
ts_rewrite
---------------------------------
'crab' &amp; ( 'supernova' | 'sn' )
</programlisting>
</screen>
We can change the rewriting rules just by updating the table:
<programlisting>
<screen>
UPDATE aliases
SET s = to_tsquery('supernovae|sn &amp; !nebulae')
WHERE t = to_tsquery('supernovae');
@ -1582,7 +1582,7 @@ SELECT ts_rewrite(to_tsquery('supernovae &amp; crab'), 'SELECT * FROM aliases');
ts_rewrite
---------------------------------------------
'crab' &amp; ( 'supernova' | 'sn' &amp; !'nebula' )
</programlisting>
</screen>
</para>
<para>
@ -1592,13 +1592,13 @@ SELECT ts_rewrite(to_tsquery('supernovae &amp; crab'), 'SELECT * FROM aliases');
type. In the example below, we select only those rules which might match
the original query:
<programlisting>
<screen>
SELECT ts_rewrite('a &amp; b'::tsquery,
'SELECT t,s FROM aliases WHERE ''a &amp; b''::tsquery @&gt; t');
ts_rewrite
------------
'b' &amp; 'c'
</programlisting>
</screen>
</para>
</sect3>
@ -1632,7 +1632,7 @@ SELECT ts_rewrite('a &amp; b'::tsquery,
parameters specified in the <command>CREATE TRIGGER</> command.
An example of their use is:
<programlisting>
<screen>
CREATE TABLE messages (
title text,
body text,
@ -1654,7 +1654,7 @@ SELECT title, body FROM messages WHERE tsv @@ to_tsquery('title &amp; body');
title | body
------------+-----------------------
title here | the body text is here
</programlisting>
</screen>
Having created this trigger, any change in <structfield>title</> or
<structfield>body</> will automatically be reflected into
@ -1957,7 +1957,7 @@ LIMIT 10;
piece of text. As an example, a hyphenated word will be reported both
as the entire word and as each component:
<programlisting>
<screen>
SELECT alias, description, token FROM ts_debug('foo-bar-beta1');
alias | description | token
-----------------+------------------------------------------+---------------
@ -1967,13 +1967,13 @@ SELECT alias, description, token FROM ts_debug('foo-bar-beta1');
hword_asciipart | Hyphenated word part, all ASCII | bar
blank | Space symbols | -
hword_numpart | Hyphenated word part, letters and digits | beta1
</programlisting>
</screen>
This behavior is desirable since it allows searches to work for both
the whole compound word and for components. Here is another
instructive example:
<programlisting>
<screen>
SELECT alias, description, token FROM ts_debug('http://example.com/stuff/index.html');
alias | description | token
----------+---------------+------------------------------
@ -1981,7 +1981,7 @@ SELECT alias, description, token FROM ts_debug('http://example.com/stuff/index.h
url | URL | example.com/stuff/index.html
host | Host | example.com
url_path | URL path | /stuff/index.html
</programlisting>
</screen>
</para>
</sect1>
@ -2123,17 +2123,17 @@ ALTER TEXT SEARCH CONFIGURATION astro_en
useless to store them in an index. However, stop words do affect the
positions in <type>tsvector</type>, which in turn affect ranking:
<programlisting>
<screen>
SELECT to_tsvector('english','in the list of stop words');
to_tsvector
----------------------------
'list':3 'stop':5 'word':6
</programlisting>
</screen>
The missing positions 1,2,4 are because of stop words. Ranks
calculated for documents with and without stop words are quite different:
<programlisting>
<screen>
SELECT ts_rank_cd (to_tsvector('english','in the list of stop words'), to_tsquery('list &amp; stop'));
ts_rank_cd
------------
@ -2143,7 +2143,7 @@ SELECT ts_rank_cd (to_tsvector('english','list stop words'), to_tsquery('list &a
ts_rank_cd
------------
0.1
</programlisting>
</screen>
</para>
@ -2197,7 +2197,7 @@ CREATE TEXT SEARCH DICTIONARY public.simple_dict (
<para>
Now we can test our dictionary:
<programlisting>
<screen>
SELECT ts_lexize('public.simple_dict','YeS');
ts_lexize
-----------
@ -2207,7 +2207,7 @@ SELECT ts_lexize('public.simple_dict','The');
ts_lexize
-----------
{}
</programlisting>
</screen>
</para>
<para>
@ -2216,7 +2216,7 @@ SELECT ts_lexize('public.simple_dict','The');
selected by setting the dictionary's <literal>Accept</> parameter to
<literal>false</>. Continuing the example:
<programlisting>
<screen>
ALTER TEXT SEARCH DICTIONARY public.simple_dict ( Accept = false );
SELECT ts_lexize('public.simple_dict','YeS');
@ -2228,7 +2228,7 @@ SELECT ts_lexize('public.simple_dict','The');
ts_lexize
-----------
{}
</programlisting>
</screen>
</para>
<para>
@ -2274,7 +2274,7 @@ SELECT ts_lexize('public.simple_dict','The');
synonym dictionary and put it before the <literal>english_stem</>
dictionary. For example:
<programlisting>
<screen>
SELECT * FROM ts_debug('english', 'Paris');
alias | description | token | dictionaries | dictionary | lexemes
-----------+-----------------+-------+----------------+--------------+---------
@ -2293,7 +2293,7 @@ SELECT * FROM ts_debug('english', 'Paris');
alias | description | token | dictionaries | dictionary | lexemes
-----------+-----------------+-------+---------------------------+------------+---------
asciiword | Word, all ASCII | Paris | {my_synonym,english_stem} | my_synonym | {paris}
</programlisting>
</screen>
</para>
<para>
@ -2306,7 +2306,6 @@ SELECT * FROM ts_debug('english', 'Paris');
<para>
Contents of <filename>$SHAREDIR/tsearch_data/synonym_sample.syn</>:
</para>
<programlisting>
postgres pgsql
postgresql pgsql
@ -2314,44 +2313,45 @@ postgre pgsql
gogle googl
indices index*
</programlisting>
</para>
<para>
Results:
</para>
<programlisting>
=# create text search dictionary syn( template=synonym,synonyms='synonym_sample');
=# select ts_lexize('syn','indices');
<screen>
=# CREATE TEXT SEARCH DICTIONARY syn (template=synonym, synonyms='synonym_sample');
=# SELECT ts_lexize('syn','indices');
ts_lexize
-----------
{index}
(1 row)
=# create text search configuration tst ( copy=simple);
=# alter text search configuration tst alter mapping for asciiword with syn;
=# select to_tsquery('tst','indices');
=# CREATE TEXT SEARCH CONFIGURATION tst (copy=simple);
=# ALTER TEXT SEARCH CONFIGURATION tst ALTER MAPPING FOR asciiword WITH syn;
=# SELECT to_tsquery('tst','indices');
to_tsquery
------------
'index':*
(1 row)
=# select 'indexes are very useful'::tsvector;
=# SELECT 'indexes are very useful'::tsvector;
tsvector
---------------------------------
'are' 'indexes' 'useful' 'very'
(1 row)
=# select 'indexes are very useful'::tsvector @@ to_tsquery('tst','indices');
=# SELECT 'indexes are very useful'::tsvector @@ to_tsquery('tst','indices');
?column?
----------
t
(1 row)
=# select to_tsvector('tst','indices');
=# SELECT to_tsvector('tst','indices');
to_tsvector
-------------
'index':1
(1 row)
</programlisting>
</screen>
</para>
<para>
The only parameter required by the <literal>synonym</> template is
@ -2544,7 +2544,7 @@ ALTER TEXT SEARCH CONFIGURATION russian
<function>plainto_tsquery</function> and <function>to_tsvector</function>
which will break their input strings into multiple tokens:
<programlisting>
<screen>
SELECT plainto_tsquery('supernova star');
plainto_tsquery
-----------------
@ -2554,17 +2554,17 @@ SELECT to_tsvector('supernova star');
to_tsvector
-------------
'sn':1
</programlisting>
</screen>
In principle, one can use <function>to_tsquery</function> if you quote
the argument:
<programlisting>
<screen>
SELECT to_tsquery('''supernova star''');
to_tsquery
------------
'sn'
</programlisting>
</screen>
Notice that <literal>supernova star</literal> matches <literal>supernovae
stars</literal> in <literal>thesaurus_astro</literal> because we specified
@ -2576,14 +2576,14 @@ SELECT to_tsquery('''supernova star''');
To index the original phrase as well as the substitute, just include it
in the right-hand part of the definition:
<programlisting>
<screen>
supernovae stars : sn supernovae stars
SELECT plainto_tsquery('supernova star');
plainto_tsquery
-----------------------------
'sn' &amp; 'supernova' &amp; 'star'
</programlisting>
</screen>
</para>
</sect3>
@ -2820,7 +2820,7 @@ version of our software.
The next step is to set the session to use the new configuration, which was
created in the <literal>public</> schema:
<programlisting>
<screen>
=&gt; \dF
List of text search configurations
Schema | Name | Description
@ -2834,7 +2834,7 @@ SHOW default_text_search_config;
default_text_search_config
----------------------------
public.pg
</programlisting>
</screen>
</para>
</sect1>
@ -2929,7 +2929,7 @@ SHOW default_text_search_config;
<para>
Here is a simple example:
<programlisting>
<screen>
SELECT * FROM ts_debug('english','a fat cat sat on a mat - it ate a fat rats');
alias | description | token | dictionaries | dictionary | lexemes
-----------+-----------------+-------+----------------+--------------+---------
@ -2957,7 +2957,7 @@ SELECT * FROM ts_debug('english','a fat cat sat on a mat - it ate a fat rats');
asciiword | Word, all ASCII | fat | {english_stem} | english_stem | {fat}
blank | Space symbols | | {} | |
asciiword | Word, all ASCII | rats | {english_stem} | english_stem | {rat}
</programlisting>
</screen>
</para>
<para>
@ -2980,7 +2980,7 @@ ALTER TEXT SEARCH CONFIGURATION public.english
ALTER MAPPING FOR asciiword WITH english_ispell, english_stem;
</programlisting>
<programlisting>
<screen>
SELECT * FROM ts_debug('public.english','The Brightest supernovaes');
alias | description | token | dictionaries | dictionary | lexemes
-----------+-----------------+-------------+-------------------------------+----------------+-------------
@ -2989,7 +2989,7 @@ SELECT * FROM ts_debug('public.english','The Brightest supernovaes');
asciiword | Word, all ASCII | Brightest | {english_ispell,english_stem} | english_ispell | {bright}
blank | Space symbols | | {} | |
asciiword | Word, all ASCII | supernovaes | {english_ispell,english_stem} | english_stem | {supernova}
</programlisting>
</screen>
<para>
In this example, the word <literal>Brightest</> was recognized by the
@ -3018,7 +3018,7 @@ SELECT * FROM ts_debug('public.english','The Brightest supernovaes');
You can reduce the width of the output by explicitly specifying which columns
you want to see:
<programlisting>
<screen>
SELECT alias, token, dictionary, lexemes
FROM ts_debug('public.english','The Brightest supernovaes');
alias | token | dictionary | lexemes
@ -3028,7 +3028,7 @@ FROM ts_debug('public.english','The Brightest supernovaes');
asciiword | Brightest | english_ispell | {bright}
blank | | |
asciiword | supernovaes | english_stem | {supernova}
</programlisting>
</screen>
</para>
</sect2>
@ -3058,7 +3058,7 @@ FROM ts_debug('public.english','The Brightest supernovaes');
assigned token type and a <varname>token</varname> which is the text of the
token. For example:
<programlisting>
<screen>
SELECT * FROM ts_parse('default', '123 - a number');
tokid | token
-------+--------
@ -3068,7 +3068,7 @@ SELECT * FROM ts_parse('default', '123 - a number');
1 | a
12 |
1 | number
</programlisting>
</screen>
</para>
<indexterm>
@ -3090,7 +3090,7 @@ SELECT * FROM ts_parse('default', '123 - a number');
in configuration commands, and a short <varname>description</varname>. For
example:
<programlisting>
<screen>
SELECT * FROM ts_token_type('default');
tokid | alias | description
-------+-----------------+------------------------------------------
@ -3117,7 +3117,7 @@ SELECT * FROM ts_token_type('default');
21 | int | Signed integer
22 | uint | Unsigned integer
23 | entity | XML entity
</programlisting>
</screen>
</para>
</sect2>
@ -3148,7 +3148,7 @@ SELECT * FROM ts_token_type('default');
<para>
Examples:
<programlisting>
<screen>
SELECT ts_lexize('english_stem', 'stars');
ts_lexize
-----------
@ -3158,7 +3158,7 @@ SELECT ts_lexize('english_stem', 'a');
ts_lexize
-----------
{}
</programlisting>
</screen>
</para>
<note>
@ -3167,12 +3167,12 @@ SELECT ts_lexize('english_stem', 'a');
<emphasis>token</emphasis>, not text. Here is a case
where this can be confusing:
<programlisting>
<screen>
SELECT ts_lexize('thesaurus_astro','supernovae stars') is null;
?column?
----------
t
</programlisting>
</screen>
The thesaurus dictionary <literal>thesaurus_astro</literal> does know the
phrase <literal>supernovae stars</literal>, but <function>ts_lexize</>
@ -3180,12 +3180,12 @@ SELECT ts_lexize('thesaurus_astro','supernovae stars') is null;
token. Use <function>plainto_tsquery</> or <function>to_tsvector</> to
test thesaurus dictionaries, for example:
<programlisting>
<screen>
SELECT plainto_tsquery('supernovae stars');
plainto_tsquery
-----------------
'sn'
</programlisting>
</screen>
</para>
</note>
@ -3372,39 +3372,33 @@ SELECT plainto_tsquery('supernovae stars');
regular expression and can provide <emphasis>separate</emphasis> patterns
for the schema and object names. The following examples illustrate this:
<programlisting>
<screen>
=&gt; \dF *fulltext*
List of text search configurations
Schema | Name | Description
--------+--------------+-------------
public | fulltext_cfg |
</programlisting>
</screen>
<programlisting>
<screen>
=&gt; \dF *.fulltext*
List of text search configurations
Schema | Name | Description
----------+----------------------------
fulltext | fulltext_cfg |
public | fulltext_cfg |
</programlisting>
</screen>
The available commands are:
</para>
<variablelist>
<varlistentry>
<term><synopsis>\dF<optional>+</optional> <optional>PATTERN</optional></synopsis></term>
<listitem>
<para>
List text search configurations (add <literal>+</> for more detail).
</para>
<para>
<programlisting>
<screen>
=&gt; \dF russian
List of text search configurations
Schema | Name | Description
@ -3435,7 +3429,7 @@ Parser: "pg_catalog.default"
url_path | simple
version | simple
word | russian_stem
</programlisting>
</screen>
</para>
</listitem>
</varlistentry>
@ -3445,10 +3439,7 @@ Parser: "pg_catalog.default"
<listitem>
<para>
List text search dictionaries (add <literal>+</> for more detail).
</para>
<para>
<programlisting>
<screen>
=&gt; \dFd
List of text search dictionaries
Schema | Name | Description
@ -3469,21 +3460,17 @@ Parser: "pg_catalog.default"
pg_catalog | spanish_stem | snowball stemmer for spanish language
pg_catalog | swedish_stem | snowball stemmer for swedish language
pg_catalog | turkish_stem | snowball stemmer for turkish language
</programlisting>
</screen>
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><synopsis>\dFp<optional>+</optional> <optional>PATTERN</optional></synopsis></term>
<listitem>
<para>
List text search parsers (add <literal>+</> for more detail).
</para>
<para>
<programlisting>
<screen>
=&gt; \dFp
List of text search parsers
Schema | Name | Description
@ -3526,21 +3513,17 @@ Parser: "pg_catalog.default"
version | Version number
word | Word, all letters
(23 rows)
</programlisting>
</screen>
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><synopsis>\dFt<optional>+</optional> <optional>PATTERN</optional></synopsis></term>
<listitem>
<para>
List text search templates (add <literal>+</> for more detail).
</para>
<para>
<programlisting>
<screen>
=&gt; \dFt
List of text search templates
Schema | Name | Description
@ -3550,11 +3533,10 @@ Parser: "pg_catalog.default"
pg_catalog | snowball | snowball stemmer
pg_catalog | synonym | synonym dictionary: replace word by its synonym
pg_catalog | thesaurus | thesaurus dictionary: phrase by phrase substitution
</programlisting>
</screen>
</para>
</listitem>
</varlistentry>
</variablelist>
</sect1>

3
doc/src/sgml/unaccent.sgml
View File

@ -134,8 +134,7 @@
</indexterm>
<synopsis>
unaccent(<optional><replaceable class="PARAMETER">dictionary</replaceable>,
</optional> <replaceable class="PARAMETER">string</replaceable>)
unaccent(<optional><replaceable class="PARAMETER">dictionary</replaceable>, </optional> <replaceable class="PARAMETER">string</replaceable>)
returns <type>text</type>
</synopsis>

2
doc/src/sgml/uuid-ossp.sgml
View File

@ -1,4 +1,4 @@
<!-- $PostgreSQL: pgsql/doc/src/sgml/uuid-ossp.sgml,v 1.2 2007/12/06 04:12:10 tgl Exp $ -->
<!-- $PostgreSQL: pgsql/doc/src/sgml/uuid-ossp.sgml,v 1.3 2010/07/29 19:34:40 petere Exp $ -->
<sect1 id="uuid-ossp">
<title>uuid-ossp</title>

2
doc/src/sgml/vacuumlo.sgml
View File

@ -1,4 +1,4 @@
<!-- $PostgreSQL: pgsql/doc/src/sgml/vacuumlo.sgml,v 1.4 2009/02/26 16:02:37 petere Exp $ -->
<!-- $PostgreSQL: pgsql/doc/src/sgml/vacuumlo.sgml,v 1.5 2010/07/29 19:34:40 petere Exp $ -->
<sect1 id="vacuumlo">
<title>vacuumlo</title>

2
doc/src/sgml/xaggr.sgml
View File

@ -1,4 +1,4 @@
<!-- $PostgreSQL: pgsql/doc/src/sgml/xaggr.sgml,v 1.40 2010/04/03 07:22:56 petere Exp $ -->
<!-- $PostgreSQL: pgsql/doc/src/sgml/xaggr.sgml,v 1.41 2010/07/29 19:34:40 petere Exp $ -->
<sect1 id="xaggr">
<title>User-Defined Aggregates</title>

2
doc/src/sgml/xfunc.sgml
View File

@ -1,4 +1,4 @@
<!-- $PostgreSQL: pgsql/doc/src/sgml/xfunc.sgml,v 1.151 2010/07/26 20:14:05 petere Exp $ -->
<!-- $PostgreSQL: pgsql/doc/src/sgml/xfunc.sgml,v 1.152 2010/07/29 19:34:40 petere Exp $ -->
<sect1 id="xfunc">
<title>User-Defined Functions</title>

31
doc/src/sgml/xml2.sgml
View File

@ -1,4 +1,4 @@
<!-- $PostgreSQL: pgsql/doc/src/sgml/xml2.sgml,v 1.8 2010/07/27 19:01:16 petere Exp $ -->
<!-- $PostgreSQL: pgsql/doc/src/sgml/xml2.sgml,v 1.9 2010/07/29 19:34:40 petere Exp $ -->
<sect1 id="xml2">
<title>xml2</title>
@ -84,14 +84,12 @@
<para>
This evaluates query on document and wraps the result in XML tags. If
the result is multivalued, the output will look like:
</para>
<literal>
<synopsis>
&lt;toptag&gt;
&lt;itemtag&gt;Value 1 which could be an XML fragment&lt;/itemtag&gt;
&lt;itemtag&gt;Value 2....&lt;/itemtag&gt;
&lt;/toptag&gt;
</literal>
<para>
</synopsis>
If either toptag or itemtag is an empty string, the relevant tag is omitted.
</para>
</entry>
@ -240,8 +238,6 @@
<para>
The function has to be used in a <literal>FROM</> expression, with an
<literal>AS</> clause to specify the output columns; for example
</para>
<programlisting>
SELECT * FROM
xpath_table('article_id',
@ -251,8 +247,6 @@ xpath_table('article_id',
'date_entered > ''2003-01-01'' ')
AS t(article_id integer, author text, page_count integer, title text);
</programlisting>
<para>
The <literal>AS</> clause defines the names and types of the columns in the
output table. The first is the <quote>key</> field and the rest correspond
to the XPath queries.
@ -278,8 +272,6 @@ AS t(article_id integer, author text, page_count integer, title text);
columns by name or join them to other tables. The function produces a
virtual table with which you can perform any operation you wish (e.g.
aggregation, joining, sorting etc). So we could also have:
</para>
<programlisting>
SELECT t.title, p.fullname, p.email
FROM xpath_table('article_id', 'article_xml', 'articles',
@ -289,8 +281,6 @@ FROM xpath_table('article_id', 'article_xml', 'articles',
tblPeopleInfo AS p
WHERE t.author_id = p.person_id;
</programlisting>
<para>
as a more complicated example. Of course, you could wrap all
of this in a view for convenience.
</para>
@ -314,13 +304,11 @@ WHERE t.author_id = p.person_id;
result will appear only on the first row of the result. The solution
to this is to use the key field as part of a join against a simpler
XPath query. As an example:
</para>
<programlisting>
CREATE TABLE test (
id int4 NOT NULL,
xml text,
CONSTRAINT pk PRIMARY KEY (id)
id int PRIMARY KEY,
xml text
);
INSERT INTO test VALUES (1, '&lt;doc num="C1"&gt;
@ -337,7 +325,7 @@ WHERE t.author_id = p.person_id;
xpath_table('id','xml','test',
'/doc/@num|/doc/line/@num|/doc/line/a|/doc/line/b|/doc/line/c',
'true')
AS t(id int4, doc_num varchar(10), line_num varchar(10), val1 int4, val2 int4, val3 int4)
AS t(id int, doc_num varchar(10), line_num varchar(10), val1 int, val2 int, val3 int)
WHERE id = 1 ORDER BY doc_num, line_num
id | doc_num | line_num | val1 | val2 | val3
@ -345,20 +333,20 @@ WHERE t.author_id = p.person_id;
1 | C1 | L1 | 1 | 2 | 3
1 | | L2 | 11 | 22 | 33
</programlisting>
</para>
<para>
To get doc_num on every line, the solution is to use two invocations
of xpath_table and join the results:
</para>
<programlisting>
SELECT t.*,i.doc_num FROM
xpath_table('id', 'xml', 'test',
'/doc/line/@num|/doc/line/a|/doc/line/b|/doc/line/c',
'true')
AS t(id int4, line_num varchar(10), val1 int4, val2 int4, val3 int4),
AS t(id int, line_num varchar(10), val1 int, val2 int, val3 int),
xpath_table('id', 'xml', 'test', '/doc/@num', 'true')
AS i(id int4, doc_num varchar(10))
AS i(id int, doc_num varchar(10))
WHERE i.id=t.id AND i.id=1
ORDER BY doc_num, line_num;
@ -368,6 +356,7 @@ WHERE t.author_id = p.person_id;
1 | L2 | 11 | 22 | 33 | C1
(2 rows)
</programlisting>
</para>
</sect3>
</sect2>