Changes 1.2.12: - Fixed problem with DDL SCRIPT parser where C-style comments were not being processed properly - Added stored functions and documentation for adding empty tables (notably *partitions*) to replication. Note these functions do no work when not specifically requested. - Added a fairly substantial partitioning test to exercise the new stored functions above. - Backport "listen path" generator function from CVS HEAD (2.0) to 1.2 branch. - Fixed a problem with "EXECUTE SCRIPT" (introduced in remote_worker.c version 1.124.2.13) where moving the relevant code into a subroutine at the end led to losing the "BEGIN; SET TRANSACTION ISOLATION LEVEL SERIALIZABLE;" query that needs to be the first thing run... - Fixing the archive sequence generations (in log shipping). All non-SYNC events must start the local transaction before creating the archive as well, so that the lock on the archive counter table serializes archive creation. - Fixed logging done in local_listener.c - various places, there was no '\n' in some cases, which would lead to entries being folded together. - Fix launch_slons.sh - was not stripping quotes from PID file name - Error handling for "ERROR: could not serialize access due to concurrent update" - Fixes to slonik_build_env script - it wasn't properly handling cases where there was just 1 table or 1 sequence, and had a problem with the -schema option - thanks, Bernd Helmlediff -r1.7 -r1.8 pkgsrc/databases/slony1/Makefile
(adam)
@@ -1,27 +1,27 @@ | @@ -1,27 +1,27 @@ | |||
1 | # $NetBSD: Makefile,v 1.7 2007/04/10 21:59:02 rmind Exp $ | 1 | # $NetBSD: Makefile,v 1.8 2008/01/14 18:58:02 adam Exp $ | |
2 | 2 | |||
3 | DISTNAME= slony1-1.2.9 | 3 | DISTNAME= slony1-1.2.12 | |
4 | CATEGORIES= databases | 4 | CATEGORIES= databases | |
5 | MASTER_SITES= http://www.slony.info/downloads/1.2/source/ | 5 | MASTER_SITES= http://slony.info/downloads/1.2/source/ | |
6 | EXTRACT_SUFX= .tar.bz2 | 6 | EXTRACT_SUFX= .tar.bz2 | |
7 | 7 | |||
8 | MAINTAINER= adam@NetBSD.org | 8 | MAINTAINER= adam@NetBSD.org | |
9 | HOMEPAGE= http://gborg.postgresql.org/project/slony1/projdisplay.php | 9 | HOMEPAGE= http://main.slony.info/ | |
10 | COMMENT= Replication system for PostgreSQL | 10 | COMMENT= Replication system for PostgreSQL | |
11 | 11 | |||
12 | DEPENDS+= postgresql${PGSQL_VERSION}-server-[0-9]*:../../databases/postgresql${PGSQL_VERSION}-server | 12 | DEPENDS+= postgresql${PGSQL_VERSION}-server-[0-9]*:../../databases/postgresql${PGSQL_VERSION}-server | |
13 | 13 | |||
14 | USE_TOOLS+= gmake | 14 | USE_TOOLS+= gmake | |
15 | GNU_CONFIGURE= yes | 15 | GNU_CONFIGURE= yes | |
16 | CONFIGURE_ARGS+= --with-pgconfigdir=${PGSQL_PREFIX:Q}/bin | 16 | CONFIGURE_ARGS+= --with-pgconfigdir=${PGSQL_PREFIX:Q}/bin | |
17 | CONFIGURE_ARGS+= --with-pgbindir=${PGSQL_PREFIX:Q}/bin | 17 | CONFIGURE_ARGS+= --with-pgbindir=${PGSQL_PREFIX:Q}/bin | |
18 | CONFIGURE_ARGS+= --with-pgincludedir=${PGSQL_PREFIX:Q}/include/postgresql | 18 | CONFIGURE_ARGS+= --with-pgincludedir=${PGSQL_PREFIX:Q}/include/postgresql | |
19 | CONFIGURE_ARGS+= --with-pgincludeserverdir=${PGSQL_PREFIX:Q}/include/postgresql/server | 19 | CONFIGURE_ARGS+= --with-pgincludeserverdir=${PGSQL_PREFIX:Q}/include/postgresql/server | |
20 | CONFIGURE_ARGS+= --with-pglibdir=${PGSQL_PREFIX:Q}/lib | 20 | CONFIGURE_ARGS+= --with-pglibdir=${PGSQL_PREFIX:Q}/lib | |
21 | CONFIGURE_ARGS+= --with-pgpkglibdir=${PGSQL_PREFIX:Q}/lib/postgresql | 21 | CONFIGURE_ARGS+= --with-pgpkglibdir=${PGSQL_PREFIX:Q}/lib/postgresql | |
22 | CONFIGURE_ARGS+= --with-pgsharedir=${PGSQL_PREFIX:Q}/share/postgresql | 22 | CONFIGURE_ARGS+= --with-pgsharedir=${PGSQL_PREFIX:Q}/share/postgresql | |
23 | 23 | |||
24 | post-extract: | 24 | post-extract: | |
25 | cp ${WRKSRC}/makefiles/Makefile.freebsd ${WRKSRC}/makefiles/Makefile.dragonfly | 25 | cp ${WRKSRC}/makefiles/Makefile.freebsd ${WRKSRC}/makefiles/Makefile.dragonfly | |
26 | 26 | |||
27 | post-install: | 27 | post-install: |
@@ -1,16 +1,17 @@ | @@ -1,16 +1,17 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.2 2007/04/10 21:59:02 rmind Exp $ | 1 | @comment $NetBSD: PLIST,v 1.3 2008/01/14 18:58:02 adam Exp $ | |
2 | bin/slon | 2 | bin/slon | |
3 | bin/slonik | 3 | bin/slonik | |
4 | bin/slony_logshipper | |||
4 | lib/postgresql/slony1_funcs.so | 5 | lib/postgresql/slony1_funcs.so | |
5 | lib/postgresql/xxid.so | 6 | lib/postgresql/xxid.so | |
6 | share/postgresql/slon.conf-sample | 7 | share/postgresql/slon.conf-sample | |
7 | share/postgresql/slony1_base.sql | 8 | share/postgresql/slony1_base.sql | |
8 | share/postgresql/slony1_base.v74.sql | 9 | share/postgresql/slony1_base.v74.sql | |
9 | share/postgresql/slony1_base.v80.sql | 10 | share/postgresql/slony1_base.v80.sql | |
10 | share/postgresql/slony1_base.v81.sql | 11 | share/postgresql/slony1_base.v81.sql | |
11 | share/postgresql/slony1_funcs.sql | 12 | share/postgresql/slony1_funcs.sql | |
12 | share/postgresql/slony1_funcs.v74.sql | 13 | share/postgresql/slony1_funcs.v74.sql | |
13 | share/postgresql/slony1_funcs.v80.sql | 14 | share/postgresql/slony1_funcs.v80.sql | |
14 | share/postgresql/slony1_funcs.v81.sql | 15 | share/postgresql/slony1_funcs.v81.sql | |
15 | share/postgresql/xxid.v74.sql | 16 | share/postgresql/xxid.v74.sql | |
16 | share/postgresql/xxid.v80.sql | 17 | share/postgresql/xxid.v80.sql |
@@ -1,6 +1,7 @@ | @@ -1,6 +1,7 @@ | |||
1 | $NetBSD: distinfo,v 1.4 2007/04/10 21:59:02 rmind Exp $ | 1 | $NetBSD: distinfo,v 1.5 2008/01/14 18:58:02 adam Exp $ | |
2 | 2 | |||
3 | SHA1 (slony1-1.2.9.tar.bz2) = 0dbfce131416ca19bfe72dbb900070c15e4e8520 | 3 | SHA1 (slony1-1.2.12.tar.bz2) = fbdbbd76ee4e20c46ee53de8922ceca3ef8de8ac | |
4 | RMD160 (slony1-1.2.9.tar.bz2) = e73f824b68c8f7c7a746b91d37990259bf9d0f94 | 4 | RMD160 (slony1-1.2.12.tar.bz2) = 0eeba14b620ae8bde21dd78d3e14a9736ef3d197 | |
5 | Size (slony1-1.2.9.tar.bz2) = 837293 bytes | 5 | Size (slony1-1.2.12.tar.bz2) = 872677 bytes | |
6 | SHA1 (patch-aa) = 2239b986ee794f5be952d96631d37f3d322af4e7 | 6 | SHA1 (patch-aa) = 0d47e35c562b47afb826f3ee0c2b20f015940269 | |
7 | SHA1 (patch-ab) = 8a8cc04e5d64be50fea0f2dd1e3da487223d8c45 |
@@ -1,12 +1,12 @@ | @@ -1,12 +1,12 @@ | |||
1 | $NetBSD: patch-aa,v 1.3 2007/04/10 21:49:55 rmind Exp $ | 1 | $NetBSD: patch-aa,v 1.4 2008/01/14 18:58:03 adam Exp $ | |
2 | 2 | |||
3 | --- configure.orig 2007-03-23 00:19:26.000000000 +0200 | 3 | --- configure.orig 2007-11-12 23:46:59.000000000 +0100 | |
4 | +++ configure | 4 | +++ configure | |
5 | @@ -1901,6 +1901,7 @@ case $host_os in | 5 | @@ -1904,6 +1904,7 @@ case $host_os in | |
6 | darwin*) template=darwin ;; | 6 | darwin*) template=darwin ;; | |
7 | dgux*) template=dgux ;; | 7 | dgux*) template=dgux ;; | |
8 | freebsd*) template=freebsd ;; | 8 | freebsd*) template=freebsd ;; | |
9 | + dragonfly*) template=dragonfly ;; | 9 | + dragonfly*) template=dragonfly ;; | |
10 | hpux*) template=hpux ;; | 10 | hpux*) template=hpux ;; | |
11 | irix*) template=irix ;; | 11 | irix*) template=irix ;; | |
12 | linux*|gnu*|k*bsd*-gnu) | 12 | linux*|gnu*|k*bsd*-gnu) |
$NetBSD: patch-ab,v 1.1 2008/01/14 18:58:03 adam Exp $
--- tests/run_test.sh.orig 2008-01-13 22:38:16.000000000 +0100
+++ tests/run_test.sh
@@ -179,7 +179,7 @@ store_node()
if [ -n "${db}" -a "${host}" -a "${user}" -a "${port}" ]; then
if [ ${alias} -ne ${originnode} ]; then
- if [ "x${logship}" == "xtrue" ]; then # Don't bother generating nodes used for log shipping
+ if [ "x${logship}" = "xtrue" ]; then # Don't bother generating nodes used for log shipping
status "Node ${alias} is a log shipping node - no need for STORE NODE"
else
echo "STORE NODE (id=${alias}, comment='node ${alias}');" >> $mktmp/slonik.script
@@ -219,7 +219,7 @@ store_path()
eval bport=\$PORT${j}
eval blogship=\$LOGSHIP${j}
if [ -n "${bdb}" -a "${bhost}" -a "${buser}" -a "${bport}" ]; then
- if [[ "x${logship}" == "xtrue" || "x${blogship}" == "xtrue" ]]; then
+ if [[ "x${logship}" = "xtrue" || "x${blogship}" = "xtrue" ]]; then
# log shipping node - no paths need exist that involve this node
status "log shipping between nodes(${i}/${j}) - ls(${logship}/${blogship}) - omit STORE PATH"
else
@@ -499,7 +499,7 @@ launch_slon()
fi
conninfo="dbname=${db} host=${host} user=${user} port=${port}"
- if [ "x${logship}" == "xtrue" ]; then
+ if [ "x${logship}" = "xtrue" ]; then
status "do not launch slon for node ${alias} - it receives data via log shipping"
else
status "launching: $pgbindir/slon -s500 -g10 -d2 ${archiveparm} $cluster \"$conninfo\""