Fri Jun 22 09:15:59 PDT 2007
- Previous message: [Slony1-commit] slony1-engine/tests settings.ik
- Next message: [Slony1-commit] slony1-www/content news.txt
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Update of /home/cvsd/slony1/slony1-engine/doc/adminguide
In directory main.slony.info:/tmp/cvs-serv21239
Modified Files:
firstdb.sgml releasechecklist.sgml slonik_ref.sgml
usingslonik.sgml
Log Message:
Eliminate various references to the now-not-supported TABLE ADD KEY
Slonik command.
Index: releasechecklist.sgml
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/doc/adminguide/releasechecklist.sgml,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** releasechecklist.sgml 16 Mar 2007 17:22:53 -0000 1.9
--- releasechecklist.sgml 22 Jun 2007 16:15:57 -0000 1.10
***************
*** 53,59 ****
<filename>configure.ac</filename></para></listitem>
! <listitem><para>Purge directory <filename>autom4te.cache</filename> so it is not included in the build </para></listitem>
! <listitem><para>Purge out .cvsignore files; this can be done with the command <command> find . -name .cvsignore | xargs rm </command> </para></listitem>
<listitem><para> Run <filename>tools/release_checklist.sh</filename> </para>
--- 53,63 ----
<filename>configure.ac</filename></para></listitem>
! <listitem><para>Purge directory <filename>autom4te.cache</filename> so it is not included in the build </para>
! <para> Does not need to be done by hand - the later <command> make distclean </command> step does this for you. </para>
! </listitem>
! <listitem><para>Purge out .cvsignore files; this can be done with the command <command> find . -name .cvsignore | xargs rm </command> </para>
! <para> Does not need to be done by hand - the later <command> make distclean </command> step does this for you. </para>
! </listitem>
<listitem><para> Run <filename>tools/release_checklist.sh</filename> </para>
***************
*** 96,99 ****
--- 100,106 ----
make all && make clean</command> but that is a somewhat ugly approach.
+ <para> Slightly better may be <command> ./configure && make
+ src/slon/conf-file.c src/slonik/parser.c src/slonik/scan.c </command>
+
</para></listitem>
***************
*** 101,106 ****
previous step(s) are removed.</para>
! <para> <command>make distclean</command> ought to do
! that... </para></listitem>
<listitem><para>Generate HTML tarball, and RTF/PDF, if
--- 108,119 ----
previous step(s) are removed.</para>
! <para> <command>make distclean</command> will do
! that... </para>
!
! <para> Note that <command>make distclean</command> also clears out
! <filename>.cvsignore</filename> files and
! <filename>autom4te.cache</filename>, thus obsoleting some former steps
! that suggested that it was needful to delete them. </para>
! </listitem>
<listitem><para>Generate HTML tarball, and RTF/PDF, if
Index: slonik_ref.sgml
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/doc/adminguide/slonik_ref.sgml,v
retrieving revision 1.70
retrieving revision 1.71
diff -C2 -d -r1.70 -r1.71
*** slonik_ref.sgml 20 Jun 2007 13:49:16 -0000 1.70
--- slonik_ref.sgml 22 Jun 2007 16:15:57 -0000 1.71
***************
*** 223,227 ****
<cmdsynopsis>
<command>CLUSTER NAME = </command>
! <arg><replaceable class="parameter"> 'clustername';</replaceable></arg>
</cmdsynopsis>
</refsynopsisdiv>
--- 223,227 ----
<cmdsynopsis>
<command>CLUSTER NAME = </command>
! <arg><replaceable class="parameter"> clustername;</replaceable></arg>
</cmdsynopsis>
</refsynopsisdiv>
***************
*** 251,255 ****
<refsect1><title>Example</title>
<programlisting>
! CLUSTER NAME = 'testcluster';
</programlisting>
</refsect1>
--- 251,255 ----
<refsect1><title>Example</title>
<programlisting>
! CLUSTER NAME = testcluster;
</programlisting>
</refsect1>
***************
*** 1090,1094 ****
<para> This command was introduced in &slony1; 1.0 </para>
! <para> This command is <emphasis> no longer supported </emphasis>
as of &slony1; version 2.0. In version 2, the various
<quote>catalogue breakages</quote> done in &postgres; versions
--- 1090,1094 ----
<para> This command was introduced in &slony1; 1.0 </para>
! <warning> <para> This command is <emphasis> no longer supported </emphasis>
as of &slony1; version 2.0. In version 2, the various
<quote>catalogue breakages</quote> done in &postgres; versions
***************
*** 1098,1102 ****
thing that prevents <xref linkend="stmtuninstallnode"> from being
comprised of the SQL statement <command>drop schema _ClusterName
! cascade;</command>.</para>
</refsect1>
--- 1098,1102 ----
thing that prevents <xref linkend="stmtuninstallnode"> from being
comprised of the SQL statement <command>drop schema _ClusterName
! cascade;</command>.</para> </warning>
</refsect1>
Index: usingslonik.sgml
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/doc/adminguide/usingslonik.sgml,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** usingslonik.sgml 11 Jun 2007 16:02:50 -0000 1.19
--- usingslonik.sgml 22 Jun 2007 16:15:57 -0000 1.20
***************
*** 112,123 ****
try {
- table add key (node id = 1, fully qualified name =
- 'public.history');
- }
- on error {
- exit 1;
- }
-
- try {
create set (id = 1, origin = 1, comment =
'Set 1 - pgbench tables');
--- 112,115 ----
***************
*** 133,137 ****
set add table (set id = 1, origin = 1,
id = 4, fully qualified name = 'public.history',
! key = serial, comment = 'Table accounts');
}
on error {
--- 125,129 ----
set add table (set id = 1, origin = 1,
id = 4, fully qualified name = 'public.history',
! comment = 'Table accounts');
}
on error {
***************
*** 173,182 ****
$PREAMBLE
try {
- table add key (node id = $origin, fully qualified name =
- 'public.history');
- } on error {
- exit 1;
- }
- try {
create set (id = $mainset, origin = $origin,
comment = 'Set $mainset - pgbench tables');
--- 165,168 ----
***************
*** 192,196 ****
set add table (set id = $mainset, origin = $origin,
id = 4, fully qualified name = 'public.history',
! key = serial, comment = 'Table accounts');
} on error {
exit 1;
--- 178,182 ----
set add table (set id = $mainset, origin = $origin,
id = 4, fully qualified name = 'public.history',
! comment = 'Table accounts');
} on error {
exit 1;
***************
*** 222,231 ****
$PREAMBLE
try {
- table add key (node id = $origin, fully qualified name =
- 'public.history');
- } on error {
- exit 1;
- }
- try {
create set (id = $mainset, origin = $origin,
comment = 'Set $mainset - pgbench tables');
--- 208,211 ----
Index: firstdb.sgml
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/doc/adminguide/firstdb.sgml,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** firstdb.sgml 11 Jun 2007 16:02:50 -0000 1.24
--- firstdb.sgml 22 Jun 2007 16:15:57 -0000 1.25
***************
*** 95,98 ****
--- 95,116 ----
</programlisting>
+ <para> One of the tables created by
+ <application>pgbench</application>, <envar>history</envar>, does not
+ have a primary key. In earlier versions of &slony1;, a &lslonik;
+ command called <xref linkend="stmttableaddkey"> could be used to
+ introduce one. This caused a number of problems, and so this feature
+ has been removed in version 2 of &slony1;. It now
+ <emphasis>requires</emphasis> that there is a suitable candidate
+ primary key. </para>
+
+ <para> The following SQL requests will establish a proper primary key on this table: </para>
+
+ <programlisting>
+ psql -U $PGBENCH_USER -h $HOST1 -d $DBNAME1 -c "begin; alter table
+ history add column id serial; update history set id =
+ nextval('history_id_seq'); alter table history add primary key(id);
+ commit"
+ </programlisting>
+
<para>Because &slony1; depends on the databases having the pl/pgSQL
procedural language installed, we better install it now. It is
***************
*** 230,234 ****
set add table (set id=1, origin=1, id=2, fully qualified name = 'public.branches', comment='branches table');
set add table (set id=1, origin=1, id=3, fully qualified name = 'public.tellers', comment='tellers table');
! set add table (set id=1, origin=1, id=4, fully qualified name = 'public.history', comment='history table', key = serial);
#--
--- 248,252 ----
set add table (set id=1, origin=1, id=2, fully qualified name = 'public.branches', comment='branches table');
set add table (set id=1, origin=1, id=3, fully qualified name = 'public.tellers', comment='tellers table');
! set add table (set id=1, origin=1, id=4, fully qualified name = 'public.history', comment='history table');
#--
- Previous message: [Slony1-commit] slony1-engine/tests settings.ik
- Next message: [Slony1-commit] slony1-www/content news.txt
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
More information about the Slony1-commit mailing list