utils/kamctl: rebuilt .sql files to reflect changes to pua, rls, and xcap tables

utils/kamctl/db_sqlite/presence-create.sql

@@ -59,20 +59,20 @@ CREATE TABLE watchers (
 
 INSERT INTO version (table_name, table_version) values ('xcap','4');
 CREATE TABLE xcap (
-    id INTEGER PRIMARY KEY NOT NULL,
+    id INTEGER NOT NULL,
     username VARCHAR(64) NOT NULL,
     domain VARCHAR(64) NOT NULL,
     doc BYTEA NOT NULL,
     doc_type INTEGER NOT NULL,
     etag VARCHAR(64) NOT NULL,
     source INTEGER NOT NULL,
-    doc_uri VARCHAR(255) NOT NULL,
+    doc_uri VARCHAR(255) PRIMARY KEY NOT NULL,
     port INTEGER NOT NULL,
-    CONSTRAINT xcap_account_doc_type_idx UNIQUE (username, domain, doc_type, doc_uri)
+    CONSTRAINT xcap_account_doc_type_idx UNIQUE (username, domain, doc_type),
+    CONSTRAINT xcap_account_doc_type_uri_idx UNIQUE (username, domain, doc_type, doc_uri),
+    CONSTRAINT xcap_account_doc_uri_idx UNIQUE (username, domain, doc_uri)
 );
 
-CREATE INDEX xcap_source_idx ON xcap (source);
-
 INSERT INTO version (table_name, table_version) values ('pua','7');
 CREATE TABLE pua (
     id INTEGER PRIMARY KEY NOT NULL,
@@ -94,10 +94,14 @@ CREATE TABLE pua (
     remote_contact VARCHAR(128) NOT NULL,
     version INTEGER NOT NULL,
     extra_headers TEXT NOT NULL,
-    CONSTRAINT pua_pua_idx UNIQUE (etag, tuple_id, call_id, from_tag)
+    CONSTRAINT pua_pua_idx UNIQUE (etag, tuple_id, call_id, from_tag),
+    CONSTRAINT pua_expires_idx UNIQUE (expires)
 );
 
-CREATE INDEX pua_presid_idx ON pua (pres_id);
-CREATE INDEX pua_dialog_idx ON pua (call_id, from_tag, to_tag);
-CREATE INDEX pua_tmp_dlg_idx ON pua (pres_id, pres_uri, call_id, from_tag);
+CREATE INDEX pua_dialog1_idx ON pua (call_id, from_tag, to_tag);
+CREATE INDEX pua_dialog2_idx ON pua (pres_id, pres_uri);
+CREATE INDEX pua_tmp_dlg1_idx ON pua (call_id, from_tag);
+CREATE INDEX pua_tmp_dlg2_idx ON pua (pres_id, pres_uri, call_id, from_tag);
+CREATE INDEX pua_tmp_record1_idx ON pua (pres_id);
+CREATE INDEX pua_tmp_record2_idx ON pua (pres_id, etag);
 

utils/kamctl/db_sqlite/rls-create.sql

@@ -12,7 +12,9 @@ CREATE TABLE rls_presentity (
     CONSTRAINT rls_presentity_rls_presentity_idx UNIQUE (rlsubs_did, resource_uri)
 );
 
+CREATE INDEX rls_presentity_rlsubs_idx ON rls_presentity (rlsubs_did);
 CREATE INDEX rls_presentity_updated_idx ON rls_presentity (updated);
+CREATE INDEX rls_presentity_expires_idx ON rls_presentity (expires);
 
 INSERT INTO version (table_name, table_version) values ('rls_watchers','1');
 CREATE TABLE rls_watchers (
@@ -40,3 +42,7 @@ CREATE TABLE rls_watchers (
     CONSTRAINT rls_watchers_rls_watcher_idx UNIQUE (callid, to_tag, from_tag)
 );
 
+CREATE INDEX rls_watchers_rls_watchers_delete ON rls_watchers (callid, to_tag);
+CREATE INDEX rls_watchers_rls_watchers_update ON rls_watchers (watcher_username, watcher_domain, event);
+CREATE INDEX rls_watchers_rls_watchers_expires ON rls_watchers (expires);
+

utils/kamctl/mysql/presence-create.sql

@@ -59,20 +59,20 @@ CREATE TABLE watchers (
 
 INSERT INTO version (table_name, table_version) values ('xcap','4');
 CREATE TABLE xcap (
-    id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
+    id INT(10) UNSIGNED AUTO_INCREMENT NOT NULL,
     username VARCHAR(64) NOT NULL,
     domain VARCHAR(64) NOT NULL,
     doc MEDIUMBLOB NOT NULL,
     doc_type INT(11) NOT NULL,
     etag VARCHAR(64) NOT NULL,
     source INT(11) NOT NULL,
-    doc_uri VARCHAR(255) NOT NULL,
+    doc_uri VARCHAR(255) PRIMARY KEY NOT NULL,
     port INT(11) NOT NULL,
-    CONSTRAINT account_doc_type_idx UNIQUE (username, domain, doc_type, doc_uri)
+    CONSTRAINT account_doc_type_idx UNIQUE (username, domain, doc_type),
+    CONSTRAINT account_doc_type_uri_idx UNIQUE (username, domain, doc_type, doc_uri),
+    CONSTRAINT account_doc_uri_idx UNIQUE (username, domain, doc_uri)
 ) ENGINE=MyISAM;
 
-CREATE INDEX source_idx ON xcap (source);
-
 INSERT INTO version (table_name, table_version) values ('pua','7');
 CREATE TABLE pua (
     id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
@@ -94,10 +94,14 @@ CREATE TABLE pua (
     remote_contact VARCHAR(128) NOT NULL,
     version INT(11) NOT NULL,
     extra_headers TEXT NOT NULL,
-    CONSTRAINT pua_idx UNIQUE (etag, tuple_id, call_id, from_tag)
+    CONSTRAINT pua_idx UNIQUE (etag, tuple_id, call_id, from_tag),
+    CONSTRAINT expires_idx UNIQUE (expires)
 ) ENGINE=MyISAM;
 
-CREATE INDEX presid_idx ON pua (pres_id);
-CREATE INDEX dialog_idx ON pua (call_id, from_tag, to_tag);
-CREATE INDEX tmp_dlg_idx ON pua (pres_id, pres_uri, call_id, from_tag);
+CREATE INDEX dialog1_idx ON pua (call_id, from_tag, to_tag);
+CREATE INDEX dialog2_idx ON pua (pres_id, pres_uri);
+CREATE INDEX tmp_dlg1_idx ON pua (call_id, from_tag);
+CREATE INDEX tmp_dlg2_idx ON pua (pres_id, pres_uri, call_id, from_tag);
+CREATE INDEX tmp_record1_idx ON pua (pres_id);
+CREATE INDEX tmp_record2_idx ON pua (pres_id, etag);
 

utils/kamctl/mysql/rls-create.sql

@@ -12,7 +12,9 @@ CREATE TABLE rls_presentity (
     CONSTRAINT rls_presentity_idx UNIQUE (rlsubs_did, resource_uri)
 ) ENGINE=MyISAM;
 
+CREATE INDEX rlsubs_idx ON rls_presentity (rlsubs_did);
 CREATE INDEX updated_idx ON rls_presentity (updated);
+CREATE INDEX expires_idx ON rls_presentity (expires);
 
 INSERT INTO version (table_name, table_version) values ('rls_watchers','1');
 CREATE TABLE rls_watchers (
@@ -40,3 +42,7 @@ CREATE TABLE rls_watchers (
     CONSTRAINT rls_watcher_idx UNIQUE (callid, to_tag, from_tag)
 ) ENGINE=MyISAM;
 
+CREATE INDEX rls_watchers_delete ON rls_watchers (callid, to_tag);
+CREATE INDEX rls_watchers_update ON rls_watchers (watcher_username, watcher_domain, event);
+CREATE INDEX rls_watchers_expires ON rls_watchers (expires);
+

utils/kamctl/oracle/presence-create.sql

@@ -83,16 +83,18 @@ BEGIN map2users('watchers'); END;
 /
 INSERT INTO version (table_name, table_version) values ('xcap','4');
 CREATE TABLE xcap (
-    id NUMBER(10) PRIMARY KEY,
+    id NUMBER(10),
     username VARCHAR2(64),
     domain VARCHAR2(64),
     doc BLOB,
     doc_type NUMBER(10),
     etag VARCHAR2(64),
     source NUMBER(10),
-    doc_uri VARCHAR2(255),
+    doc_uri VARCHAR2(255) PRIMARY KEY,
     port NUMBER(10),
-    CONSTRAINT xcap_account_doc_type_idx  UNIQUE (username, domain, doc_type, doc_uri)
+    CONSTRAINT xcap_account_doc_type_idx  UNIQUE (username, domain, doc_type),
+    CONSTRAINT xcap_account_doc_type_uri_idx  UNIQUE (username, domain, doc_type, doc_uri),
+    CONSTRAINT xcap_account_doc_uri_idx  UNIQUE (username, domain, doc_uri)
 );
 
 CREATE OR REPLACE TRIGGER xcap_tr
@@ -103,8 +105,6 @@ END xcap_tr;
 /
 BEGIN map2users('xcap'); END;
 /
-CREATE INDEX xcap_source_idx  ON xcap (source);
-
 INSERT INTO version (table_name, table_version) values ('pua','7');
 CREATE TABLE pua (
     id NUMBER(10) PRIMARY KEY,
@@ -126,7 +126,8 @@ CREATE TABLE pua (
     remote_contact VARCHAR2(128),
     version NUMBER(10),
     extra_headers CLOB,
-    CONSTRAINT pua_pua_idx  UNIQUE (etag, tuple_id, call_id, from_tag)
+    CONSTRAINT pua_pua_idx  UNIQUE (etag, tuple_id, call_id, from_tag),
+    CONSTRAINT pua_expires_idx  UNIQUE (expires)
 );
 
 CREATE OR REPLACE TRIGGER pua_tr
@@ -137,7 +138,10 @@ END pua_tr;
 /
 BEGIN map2users('pua'); END;
 /
-CREATE INDEX pua_presid_idx  ON pua (pres_id);
-CREATE INDEX pua_dialog_idx  ON pua (call_id, from_tag, to_tag);
-CREATE INDEX pua_tmp_dlg_idx  ON pua (pres_id, pres_uri, call_id, from_tag);
+CREATE INDEX pua_dialog1_idx  ON pua (call_id, from_tag, to_tag);
+CREATE INDEX pua_dialog2_idx  ON pua (pres_id, pres_uri);
+CREATE INDEX pua_tmp_dlg1_idx  ON pua (call_id, from_tag);
+CREATE INDEX pua_tmp_dlg2_idx  ON pua (pres_id, pres_uri, call_id, from_tag);
+CREATE INDEX pua_tmp_record1_idx  ON pua (pres_id);
+CREATE INDEX pua_tmp_record2_idx  ON pua (pres_id, etag);
 

utils/kamctl/oracle/rls-create.sql

@@ -20,7 +20,9 @@ END rls_presentity_tr;
 /
 BEGIN map2users('rls_presentity'); END;
 /
+CREATE INDEX rls_presentity_rlsubs_idx  ON rls_presentity (rlsubs_did);
 CREATE INDEX rls_presentity_updated_idx  ON rls_presentity (updated);
+CREATE INDEX rls_presentity_expires_idx  ON rls_presentity (expires);
 
 INSERT INTO version (table_name, table_version) values ('rls_watchers','1');
 CREATE TABLE rls_watchers (
@@ -56,3 +58,7 @@ END rls_watchers_tr;
 /
 BEGIN map2users('rls_watchers'); END;
 /
+CREATE INDEX ORA_rls_watchers_delete  ON rls_watchers (callid, to_tag);
+CREATE INDEX ORA_rls_watchers_update  ON rls_watchers (watcher_username, watcher_domain, event);
+CREATE INDEX ORA_rls_watchers_expires  ON rls_watchers (expires);
+

utils/kamctl/postgres/presence-create.sql

@@ -59,20 +59,20 @@ CREATE TABLE watchers (
 
 INSERT INTO version (table_name, table_version) values ('xcap','4');
 CREATE TABLE xcap (
-    id SERIAL PRIMARY KEY NOT NULL,
+    id SERIAL NOT NULL,
     username VARCHAR(64) NOT NULL,
     domain VARCHAR(64) NOT NULL,
     doc BYTEA NOT NULL,
     doc_type INTEGER NOT NULL,
     etag VARCHAR(64) NOT NULL,
     source INTEGER NOT NULL,
-    doc_uri VARCHAR(255) NOT NULL,
+    doc_uri VARCHAR(255) PRIMARY KEY NOT NULL,
     port INTEGER NOT NULL,
-    CONSTRAINT xcap_account_doc_type_idx UNIQUE (username, domain, doc_type, doc_uri)
+    CONSTRAINT xcap_account_doc_type_idx UNIQUE (username, domain, doc_type),
+    CONSTRAINT xcap_account_doc_type_uri_idx UNIQUE (username, domain, doc_type, doc_uri),
+    CONSTRAINT xcap_account_doc_uri_idx UNIQUE (username, domain, doc_uri)
 );
 
-CREATE INDEX xcap_source_idx ON xcap (source);
-
 INSERT INTO version (table_name, table_version) values ('pua','7');
 CREATE TABLE pua (
     id SERIAL PRIMARY KEY NOT NULL,
@@ -94,10 +94,14 @@ CREATE TABLE pua (
     remote_contact VARCHAR(128) NOT NULL,
     version INTEGER NOT NULL,
     extra_headers TEXT NOT NULL,
-    CONSTRAINT pua_pua_idx UNIQUE (etag, tuple_id, call_id, from_tag)
+    CONSTRAINT pua_pua_idx UNIQUE (etag, tuple_id, call_id, from_tag),
+    CONSTRAINT pua_expires_idx UNIQUE (expires)
 );
 
-CREATE INDEX pua_presid_idx ON pua (pres_id);
-CREATE INDEX pua_dialog_idx ON pua (call_id, from_tag, to_tag);
-CREATE INDEX pua_tmp_dlg_idx ON pua (pres_id, pres_uri, call_id, from_tag);
+CREATE INDEX pua_dialog1_idx ON pua (call_id, from_tag, to_tag);
+CREATE INDEX pua_dialog2_idx ON pua (pres_id, pres_uri);
+CREATE INDEX pua_tmp_dlg1_idx ON pua (call_id, from_tag);
+CREATE INDEX pua_tmp_dlg2_idx ON pua (pres_id, pres_uri, call_id, from_tag);
+CREATE INDEX pua_tmp_record1_idx ON pua (pres_id);
+CREATE INDEX pua_tmp_record2_idx ON pua (pres_id, etag);
 

utils/kamctl/postgres/rls-create.sql

@@ -12,7 +12,9 @@ CREATE TABLE rls_presentity (
     CONSTRAINT rls_presentity_rls_presentity_idx UNIQUE (rlsubs_did, resource_uri)
 );
 
+CREATE INDEX rls_presentity_rlsubs_idx ON rls_presentity (rlsubs_did);
 CREATE INDEX rls_presentity_updated_idx ON rls_presentity (updated);
+CREATE INDEX rls_presentity_expires_idx ON rls_presentity (expires);
 
 INSERT INTO version (table_name, table_version) values ('rls_watchers','1');
 CREATE TABLE rls_watchers (
@@ -40,3 +42,7 @@ CREATE TABLE rls_watchers (
     CONSTRAINT rls_watchers_rls_watcher_idx UNIQUE (callid, to_tag, from_tag)
 );
 
+CREATE INDEX rls_watchers_rls_watchers_delete ON rls_watchers (callid, to_tag);
+CREATE INDEX rls_watchers_rls_watchers_update ON rls_watchers (watcher_username, watcher_domain, event);
+CREATE INDEX rls_watchers_rls_watchers_expires ON rls_watchers (expires);
+