From 08d34cdc7ee7d16e3687ace02c267f29ca01ba72 Mon Sep 17 00:00:00 2001 From: Marko Kreen Date: Thu, 6 Dec 2007 15:16:49 +0000 Subject: [PATCH] pgq_set: include worker name explicitly in db --- sql/pgq_set/functions/pgq_set.create_node.sql | 5 +++-- sql/pgq_set/functions/pgq_set.get_node_info.sql | 5 +++-- sql/pgq_set/sql/pgq_set.sql | 2 +- sql/pgq_set/structure/pgq_set.sql | 2 ++ 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/sql/pgq_set/functions/pgq_set.create_node.sql b/sql/pgq_set/functions/pgq_set.create_node.sql index 322dca1d..ac3a47a3 100644 --- a/sql/pgq_set/functions/pgq_set.create_node.sql +++ b/sql/pgq_set/functions/pgq_set.create_node.sql @@ -3,6 +3,7 @@ create or replace function pgq_set.create_node( in i_set_name text, in i_node_type text, in i_node_name text, + in i_worker_name text, in i_provider_name text, in i_global_watermark bigint, in i_combined_set text, @@ -75,9 +76,9 @@ begin insert into pgq_set.set_info (set_name, node_type, node_name, queue_name, - provider_node, combined_set, global_watermark) + provider_node, combined_set, global_watermark, worker_name) values (i_set_name, i_node_type, i_node_name, _queue_name, - i_provider_name, i_combined_set, _global_wm); + i_provider_name, i_combined_set, _global_wm, i_worker_name); if i_node_type not in ('root', 'combined-root') then insert into pgq_set.completed_tick (set_name, tick_id) diff --git a/sql/pgq_set/functions/pgq_set.get_node_info.sql b/sql/pgq_set/functions/pgq_set.get_node_info.sql index 25ad463d..f4d23664 100644 --- a/sql/pgq_set/functions/pgq_set.get_node_info.sql +++ b/sql/pgq_set/functions/pgq_set.get_node_info.sql @@ -8,6 +8,7 @@ create or replace function pgq_set.get_node_info( out global_watermark bigint, out local_watermark bigint, out completed_tick bigint, + out worker_name text, out provider_node text, out provider_location text, @@ -49,11 +50,11 @@ begin select n.node_type, n.node_name, t.tick_id, n.queue_name, c.set_name, c.node_type, c.queue_name, n.global_watermark, n.provider_node, n.paused, n.resync, n.up_to_date, - p.node_location + p.node_location, n.worker_name into node_type, node_name, completed_tick, queue_name, combined_set, combined_type, combined_queue, global_watermark, provider_node, paused, resync, up_to_date, - provider_location + provider_location, worker_name from pgq_set.set_info n left join pgq_set.completed_tick t on (t.set_name = n.set_name) left join pgq_set.set_info c on (c.set_name = n.combined_set) diff --git a/sql/pgq_set/sql/pgq_set.sql b/sql/pgq_set/sql/pgq_set.sql index 5ef46662..4b2a6ff2 100644 --- a/sql/pgq_set/sql/pgq_set.sql +++ b/sql/pgq_set/sql/pgq_set.sql @@ -16,6 +16,6 @@ select * from pgq_set.get_member_info('aset'); select * from pgq_set.remove_member('aset', 'node4'); select * from pgq_set.get_member_info('aset'); -select * from pgq_set.create_node('aset', 'root', 'node1', null, null, null); +select * from pgq_set.create_node('aset', 'root', 'node1', 'worker', null, null, null); select * from pgq_set.get_node_info('aset'); diff --git a/sql/pgq_set/structure/pgq_set.sql b/sql/pgq_set/structure/pgq_set.sql index 25f85d5b..8fb6673c 100644 --- a/sql/pgq_set/structure/pgq_set.sql +++ b/sql/pgq_set/structure/pgq_set.sql @@ -61,6 +61,8 @@ create table pgq_set.set_info ( resync boolean not null default false, up_to_date boolean not null default false, + worker_name text not null, + foreign key (set_name, node_name) references pgq_set.member_info, foreign key (set_name, provider_node) references pgq_set.member_info, check (node_type in ('root', 'branch', 'leaf', 'combined-root', 'combined-branch', 'merge-leaf')), -- 2.39.5