From a786c3f4a108f7df94cb555ee25444227c7e5c3b Mon Sep 17 00:00:00 2001 From: Daniel-Constantin Mierla Date: Fri, 8 May 2015 09:55:44 +0200 Subject: [PATCH] kamctl: get aliases table db scripts up to date --- utils/kamctl/db_berkeley/kamailio/aliases | 4 ++-- utils/kamctl/db_berkeley/kamailio/version | 2 +- utils/kamctl/db_sqlite/registrar-create.sql | 11 ++++++++--- utils/kamctl/dbtext/kamailio/aliases | 2 +- utils/kamctl/dbtext/kamailio/version | 2 +- utils/kamctl/mysql/registrar-create.sql | 11 ++++++++--- utils/kamctl/oracle/registrar-create.sql | 11 ++++++++--- utils/kamctl/postgres/registrar-create.sql | 11 ++++++++--- utils/kamctl/xhttp_pi/pi_framework.xml | 16 ++++++++++++++++ utils/kamctl/xhttp_pi/registrar-mod | 12 ++++++++++++ utils/kamctl/xhttp_pi/registrar-table | 4 ++++ 11 files changed, 69 insertions(+), 17 deletions(-) diff --git a/utils/kamctl/db_berkeley/kamailio/aliases b/utils/kamctl/db_berkeley/kamailio/aliases index 54a12f66a78..947d7bd88cd 100644 --- a/utils/kamctl/db_berkeley/kamailio/aliases +++ b/utils/kamctl/db_berkeley/kamailio/aliases @@ -1,5 +1,5 @@ METADATA_COLUMNS -id(int) ruid(str) username(str) domain(str) contact(str) received(str) path(str) expires(datetime) q(double) callid(str) cseq(int) last_modified(datetime) flags(int) cflags(int) user_agent(str) socket(str) methods(int) instance(str) reg_id(int) +id(int) ruid(str) username(str) domain(str) contact(str) received(str) path(str) expires(datetime) q(double) callid(str) cseq(int) last_modified(datetime) flags(int) cflags(int) user_agent(str) socket(str) methods(int) instance(str) reg_id(int) server_id(int) connection_id(int) keepalive(int) partition(int) METADATA_KEY 1 2 3 METADATA_READONLY @@ -7,4 +7,4 @@ METADATA_READONLY METADATA_LOGFLAGS 0 METADATA_DEFAULTS -NIL|''|''|NULL|''|NULL|NULL|'2030-05-28 21:32:15'|1.0|'Default-Call-ID'|1|'1900-01-01 00:00:01'|0|0|''|NULL|NULL|NULL|0 +NIL|''|''|NULL|''|NULL|NULL|'2030-05-28 21:32:15'|1.0|'Default-Call-ID'|1|'1900-01-01 00:00:01'|0|0|''|NULL|NULL|NULL|0|0|0|0|0 diff --git a/utils/kamctl/db_berkeley/kamailio/version b/utils/kamctl/db_berkeley/kamailio/version index d4bd56ca360..a3495136b7d 100644 --- a/utils/kamctl/db_berkeley/kamailio/version +++ b/utils/kamctl/db_berkeley/kamailio/version @@ -17,7 +17,7 @@ active_watchers|11 address| address|6 aliases| -aliases|6 +aliases|8 carrier_name| carrier_name|1 carrierfailureroute| diff --git a/utils/kamctl/db_sqlite/registrar-create.sql b/utils/kamctl/db_sqlite/registrar-create.sql index b32d61c7b9c..d7816c24f90 100644 --- a/utils/kamctl/db_sqlite/registrar-create.sql +++ b/utils/kamctl/db_sqlite/registrar-create.sql @@ -1,4 +1,4 @@ -INSERT INTO version (table_name, table_version) values ('aliases','6'); +INSERT INTO version (table_name, table_version) values ('aliases','8'); CREATE TABLE aliases ( id INTEGER PRIMARY KEY NOT NULL, ruid VARCHAR(64) DEFAULT '' NOT NULL, @@ -6,7 +6,7 @@ CREATE TABLE aliases ( domain VARCHAR(64) DEFAULT NULL, contact VARCHAR(255) DEFAULT '' NOT NULL, received VARCHAR(128) DEFAULT NULL, - path VARCHAR(128) DEFAULT NULL, + path VARCHAR(512) DEFAULT NULL, expires TIMESTAMP WITHOUT TIME ZONE DEFAULT '2030-05-28 21:32:15' NOT NULL, q REAL DEFAULT 1.0 NOT NULL, callid VARCHAR(255) DEFAULT 'Default-Call-ID' NOT NULL, @@ -19,8 +19,13 @@ CREATE TABLE aliases ( methods INTEGER DEFAULT NULL, instance VARCHAR(255) DEFAULT NULL, reg_id INTEGER DEFAULT 0 NOT NULL, + server_id INTEGER DEFAULT 0 NOT NULL, + connection_id INTEGER DEFAULT 0 NOT NULL, + keepalive INTEGER DEFAULT 0 NOT NULL, + partition INTEGER DEFAULT 0 NOT NULL, CONSTRAINT aliases_ruid_idx UNIQUE (ruid) ); -CREATE INDEX aliases_alias_idx ON aliases (username, domain, contact); +CREATE INDEX aliases_account_contact_idx ON aliases (username, domain, contact); +CREATE INDEX aliases_expires_idx ON aliases (expires); diff --git a/utils/kamctl/dbtext/kamailio/aliases b/utils/kamctl/dbtext/kamailio/aliases index f3f0c72470d..6a08f3c0176 100644 --- a/utils/kamctl/dbtext/kamailio/aliases +++ b/utils/kamctl/dbtext/kamailio/aliases @@ -1 +1 @@ -id(int,auto) ruid(string) username(string) domain(string,null) contact(string) received(string,null) path(string,null) expires(int) q(double) callid(string) cseq(int) last_modified(int) flags(int) cflags(int) user_agent(string) socket(string,null) methods(int,null) instance(string,null) reg_id(int) +id(int,auto) ruid(string) username(string) domain(string,null) contact(string) received(string,null) path(string,null) expires(int) q(double) callid(string) cseq(int) last_modified(int) flags(int) cflags(int) user_agent(string) socket(string,null) methods(int,null) instance(string,null) reg_id(int) server_id(int) connection_id(int) keepalive(int) partition(int) diff --git a/utils/kamctl/dbtext/kamailio/version b/utils/kamctl/dbtext/kamailio/version index d82c69b5f2d..3d92d612a39 100644 --- a/utils/kamctl/dbtext/kamailio/version +++ b/utils/kamctl/dbtext/kamailio/version @@ -3,7 +3,7 @@ acc:5 acc_cdrs:2 active_watchers:11 address:6 -aliases:6 +aliases:8 carrier_name:1 carrierfailureroute:2 carrierroute:3 diff --git a/utils/kamctl/mysql/registrar-create.sql b/utils/kamctl/mysql/registrar-create.sql index 5d9254ed7ea..fa0cffd3f26 100644 --- a/utils/kamctl/mysql/registrar-create.sql +++ b/utils/kamctl/mysql/registrar-create.sql @@ -1,4 +1,4 @@ -INSERT INTO version (table_name, table_version) values ('aliases','6'); +INSERT INTO version (table_name, table_version) values ('aliases','8'); CREATE TABLE aliases ( id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL, ruid VARCHAR(64) DEFAULT '' NOT NULL, @@ -6,7 +6,7 @@ CREATE TABLE aliases ( domain VARCHAR(64) DEFAULT NULL, contact VARCHAR(255) DEFAULT '' NOT NULL, received VARCHAR(128) DEFAULT NULL, - path VARCHAR(128) DEFAULT NULL, + path VARCHAR(512) DEFAULT NULL, expires DATETIME DEFAULT '2030-05-28 21:32:15' NOT NULL, q FLOAT(10,2) DEFAULT 1.0 NOT NULL, callid VARCHAR(255) DEFAULT 'Default-Call-ID' NOT NULL, @@ -19,8 +19,13 @@ CREATE TABLE aliases ( methods INT(11) DEFAULT NULL, instance VARCHAR(255) DEFAULT NULL, reg_id INT(11) DEFAULT 0 NOT NULL, + server_id INT(11) DEFAULT 0 NOT NULL, + connection_id INT(11) DEFAULT 0 NOT NULL, + keepalive INT(11) DEFAULT 0 NOT NULL, + partition INT(11) DEFAULT 0 NOT NULL, CONSTRAINT ruid_idx UNIQUE (ruid) ); -CREATE INDEX alias_idx ON aliases (username, domain, contact); +CREATE INDEX account_contact_idx ON aliases (username, domain, contact); +CREATE INDEX expires_idx ON aliases (expires); diff --git a/utils/kamctl/oracle/registrar-create.sql b/utils/kamctl/oracle/registrar-create.sql index 346564d6c73..728b9383f3b 100644 --- a/utils/kamctl/oracle/registrar-create.sql +++ b/utils/kamctl/oracle/registrar-create.sql @@ -1,4 +1,4 @@ -INSERT INTO version (table_name, table_version) values ('aliases','6'); +INSERT INTO version (table_name, table_version) values ('aliases','8'); CREATE TABLE aliases ( id NUMBER(10) PRIMARY KEY, ruid VARCHAR2(64) DEFAULT '', @@ -6,7 +6,7 @@ CREATE TABLE aliases ( domain VARCHAR2(64) DEFAULT NULL, contact VARCHAR2(255) DEFAULT '', received VARCHAR2(128) DEFAULT NULL, - path VARCHAR2(128) DEFAULT NULL, + path VARCHAR2(512) DEFAULT NULL, expires DATE DEFAULT to_date('2030-05-28 21:32:15','yyyy-mm-dd hh24:mi:ss'), q NUMBER(10,2) DEFAULT 1.0 NOT NULL, callid VARCHAR2(255) DEFAULT 'Default-Call-ID', @@ -19,6 +19,10 @@ CREATE TABLE aliases ( methods NUMBER(10) DEFAULT NULL, instance VARCHAR2(255) DEFAULT NULL, reg_id NUMBER(10) DEFAULT 0 NOT NULL, + server_id NUMBER(10) DEFAULT 0 NOT NULL, + connection_id NUMBER(10) DEFAULT 0 NOT NULL, + keepalive NUMBER(10) DEFAULT 0 NOT NULL, + partition NUMBER(10) DEFAULT 0 NOT NULL, CONSTRAINT aliases_ruid_idx UNIQUE (ruid) ); @@ -30,5 +34,6 @@ END aliases_tr; / BEGIN map2users('aliases'); END; / -CREATE INDEX aliases_alias_idx ON aliases (username, domain, contact); +CREATE INDEX aliases_account_contact_idx ON aliases (username, domain, contact); +CREATE INDEX aliases_expires_idx ON aliases (expires); diff --git a/utils/kamctl/postgres/registrar-create.sql b/utils/kamctl/postgres/registrar-create.sql index 11306cf83b1..21aba71886c 100644 --- a/utils/kamctl/postgres/registrar-create.sql +++ b/utils/kamctl/postgres/registrar-create.sql @@ -1,4 +1,4 @@ -INSERT INTO version (table_name, table_version) values ('aliases','6'); +INSERT INTO version (table_name, table_version) values ('aliases','8'); CREATE TABLE aliases ( id SERIAL PRIMARY KEY NOT NULL, ruid VARCHAR(64) DEFAULT '' NOT NULL, @@ -6,7 +6,7 @@ CREATE TABLE aliases ( domain VARCHAR(64) DEFAULT NULL, contact VARCHAR(255) DEFAULT '' NOT NULL, received VARCHAR(128) DEFAULT NULL, - path VARCHAR(128) DEFAULT NULL, + path VARCHAR(512) DEFAULT NULL, expires TIMESTAMP WITHOUT TIME ZONE DEFAULT '2030-05-28 21:32:15' NOT NULL, q REAL DEFAULT 1.0 NOT NULL, callid VARCHAR(255) DEFAULT 'Default-Call-ID' NOT NULL, @@ -19,8 +19,13 @@ CREATE TABLE aliases ( methods INTEGER DEFAULT NULL, instance VARCHAR(255) DEFAULT NULL, reg_id INTEGER DEFAULT 0 NOT NULL, + server_id INTEGER DEFAULT 0 NOT NULL, + connection_id INTEGER DEFAULT 0 NOT NULL, + keepalive INTEGER DEFAULT 0 NOT NULL, + partition INTEGER DEFAULT 0 NOT NULL, CONSTRAINT aliases_ruid_idx UNIQUE (ruid) ); -CREATE INDEX aliases_alias_idx ON aliases (username, domain, contact); +CREATE INDEX aliases_account_contact_idx ON aliases (username, domain, contact); +CREATE INDEX aliases_expires_idx ON aliases (expires); diff --git a/utils/kamctl/xhttp_pi/pi_framework.xml b/utils/kamctl/xhttp_pi/pi_framework.xml index 1ff107e0209..d0583be6f3f 100644 --- a/utils/kamctl/xhttp_pi/pi_framework.xml +++ b/utils/kamctl/xhttp_pi/pi_framework.xml @@ -619,6 +619,10 @@ methodsDB1_INT instanceDB1_STR reg_idDB1_INT + server_idDB1_INT + connection_idDB1_INT + keepaliveDB1_INT + partitionDB1_INT @@ -3289,6 +3293,10 @@ methods instance reg_id + server_id + connection_id + keepalive + partition add @@ -3313,6 +3321,10 @@ methods instance reg_id + server_id + connection_id + keepalive + partition update @@ -3340,6 +3352,10 @@ methods instance reg_id + server_id + connection_id + keepalive + partition delete diff --git a/utils/kamctl/xhttp_pi/registrar-mod b/utils/kamctl/xhttp_pi/registrar-mod index 76733aead63..747675fc6a0 100644 --- a/utils/kamctl/xhttp_pi/registrar-mod +++ b/utils/kamctl/xhttp_pi/registrar-mod @@ -23,6 +23,10 @@ methods instance reg_id + server_id + connection_id + keepalive + partition add @@ -47,6 +51,10 @@ methods instance reg_id + server_id + connection_id + keepalive + partition update @@ -74,6 +82,10 @@ methods instance reg_id + server_id + connection_id + keepalive + partition delete diff --git a/utils/kamctl/xhttp_pi/registrar-table b/utils/kamctl/xhttp_pi/registrar-table index d4afc82d3ed..58dd49fe9c1 100644 --- a/utils/kamctl/xhttp_pi/registrar-table +++ b/utils/kamctl/xhttp_pi/registrar-table @@ -21,4 +21,8 @@ methodsDB1_INT instanceDB1_STR reg_idDB1_INT + server_idDB1_INT + connection_idDB1_INT + keepaliveDB1_INT + partitionDB1_INT