From 47e7a3883ffe13cd09302517ecbcbd2844ee2de2 Mon Sep 17 00:00:00 2001 From: Victor Seva Date: Wed, 5 Oct 2016 14:04:59 +0200 Subject: [PATCH] utils/kamctl: refresh dbschema See #782 --- utils/kamctl/db_berkeley/kamailio/sca_subscriptions | 4 ++-- utils/kamctl/db_berkeley/kamailio/version | 2 +- utils/kamctl/db_sqlite/sca-create.sql | 5 +++-- utils/kamctl/dbtext/kamailio/sca_subscriptions | 2 +- utils/kamctl/dbtext/kamailio/version | 2 +- utils/kamctl/mysql/sca-create.sql | 5 +++-- utils/kamctl/oracle/sca-create.sql | 5 +++-- utils/kamctl/postgres/sca-create.sql | 5 +++-- utils/kamctl/xhttp_pi/pi_framework.xml | 4 ++++ utils/kamctl/xhttp_pi/sca-mod | 3 +++ utils/kamctl/xhttp_pi/sca-table | 1 + 11 files changed, 25 insertions(+), 13 deletions(-) diff --git a/utils/kamctl/db_berkeley/kamailio/sca_subscriptions b/utils/kamctl/db_berkeley/kamailio/sca_subscriptions index e95bce3a62c..ee7f41a218e 100644 --- a/utils/kamctl/db_berkeley/kamailio/sca_subscriptions +++ b/utils/kamctl/db_berkeley/kamailio/sca_subscriptions @@ -1,5 +1,5 @@ METADATA_COLUMNS -id(int) subscriber(str) aor(str) event(int) expires(int) state(int) app_idx(int) call_id(str) from_tag(str) to_tag(str) record_route(str) notify_cseq(int) subscribe_cseq(int) +id(int) subscriber(str) aor(str) event(int) expires(int) state(int) app_idx(int) call_id(str) from_tag(str) to_tag(str) record_route(str) notify_cseq(int) subscribe_cseq(int) server_id(int) METADATA_KEY METADATA_READONLY @@ -7,4 +7,4 @@ METADATA_READONLY METADATA_LOGFLAGS 0 METADATA_DEFAULTS -NIL|NIL|NIL|0|0|0|0|NIL|NIL|NIL|NIL|NIL|NIL +NIL|NIL|NIL|0|0|0|0|NIL|NIL|NIL|NIL|NIL|NIL|0 diff --git a/utils/kamctl/db_berkeley/kamailio/version b/utils/kamctl/db_berkeley/kamailio/version index 65f13715a54..f76e5ed0123 100644 --- a/utils/kamctl/db_berkeley/kamailio/version +++ b/utils/kamctl/db_berkeley/kamailio/version @@ -107,7 +107,7 @@ rtpengine|1 rtpproxy| rtpproxy|1 sca_subscriptions| -sca_subscriptions|1 +sca_subscriptions|2 silo| silo|8 sip_trace| diff --git a/utils/kamctl/db_sqlite/sca-create.sql b/utils/kamctl/db_sqlite/sca-create.sql index 67cefaa8161..09e98e607c3 100644 --- a/utils/kamctl/db_sqlite/sca-create.sql +++ b/utils/kamctl/db_sqlite/sca-create.sql @@ -12,11 +12,12 @@ CREATE TABLE sca_subscriptions ( record_route TEXT, notify_cseq INTEGER NOT NULL, subscribe_cseq INTEGER NOT NULL, + server_id INTEGER DEFAULT 0 NOT NULL, CONSTRAINT sca_subscriptions_sca_subscriptions_idx UNIQUE (subscriber, call_id, from_tag, to_tag) ); -CREATE INDEX sca_subscriptions_sca_expires_idx ON sca_subscriptions (expires); +CREATE INDEX sca_subscriptions_sca_expires_idx ON sca_subscriptions (server_id, expires); CREATE INDEX sca_subscriptions_sca_subscribers_idx ON sca_subscriptions (subscriber, event); -INSERT INTO version (table_name, table_version) values ('sca_subscriptions','1'); +INSERT INTO version (table_name, table_version) values ('sca_subscriptions','2'); diff --git a/utils/kamctl/dbtext/kamailio/sca_subscriptions b/utils/kamctl/dbtext/kamailio/sca_subscriptions index b953d2a8908..d175560803f 100644 --- a/utils/kamctl/dbtext/kamailio/sca_subscriptions +++ b/utils/kamctl/dbtext/kamailio/sca_subscriptions @@ -1 +1 @@ -id(int,auto) subscriber(string) aor(string) event(int) expires(int) state(int) app_idx(int) call_id(string) from_tag(string) to_tag(string) record_route(string,null) notify_cseq(int) subscribe_cseq(int) +id(int,auto) subscriber(string) aor(string) event(int) expires(int) state(int) app_idx(int) call_id(string) from_tag(string) to_tag(string) record_route(string,null) notify_cseq(int) subscribe_cseq(int) server_id(int) diff --git a/utils/kamctl/dbtext/kamailio/version b/utils/kamctl/dbtext/kamailio/version index eb3f13577b6..5a26e5b998a 100644 --- a/utils/kamctl/dbtext/kamailio/version +++ b/utils/kamctl/dbtext/kamailio/version @@ -48,7 +48,7 @@ rls_presentity:1 rls_watchers:3 rtpengine:1 rtpproxy:1 -sca_subscriptions:1 +sca_subscriptions:2 silo:8 sip_trace:4 speed_dial:2 diff --git a/utils/kamctl/mysql/sca-create.sql b/utils/kamctl/mysql/sca-create.sql index 0f46808d3da..39601561728 100644 --- a/utils/kamctl/mysql/sca-create.sql +++ b/utils/kamctl/mysql/sca-create.sql @@ -12,11 +12,12 @@ CREATE TABLE `sca_subscriptions` ( `record_route` TEXT, `notify_cseq` INT(11) NOT NULL, `subscribe_cseq` INT(11) NOT NULL, + `server_id` INT(11) DEFAULT 0 NOT NULL, CONSTRAINT sca_subscriptions_idx UNIQUE (`subscriber`, `call_id`, `from_tag`, `to_tag`) ); -CREATE INDEX sca_expires_idx ON sca_subscriptions (`expires`); +CREATE INDEX sca_expires_idx ON sca_subscriptions (`server_id`, `expires`); CREATE INDEX sca_subscribers_idx ON sca_subscriptions (`subscriber`, `event`); -INSERT INTO version (table_name, table_version) values ('sca_subscriptions','1'); +INSERT INTO version (table_name, table_version) values ('sca_subscriptions','2'); diff --git a/utils/kamctl/oracle/sca-create.sql b/utils/kamctl/oracle/sca-create.sql index a91df4f322b..a9250fc3d1f 100644 --- a/utils/kamctl/oracle/sca-create.sql +++ b/utils/kamctl/oracle/sca-create.sql @@ -12,6 +12,7 @@ CREATE TABLE sca_subscriptions ( record_route CLOB, notify_cseq NUMBER(10), subscribe_cseq NUMBER(10), + server_id NUMBER(10) DEFAULT 0 NOT NULL, CONSTRAINT ORA_sca_subscriptions_idx UNIQUE (subscriber, call_id, from_tag, to_tag) ); @@ -23,8 +24,8 @@ END sca_subscriptions_tr; / BEGIN map2users('sca_subscriptions'); END; / -CREATE INDEX ORA_sca_expires_idx ON sca_subscriptions (expires); +CREATE INDEX ORA_sca_expires_idx ON sca_subscriptions (server_id, expires); CREATE INDEX ORA_sca_subscribers_idx ON sca_subscriptions (subscriber, event); -INSERT INTO version (table_name, table_version) values ('sca_subscriptions','1'); +INSERT INTO version (table_name, table_version) values ('sca_subscriptions','2'); diff --git a/utils/kamctl/postgres/sca-create.sql b/utils/kamctl/postgres/sca-create.sql index dde02834373..5792a73452d 100644 --- a/utils/kamctl/postgres/sca-create.sql +++ b/utils/kamctl/postgres/sca-create.sql @@ -12,11 +12,12 @@ CREATE TABLE sca_subscriptions ( record_route TEXT, notify_cseq INTEGER NOT NULL, subscribe_cseq INTEGER NOT NULL, + server_id INTEGER DEFAULT 0 NOT NULL, CONSTRAINT sca_subscriptions_sca_subscriptions_idx UNIQUE (subscriber, call_id, from_tag, to_tag) ); -CREATE INDEX sca_subscriptions_sca_expires_idx ON sca_subscriptions (expires); +CREATE INDEX sca_subscriptions_sca_expires_idx ON sca_subscriptions (server_id, expires); CREATE INDEX sca_subscriptions_sca_subscribers_idx ON sca_subscriptions (subscriber, event); -INSERT INTO version (table_name, table_version) values ('sca_subscriptions','1'); +INSERT INTO version (table_name, table_version) values ('sca_subscriptions','2'); diff --git a/utils/kamctl/xhttp_pi/pi_framework.xml b/utils/kamctl/xhttp_pi/pi_framework.xml index ddf2b2e36f9..6cad2907a09 100644 --- a/utils/kamctl/xhttp_pi/pi_framework.xml +++ b/utils/kamctl/xhttp_pi/pi_framework.xml @@ -709,6 +709,7 @@ record_routeDB1_BLOB notify_cseqDB1_INT subscribe_cseqDB1_INT + server_idDB1_INT @@ -3701,6 +3702,7 @@ record_route notify_cseq subscribe_cseq + server_id add @@ -3719,6 +3721,7 @@ record_route notify_cseq subscribe_cseq + server_id update @@ -3740,6 +3743,7 @@ record_route notify_cseq subscribe_cseq + server_id delete diff --git a/utils/kamctl/xhttp_pi/sca-mod b/utils/kamctl/xhttp_pi/sca-mod index db0b3e2dbdb..d774b40fdf2 100644 --- a/utils/kamctl/xhttp_pi/sca-mod +++ b/utils/kamctl/xhttp_pi/sca-mod @@ -17,6 +17,7 @@ record_route notify_cseq subscribe_cseq + server_id add @@ -35,6 +36,7 @@ record_route notify_cseq subscribe_cseq + server_id update @@ -56,6 +58,7 @@ record_route notify_cseq subscribe_cseq + server_id delete diff --git a/utils/kamctl/xhttp_pi/sca-table b/utils/kamctl/xhttp_pi/sca-table index 4b8ae673be3..811c3099179 100644 --- a/utils/kamctl/xhttp_pi/sca-table +++ b/utils/kamctl/xhttp_pi/sca-table @@ -15,4 +15,5 @@ record_routeDB1_BLOB notify_cseqDB1_INT subscribe_cseqDB1_INT + server_idDB1_INT