Fix build against 9.6

sql/pgq/triggers/stringutil.c

@@ -19,7 +19,11 @@
 #include <postgres.h>
 #include <lib/stringinfo.h>
 #include <mb/pg_wchar.h>
+#if PG_VERSION_NUM >= 90600
+#include <common/keywords.h>
+#else
 #include <parser/keywords.h>
+#endif
 #include <utils/memutils.h>
 
 #include "stringutil.h"

sql/pgq_coop/expected/pgq_coop_test_1.out

@@ -0,0 +1,193 @@
+select pgq.create_queue('testqueue');
+ create_queue 
+--------------
+            1
+(1 row)
+
+update pgq.queue set queue_ticker_max_count = 1 where queue_name = 'testqueue';
+-- register
+select pgq_coop.register_subconsumer('testqueue', 'maincons', 'subcons1');
+ register_subconsumer 
+----------------------
+                    1
+(1 row)
+
+select pgq_coop.register_subconsumer('testqueue', 'maincons', 'subcons1');
+ register_subconsumer 
+----------------------
+                    0
+(1 row)
+
+select pgq_coop.register_subconsumer('testqueue', 'maincons', 'subcons1');
+ register_subconsumer 
+----------------------
+                    0
+(1 row)
+
+select pgq_coop.register_subconsumer('testqueue', 'maincons', 'subcons2');
+ register_subconsumer 
+----------------------
+                    1
+(1 row)
+
+-- process events
+select pgq_coop.next_batch('testqueue', 'maincons', 'subcons1');
+ next_batch 
+------------
+
+(1 row)
+
+select pgq.insert_event('testqueue', 'ev0', 'data');
+ insert_event 
+--------------
+            1
+(1 row)
+
+select pgq.insert_event('testqueue', 'ev1', 'data');
+ insert_event 
+--------------
+            2
+(1 row)
+
+select pgq.insert_event('testqueue', 'ev2', 'data');
+ insert_event 
+--------------
+            3
+(1 row)
+
+select pgq.ticker();
+ ticker 
+--------
+      1
+(1 row)
+
+select pgq_coop.next_batch('testqueue', 'maincons', 'subcons1');
+ next_batch 
+------------
+          1
+(1 row)
+
+select pgq_coop.next_batch('testqueue', 'maincons', 'subcons1');
+ next_batch 
+------------
+          1
+(1 row)
+
+select pgq_coop.next_batch('testqueue', 'maincons', 'subcons2');
+ next_batch 
+------------
+
+(1 row)
+
+select pgq.insert_event('testqueue', 'ev3', 'data');
+ insert_event 
+--------------
+            4
+(1 row)
+
+select pgq.insert_event('testqueue', 'ev4', 'data');
+ insert_event 
+--------------
+            5
+(1 row)
+
+select pgq.insert_event('testqueue', 'ev5', 'data');
+ insert_event 
+--------------
+            6
+(1 row)
+
+select pgq.ticker();
+ ticker 
+--------
+      1
+(1 row)
+
+select pgq_coop.next_batch('testqueue', 'maincons', 'subcons2');
+ next_batch 
+------------
+          2
+(1 row)
+
+select pgq_coop.finish_batch(2);
+ finish_batch 
+--------------
+            1
+(1 row)
+
+-- test takeover
+select pgq_coop.next_batch('testqueue', 'maincons', 'subcons2', '1 hour');
+ next_batch 
+------------
+
+(1 row)
+
+update pgq.subscription set sub_active = '2005-01-01' where sub_batch is not null;
+select pgq_coop.next_batch('testqueue', 'maincons', 'subcons2', '1 hour');
+ next_batch 
+------------
+          1
+(1 row)
+
+select pgq_coop.unregister_subconsumer('testqueue', 'maincons', 'subcons1', 0);
+ unregister_subconsumer 
+------------------------
+                      0
+(1 row)
+
+select pgq_coop.unregister_subconsumer('testqueue', 'maincons', 'subcons2', 0);
+ERROR:  subconsumer has active batch
+CONTEXT:  PL/pgSQL function pgq_coop.unregister_subconsumer(text,text,text,integer) line 42 at RAISE
+select pgq_coop.unregister_subconsumer('testqueue', 'maincons', 'subcons2', 1);
+ unregister_subconsumer 
+------------------------
+                      1
+(1 row)
+
+select pgq_coop.unregister_subconsumer('testqueue', 'maincons', 'subcons2', 0);
+ unregister_subconsumer 
+------------------------
+                      0
+(1 row)
+
+-- test auto-creation
+select pgq_coop.next_batch('testqueue', 'cmain', 'sc1');
+ next_batch 
+------------
+
+(1 row)
+
+select pgq_coop.next_batch('testqueue', 'cmain', 'sc2');
+ next_batch 
+------------
+
+(1 row)
+
+select consumer_name, last_tick from pgq.get_consumer_info();
+ consumer_name | last_tick 
+---------------+-----------
+ cmain         |         3
+ cmain.sc1     |          
+ cmain.sc2     |          
+ maincons      |         3
+(4 rows)
+
+-- test unregistering with pure pgq api
+select pgq.unregister_consumer('testqueue', 'cmain.sc2');
+ unregister_consumer 
+---------------------
+                   1
+(1 row)
+
+select pgq.unregister_consumer('testqueue', 'cmain');
+ unregister_consumer 
+---------------------
+                   2
+(1 row)
+
+select consumer_name, last_tick from pgq.get_consumer_info();
+ consumer_name | last_tick 
+---------------+-----------
+ maincons      |         3
+(1 row)
+