Merge branch 'release/3.2' into develop

14 files changed, 93 insertions, 27 deletions

diff --git a/NEWS b/NEWS
index 943b59db..3a5eba93 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,42 @@
 
+2014-03-31  -  SkyTools 3.2  -  "Hit any user to continue"
+
+  = Features =
+
+    * scripts/data_maintainer.py: can use csv file as source
+    * debian: support Postgres 9.3, 9.4
+
+  = Minor features =
+
+    * londiste: added ignore_truncate handler option
+    * londiste add-table: added lock_timeout option to avoid possible locking issues
+    * scripts/data_maintainer.py: added dynamic throttling support (via sql)
+    * skytools.scripting: added options to lower log level for exceptions
+    * skytools.scripting: simple retriable execute (for sql)
+
+  = Fixes =
+
+    * londiste.create_partition: fixed to avoid deadlocks from concurrent workers
+    * londiste.handlers.dispatch: fixed "ignore events aiming at obsolete partitions" bug
+    * pgq.cascade.admin: do not allow subscribing to itself (same node)
+    * pgq.consumer: fixed RetriableEvent and RetriableWalkerEvent
+    * skytools.dbstruct: quote sequence names
+    * skytools.set_tcp_keepalive: add compat with newer OSX, simplify, enable win32
+    * scripts/data_maintainer.py: fixed to survive null in stats column of sql_modify
+    * sql/londiste: fixed londiste.table_info trigger issue
+    * sql/pgq: fix retry-queue vs. newgrants
+    * sql/pgq: tag pgq.batch_id_seq as dumpable (extension)
+
+  = Cleanups =
+
+    * londiste.drop_obsolete_partitions: drop tables in alphabetical order (that is from the oldest)
+    * londiste.handlers: removed duplicate debug logging
+    * londiste: moved config processing from dispatch to base handler
+    * pgq.localconsumer: added file path check on config load
+    * scripts/data_maintainer.py: clean-up
+    * debian: include data_maintainer3 in package
+    * Get rid of dictfetch*() usage, it's obsolete.
+
 2013-07-31  -  SkyTools 3.1.5  -  "Caution, Blind Man Driving"
 
   = Features =
diff --git a/configure.ac b/configure.ac
index b40b58d5..458deb5a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT(skytools, 3.1.5)
+AC_INIT(skytools, 3.2)
 AC_CONFIG_SRCDIR(python/londiste.py)
 AC_CONFIG_HEADER(lib/usual/config.h)
 AC_PREREQ([2.59])
diff --git a/debian/changelog b/debian/changelog
index 84b41949..3712fc0b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+skytools3 (3.2) experimental; urgency=low
+
+  * v3.2
+
+ -- martinko <gamato@users.sf.net>  Mon, 31 Mar 2014 16:17:18 +0200
+
+skytools3 (3.1.6rc2) experimental; urgency=low
+
+  * v3.1.6rc2
+
+ -- martinko <gamato@users.sf.net>  Mon, 17 Mar 2014 16:17:18 +0100
+
+skytools3 (3.1.6rc1) experimental; urgency=low
+
+  * v3.1.6rc1
+
+ -- martinko <gamato@users.sf.net>  Thu, 20 Feb 2014 15:00:00 +0100
+
 skytools3 (3.1.5.4) experimental; urgency=low
 
   * v3.1.5.4
diff --git a/python/conf/skylog.ini b/python/conf/skylog.ini
index af885377..9ba068f5 100644
--- a/python/conf/skylog.ini
+++ b/python/conf/skylog.ini
@@ -10,13 +10,13 @@
 [loggers]
 keys=root
 ; root logger sees everything.  there can be per-job configs by 
-; specifing loggers with job_name of the script
+; specifying loggers with job_name of the script.
 
 ; list of all handlers
 [handlers]
-;; seems logger module immidiately initalized all handlers,
+;; seems logger module immediately initialized all handlers,
 ;; whether they are actually used or not.  so better
-;; keep this list in sync with actual handler list
+;; keep this list in sync with actual handler list.
 ;keys=stderr,logdb,logsrv,logfile
 keys=stderr
 
diff --git a/sql/londiste/Makefile b/sql/londiste/Makefile
index b9ab4d17..07b8d2f5 100644
--- a/sql/londiste/Makefile
+++ b/sql/londiste/Makefile
@@ -1,8 +1,8 @@
 
 EXTENSION = londiste
 
-EXT_VERSION = 3.1.4
-EXT_OLD_VERSIONS = 3.1 3.1.1 3.1.3
+EXT_VERSION = 3.2
+EXT_OLD_VERSIONS = 3.1 3.1.1 3.1.3 3.1.4 3.1.6
 
 base_regress = londiste_provider londiste_subscriber \
 	       londiste_fkeys londiste_execute londiste_seqs londiste_merge \
diff --git a/sql/londiste/functions/londiste.upgrade_schema.sql b/sql/londiste/functions/londiste.upgrade_schema.sql
index 508daea2..c0cf2986 100644
--- a/sql/londiste/functions/londiste.upgrade_schema.sql
+++ b/sql/londiste/functions/londiste.upgrade_schema.sql
@@ -3,8 +3,10 @@ create or replace function londiste.upgrade_schema()
 returns int4 as $$
 -- updates table structure if necessary
 declare
+    pgversion int;
     cnt int4 = 0;
 begin
+    show server_version_num into pgversion;
 
     -- table_info: check (dropped_ddl is null or merge_state in ('in-copy', 'catching-up'))
     perform 1 from information_schema.check_constraints
@@ -29,11 +31,19 @@ begin
     end if;
 
     -- table_info: change trigger timing
-    perform 1 from information_schema.triggers
-      where event_object_schema = 'londiste'
-        and event_object_table = 'table_info'
-        and trigger_name = 'table_info_trigger_sync'
-        and condition_timing = 'AFTER';
+    if pgversion >= 90100 then
+        perform 1 from information_schema.triggers
+          where event_object_schema = 'londiste'
+            and event_object_table = 'table_info'
+            and trigger_name = 'table_info_trigger_sync'
+            and action_timing = 'AFTER';
+    else
+        perform 1 from information_schema.triggers
+          where event_object_schema = 'londiste'
+            and event_object_table = 'table_info'
+            and trigger_name = 'table_info_trigger_sync'
+            and condition_timing = 'AFTER';
+    end if;
     if found then
         drop trigger table_info_trigger_sync on londiste.table_info;
         create trigger table_info_trigger_sync before delete on londiste.table_info
diff --git a/sql/londiste/functions/londiste.version.sql b/sql/londiste/functions/londiste.version.sql
index af30056a..3025d48e 100644
--- a/sql/londiste/functions/londiste.version.sql
+++ b/sql/londiste/functions/londiste.version.sql
@@ -4,11 +4,11 @@ returns text as $$
 -- ----------------------------------------------------------------------
 -- Function: londiste.version(0)
 --
---      Returns version string for londiste.  ATM it is based on SkyTools version
---      and only bumped when database code changes.
+--      Returns version string for londiste.  ATM it is based on SkyTools
+--      version and only bumped when database code changes.
 -- ----------------------------------------------------------------------
 begin
-    return '3.1.4';
+    return '3.2';
 end;
 $$ language plpgsql;
 
diff --git a/sql/londiste/londiste.control b/sql/londiste/londiste.control
index 153a4ba2..40afe77c 100644
--- a/sql/londiste/londiste.control
+++ b/sql/londiste/londiste.control
@@ -1,6 +1,6 @@
 # Londiste extensions
 comment = 'Londiste Replication'
-default_version = '3.1.4'
+default_version = '3.2'
 relocatable = false
 superuser = true
 schema = 'pg_catalog'
diff --git a/sql/pgq/Makefile b/sql/pgq/Makefile
index 836ee8ed..2492271c 100644
--- a/sql/pgq/Makefile
+++ b/sql/pgq/Makefile
@@ -1,8 +1,8 @@
 
 EXTENSION = pgq
 
-EXT_VERSION = 3.1.3
-EXT_OLD_VERSIONS = 3.1 3.1.1 3.1.2
+EXT_VERSION = 3.2
+EXT_OLD_VERSIONS = 3.1 3.1.1 3.1.2 3.1.3 3.1.6
 
 DOCS = README.pgq
 
diff --git a/sql/pgq/functions/pgq.version.sql b/sql/pgq/functions/pgq.version.sql
index 3313d80d..0645a92d 100644
--- a/sql/pgq/functions/pgq.version.sql
+++ b/sql/pgq/functions/pgq.version.sql
@@ -3,11 +3,11 @@ returns text as $$
 -- ----------------------------------------------------------------------
 -- Function: pgq.version(0)
 --
---      Returns version string for pgq.  ATM it is based on SkyTools version
---      and only bumped when database code changes.
+--      Returns version string for pgq.  ATM it is based on SkyTools
+--      version and only bumped when database code changes.
 -- ----------------------------------------------------------------------
 begin
-    return '3.1.3';
+    return '3.2';
 end;
 $$ language plpgsql;
 
diff --git a/sql/pgq/pgq.control b/sql/pgq/pgq.control
index 91d54de2..5e934a1f 100644
--- a/sql/pgq/pgq.control
+++ b/sql/pgq/pgq.control
@@ -1,6 +1,6 @@
 # pgq extension
 comment = 'Generic queue for PostgreSQL'
-default_version = '3.1.3'
+default_version = '3.2'
 relocatable = false
 superuser = true
 schema = 'pg_catalog'
diff --git a/sql/pgq_node/Makefile b/sql/pgq_node/Makefile
index 784455b3..dfa61cd7 100644
--- a/sql/pgq_node/Makefile
+++ b/sql/pgq_node/Makefile
@@ -1,8 +1,8 @@
 
 EXTENSION = pgq_node
 
-EXT_VERSION = 3.1.3
-EXT_OLD_VERSIONS = 3.1
+EXT_VERSION = 3.2
+EXT_OLD_VERSIONS = 3.1 3.1.3 3.1.6
 
 Extension_regress = pgq_node_init_ext   pgq_node_test
 Contrib_regress   = pgq_node_init_noext pgq_node_test
diff --git a/sql/pgq_node/functions/pgq_node.version.sql b/sql/pgq_node/functions/pgq_node.version.sql
index 17558b86..9f1fde4f 100644
--- a/sql/pgq_node/functions/pgq_node.version.sql
+++ b/sql/pgq_node/functions/pgq_node.version.sql
@@ -4,11 +4,11 @@ returns text as $$
 -- ----------------------------------------------------------------------
 -- Function: pgq_node.version(0)
 --
---      Returns version string for pgq_node.  ATM it is based on SkyTools version
---      and only bumped when database code changes.
+--      Returns version string for pgq_node.  ATM it is based on SkyTools
+--      version and only bumped when database code changes.
 -- ----------------------------------------------------------------------
 begin
-    return '3.1.3';
+    return '3.2';
 end;
 $$ language plpgsql;
 
diff --git a/sql/pgq_node/pgq_node.control b/sql/pgq_node/pgq_node.control
index 1e7230e6..05391d6a 100644
--- a/sql/pgq_node/pgq_node.control
+++ b/sql/pgq_node/pgq_node.control
@@ -1,6 +1,6 @@
 # pgq_node
 comment = 'Cascaded queue infrastructure'
-default_version = '3.1.3'
+default_version = '3.2'
 relocatable = false
 superuser = true
 schema = 'pg_catalog'