sql/*: update regtests with new messages

diff --git a/sql/londiste/expected/londiste_fkeys.out b/sql/londiste/expected/londiste_fkeys.out
index 34055e0f31d8fb1165eb8ea83831778bd78a18ef..6346c13fb35e0bc6abaa4bcfbd46d6c8e273cbfc 100644 (file)
--- a/sql/londiste/expected/londiste_fkeys.out
+++ b/sql/londiste/expected/londiste_fkeys.out
@@ -17,21 +17,21 @@ create table ref_3 (
 );
 NOTICE:  CREATE TABLE / PRIMARY KEY will create implicit index "ref_3_pkey" for table "ref_3"
 select * from londiste.global_add_table('branch_set', 'public.ref_1');
- ret_code | ret_note 
-----------+----------
-      200 | OK
+ ret_code |         ret_note          
+----------+---------------------------
+      200 | Table added: public.ref_1
 (1 row)
 
 select * from londiste.global_add_table('branch_set', 'public.ref_2');
- ret_code | ret_note 
-----------+----------
-      200 | OK
+ ret_code |         ret_note          
+----------+---------------------------
+      200 | Table added: public.ref_2
 (1 row)
 
 select * from londiste.global_add_table('branch_set', 'public.ref_3');
- ret_code | ret_note 
-----------+----------
-      200 | OK
+ ret_code |         ret_note          
+----------+---------------------------
+      200 | Table added: public.ref_3
 (1 row)
 
 select * from londiste.local_add_table('branch_set', 'public.ref_1');

diff --git a/sql/londiste/expected/londiste_merge.out b/sql/londiste/expected/londiste_merge.out
index 244ad25ca7d239ea27bcbb539546437f6490736a..1bb5c0185584389bf0e4455acdfc17e84dd8d62e 100644 (file)
--- a/sql/londiste/expected/londiste_merge.out
+++ b/sql/londiste/expected/londiste_merge.out
@@ -62,9 +62,9 @@ select * from londiste.local_add_table('combined_set', 'tblmerge');
 (1 row)
 
 select * from londiste.global_add_table('part1_set', 'tblmerge');
- ret_code | ret_note 
-----------+----------
-      200 | OK
+ ret_code |       ret_note        
+----------+-----------------------
+      200 | Table added: tblmerge
 (1 row)
 
 select * from londiste.local_add_table('part1_set', 'tblmerge');
@@ -74,9 +74,9 @@ select * from londiste.local_add_table('part1_set', 'tblmerge');
 (1 row)
 
 select * from londiste.global_add_table('part2_set', 'tblmerge');
- ret_code | ret_note 
-----------+----------
-      200 | OK
+ ret_code |       ret_note        
+----------+-----------------------
+      200 | Table added: tblmerge
 (1 row)
 
 select * from londiste.local_add_table('part2_set', 'tblmerge');

diff --git a/sql/londiste/expected/londiste_seqs.out b/sql/londiste/expected/londiste_seqs.out
index c253bbdd57c01d4086809002c7c88ee1ad9bcbef..c53461ae6e836f3037c6f520aab93652d8f2925a 100644 (file)
--- a/sql/londiste/expected/londiste_seqs.out
+++ b/sql/londiste/expected/londiste_seqs.out
@@ -32,7 +32,7 @@ select * from londiste.local_add_seq('seqroot', 'masterseq');
 select * from londiste.root_check_seqs('seqroot');
  ret_code |     ret_note      
 ----------+-------------------
-      200 | Sequences updated
+      100 | Sequences updated
 (1 row)
 
 select * from londiste.local_remove_seq('seqroot', 'masterseq');

diff --git a/sql/londiste/expected/londiste_subscriber.out b/sql/londiste/expected/londiste_subscriber.out
index ddf91794812954cf7e5ebe69a38c5814748588fa..30020f855272f1e2cd21fa56727843ad645d8ea2 100644 (file)
--- a/sql/londiste/expected/londiste_subscriber.out
+++ b/sql/londiste/expected/londiste_subscriber.out
@@ -38,9 +38,9 @@ select * from londiste.local_add_table('branch_set', 'public.slavedata');
 (1 row)
 
 select * from londiste.global_add_table('branch_set', 'public.slavedata');
- ret_code | ret_note 
-----------+----------
-      200 | OK
+ ret_code |           ret_note            
+----------+-------------------------------
+      200 | Table added: public.slavedata
 (1 row)
 
 select * from londiste.local_add_table('branch_set', 'public.slavedata');
@@ -50,9 +50,9 @@ select * from londiste.local_add_table('branch_set', 'public.slavedata');
 (1 row)
 
 select * from londiste.global_add_table('branch_set', 'public.tmp');
- ret_code | ret_note 
-----------+----------
-      200 | OK
+ ret_code |        ret_note         
+----------+-------------------------
+      200 | Table added: public.tmp
 (1 row)
 
 select * from londiste.get_table_list('branch_set');
@@ -63,9 +63,9 @@ select * from londiste.get_table_list('branch_set');
 (2 rows)
 
 select * from londiste.global_remove_table('branch_set', 'public.tmp');
- ret_code | ret_note 
-----------+----------
-      200 | OK
+ ret_code |         ret_note          
+----------+---------------------------
+      200 | Table removed: public.tmp
 (1 row)
 
 select * from londiste.local_remove_table('branch_set', 'public.slavedata');

diff --git a/sql/pgq_node/expected/pgq_node_test.out b/sql/pgq_node/expected/pgq_node_test.out
index 8ca2076245884ed6b2a347bd28b5fc16c5b23276..391fbd99d09eac1a82e87733e6d6cd4f303d7f85 100644 (file)
--- a/sql/pgq_node/expected/pgq_node_test.out
+++ b/sql/pgq_node/expected/pgq_node_test.out
@@ -67,9 +67,9 @@ select * from pgq_node.get_queue_locations('aqueue');
 (4 rows)
 
 select * from pgq_node.create_node('aqueue', 'root', 'node1', 'node1_worker', null, null, null);
- ret_code |                          ret_note                           
-----------+-------------------------------------------------------------
-      200 | Node "node1" initialized for queue "node1" with type "root"
+ ret_code |                           ret_note                           
+----------+--------------------------------------------------------------
+      200 | Node "node1" initialized for queue "aqueue" with type "root"
 (1 row)
 
 select * from pgq_node.register_subscriber('aqueue', 'node2', 'node2_worker', null);
@@ -118,9 +118,9 @@ select * from pgq.ticker('aqueue');
 (1 row)
 
 select * from pgq_node.set_subscriber_watermark('aqueue', 'node2', 3);
- ret_code | ret_note 
-----------+----------
-      200 | Ok
+ ret_code |         ret_note          
+----------+---------------------------
+      200 | .node2.watermark set to 3
 (1 row)
 
 select queue_name, consumer_name, last_tick from pgq.get_consumer_info();
@@ -134,7 +134,7 @@ select queue_name, consumer_name, last_tick from pgq.get_consumer_info();
 select * from pgq_node.get_node_info('aqueue');
  ret_code | ret_note | node_type | node_name | global_watermark | local_watermark | provider_node | provider_location | combined_queue | combined_type | worker_name  | worker_paused | worker_uptodate | worker_last_tick 
 ----------+----------+-----------+-----------+------------------+-----------------+---------------+-------------------+----------------+---------------+--------------+---------------+-----------------+------------------
-      200 | Ok       | root      | node1     |                1 |               1 | node1         | dbname=node1      |                |               | node1_worker | f             | f               |                1
+      100 | Ok       | root      | node1     |                1 |               1 | node1         | dbname=node1      |                |               | node1_worker | f             | f               |                1
 (1 row)
 
 select * from pgq_node.get_subscriber_info('aqueue');
@@ -163,9 +163,9 @@ select * from pgq_node.register_location('bqueue', 'node3', 'dbname=node3', fals
 (1 row)
 
 select * from pgq_node.create_node('bqueue', 'branch', 'node2', 'node2_worker', 'node1', 1, null);
- ret_code |                           ret_note                            
-----------+---------------------------------------------------------------
-      200 | Node "node2" initialized for queue "node2" with type "branch"
+ ret_code |                            ret_note                            
+----------+----------------------------------------------------------------
+      200 | Node "node2" initialized for queue "bqueue" with type "branch"
 (1 row)
 
 select * from pgq_node.register_consumer('bqueue', 'random_consumer', 'node1', 1);
@@ -199,13 +199,13 @@ select * from pgq_node.node_info;
 select * from pgq_node.get_node_info('aqueue');
  ret_code | ret_note | node_type | node_name | global_watermark | local_watermark | provider_node | provider_location | combined_queue | combined_type | worker_name  | worker_paused | worker_uptodate | worker_last_tick 
 ----------+----------+-----------+-----------+------------------+-----------------+---------------+-------------------+----------------+---------------+--------------+---------------+-----------------+------------------
-      200 | Ok       | root      | node1     |                1 |               1 | node1         | dbname=node1      |                |               | node1_worker | f             | f               |                1
+      100 | Ok       | root      | node1     |                1 |               1 | node1         | dbname=node1      |                |               | node1_worker | f             | f               |                1
 (1 row)
 
 select * from pgq_node.get_node_info('bqueue');
  ret_code | ret_note | node_type | node_name | global_watermark | local_watermark | provider_node | provider_location | combined_queue | combined_type | worker_name  | worker_paused | worker_uptodate | worker_last_tick 
 ----------+----------+-----------+-----------+------------------+-----------------+---------------+-------------------+----------------+---------------+--------------+---------------+-----------------+------------------
-      200 | Ok       | branch    | node2     |                1 |               1 | node1         | dbname=node1      |                |               | node2_worker | f             | f               |                1
+      100 | Ok       | branch    | node2     |                1 |               1 | node1         | dbname=node1      |                |               | node2_worker | f             | f               |                1
 (1 row)
 
 select * from pgq_node.get_node_info('cqueue');
@@ -231,19 +231,19 @@ ERROR:  queue does not exist: cqueue
 select * from pgq_node.get_consumer_state('bqueue', 'random_consumer');
  ret_code | ret_note | node_type | node_name | completed_tick | provider_node | provider_location | paused | uptodate 
 ----------+----------+-----------+-----------+----------------+---------------+-------------------+--------+----------
-      200 | Ok       | branch    | node2     |              1 | node1         | dbname=node1      | f      | f
+      100 | Ok       | branch    | node2     |              1 | node1         | dbname=node1      | f      | f
 (1 row)
 
 select * from pgq_node.get_consumer_state('bqueue', 'random_consumer2');
  ret_code | ret_note | node_type | node_name | completed_tick | provider_node | provider_location | paused | uptodate 
 ----------+----------+-----------+-----------+----------------+---------------+-------------------+--------+----------
-      200 | Ok       | branch    | node2     |              1 | node1         | dbname=node1      | f      | f
+      100 | Ok       | branch    | node2     |              1 | node1         | dbname=node1      | f      | f
 (1 row)
 
 select * from pgq_node.set_consumer_completed('bqueue', 'random_consumer2', 2);
- ret_code | ret_note 
-----------+----------
-      200 | Ok
+ ret_code |                   ret_note                   
+----------+----------------------------------------------
+      100 | Consumer random_consumer2 compleded tick = 2
 (1 row)
 
 select * from pgq_node.set_consumer_paused('bqueue', 'random_consumer2', true);
@@ -267,7 +267,7 @@ select * from pgq_node.change_consumer_provider('bqueue', 'random_consumer2', 'n
 select * from pgq_node.get_consumer_state('bqueue', 'random_consumer2');
  ret_code | ret_note | node_type | node_name | completed_tick | provider_node | provider_location | paused | uptodate 
 ----------+----------+-----------+-----------+----------------+---------------+-------------------+--------+----------
-      200 | Ok       | branch    | node2     |              2 | node3         | dbname=node3      | t      | f
+      100 | Ok       | branch    | node2     |              2 | node3         | dbname=node3      | t      | f
 (1 row)
 
 select * from pgq_node.unregister_consumer('bqueue', 'random_consumer2');
@@ -285,7 +285,7 @@ select * from pgq_node.get_consumer_state('bqueue', 'random_consumer2');
 select * from pgq_node.get_node_info('bqueue');
  ret_code | ret_note | node_type | node_name | global_watermark | local_watermark | provider_node | provider_location | combined_queue | combined_type | worker_name  | worker_paused | worker_uptodate | worker_last_tick 
 ----------+----------+-----------+-----------+------------------+-----------------+---------------+-------------------+----------------+---------------+--------------+---------------+-----------------+------------------
-      200 | Ok       | branch    | node2     |                1 |               1 | node1         | dbname=node1      |                |               | node2_worker | f             | f               |                1
+      100 | Ok       | branch    | node2     |                1 |               1 | node1         | dbname=node1      |                |               | node2_worker | f             | f               |                1
 (1 row)
 
 set session_replication_role = 'replica';