lib/srdb1: Updated constraints and indices for some of the presence tables

- Updated to match recent presence/pua/rls code changes
- Added new index on username, domain, and event to the presentity table
- Added unique constraint on etag, tuple_id, call_id, and from_tag to the pua table
- Added indices on (pres_id), (call_id, from_tag, to_tag), and (pres_id, pres_uri, call_id, from_tag) to the pua table
- Removed presentity uri from the rls_watcher table index

lib/srdb1/schema/pr_presentity.xml

@@ -98,4 +98,11 @@
         <colref linkend="expires"/>
     </index>
 
+    <index>
+        <name>account_idx</name>
+        <colref linkend="username"/>
+        <colref linkend="domain"/>
+        <colref linkend="event"/>
+    </index>
+
 </table>

lib/srdb1/schema/pr_pua.xml

@@ -26,7 +26,7 @@
         <description>Unique ID</description>
     </column>
 
-    <column>
+    <column id="pres_uri">
         <name>pres_uri</name>
         <type>string</type>
         <size>&uri_len;</size>
@@ -34,7 +34,7 @@
         <natural/>
     </column>
 
-    <column>
+    <column id="pres_id">
         <name>pres_id</name>
         <type>string</type>
         <size>255</size>
@@ -70,14 +70,14 @@
         <description>Flags</description>
     </column>
 
-    <column>
+    <column id="etag">
         <name>etag</name>
         <type>string</type>
         <size>&domain_len;</size>
         <description>Etag</description>
     </column>
 
-    <column>
+    <column id="tuple_id">
         <name>tuple_id</name>
         <type>string</type>
         <size>&domain_len;</size>
@@ -92,7 +92,7 @@
         <description>Watcher URI</description>
     </column>
 
-    <column>
+    <column id="call_id">
         <name>call_id</name>
         <type>string</type>
         <size>&callid_len;</size>
@@ -106,7 +106,7 @@
         <description>To tag</description>
     </column>
 
-    <column>
+    <column id="from_tag">
         <name>from_tag</name>
         <type>string</type>
         <size>&domain_len;</size>
@@ -151,4 +151,32 @@
         <description>Extra Headers</description>
     </column>
 
+    <index>
+        <name>pua_idx</name>
+        <colref linkend="etag"/>
+        <colref linkend="tuple_id"/>
+        <colref linkend="call_id"/>
+        <colref linkend="from_tag"/>
+	<unique/>
+    </index>
+
+   <index>
+        <name>presid_idx</name>
+        <colref linkend="pres_id"/>
+    </index>
+
+    <index>
+        <name>dialog_idx</name>
+        <colref linkend="call_id"/>
+        <colref linkend="from_tag"/>
+        <colref linkend="to_tag"/>
+    </index>
+
+    <index>
+        <name>tmp_dlg_idx</name>
+        <colref linkend="pres_id"/>
+        <colref linkend="pres_uri"/>
+        <colref linkend="call_id"/>
+        <colref linkend="from_tag"/>
+    </index>
 </table>

lib/srdb1/schema/rls_watchers.xml

@@ -175,7 +175,6 @@
 
     <index>
         <name>rls_watcher_idx</name>
-        <colref linkend="presentity_uri"/>
         <colref linkend="callid"/>
         <colref linkend="to_tag"/>
         <colref linkend="from_tag"/>

utils/kamctl/db_sqlite/presence-create.sql

@@ -13,6 +13,7 @@ CREATE TABLE presentity (
 );
 
 CREATE INDEX presentity_presentity_expires ON presentity (expires);
+CREATE INDEX presentity_account_idx ON presentity (username, domain, event);
 
 INSERT INTO version (table_name, table_version) values ('active_watchers','9');
 CREATE TABLE active_watchers (
@@ -91,6 +92,11 @@ CREATE TABLE pua (
     contact VARCHAR(128) NOT NULL,
     remote_contact VARCHAR(128) NOT NULL,
     version INTEGER NOT NULL,
-    extra_headers TEXT NOT NULL
+    extra_headers TEXT NOT NULL,
+    CONSTRAINT pua_pua_idx UNIQUE (etag, tuple_id, call_id, from_tag)
 );
 
+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);
+

utils/kamctl/db_sqlite/rls-create.sql

@@ -37,6 +37,6 @@ CREATE TABLE rls_watchers (
     version INTEGER DEFAULT 0 NOT NULL,
     socket_info VARCHAR(64) NOT NULL,
     local_contact VARCHAR(128) NOT NULL,
-    CONSTRAINT rls_watchers_rls_watcher_idx UNIQUE (presentity_uri, callid, to_tag, from_tag)
+    CONSTRAINT rls_watchers_rls_watcher_idx UNIQUE (callid, to_tag, from_tag)
 );
 

utils/kamctl/mysql/presence-create.sql

@@ -13,6 +13,7 @@ CREATE TABLE presentity (
 ) ENGINE=MyISAM;
 
 CREATE INDEX presentity_expires ON presentity (expires);
+CREATE INDEX account_idx ON presentity (username, domain, event);
 
 INSERT INTO version (table_name, table_version) values ('active_watchers','9');
 CREATE TABLE active_watchers (
@@ -91,6 +92,11 @@ CREATE TABLE pua (
     contact VARCHAR(128) NOT NULL,
     remote_contact VARCHAR(128) NOT NULL,
     version INT(11) NOT NULL,
-    extra_headers TEXT NOT NULL
+    extra_headers TEXT NOT NULL,
+    CONSTRAINT pua_idx UNIQUE (etag, tuple_id, call_id, from_tag)
 ) 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);
+

utils/kamctl/mysql/rls-create.sql

@@ -37,6 +37,6 @@ CREATE TABLE rls_watchers (
     version INT(11) DEFAULT 0 NOT NULL,
     socket_info VARCHAR(64) NOT NULL,
     local_contact VARCHAR(128) NOT NULL,
-    CONSTRAINT rls_watcher_idx UNIQUE (presentity_uri, callid, to_tag, from_tag)
+    CONSTRAINT rls_watcher_idx UNIQUE (callid, to_tag, from_tag)
 ) ENGINE=MyISAM;
 

utils/kamctl/oracle/presence-create.sql

@@ -21,6 +21,7 @@ END presentity_tr;
 BEGIN map2users('presentity'); END;
 /
 CREATE INDEX presentity_presentity_expires  ON presentity (expires);
+CREATE INDEX presentity_account_idx  ON presentity (username, domain, event);
 
 INSERT INTO version (table_name, table_version) values ('active_watchers','9');
 CREATE TABLE active_watchers (
@@ -123,7 +124,8 @@ CREATE TABLE pua (
     contact VARCHAR2(128),
     remote_contact VARCHAR2(128),
     version NUMBER(10),
-    extra_headers CLOB
+    extra_headers CLOB,
+    CONSTRAINT pua_pua_idx  UNIQUE (etag, tuple_id, call_id, from_tag)
 );
 
 CREATE OR REPLACE TRIGGER pua_tr
@@ -134,3 +136,7 @@ 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);
+

utils/kamctl/oracle/rls-create.sql

@@ -45,7 +45,7 @@ CREATE TABLE rls_watchers (
     version NUMBER(10) DEFAULT 0 NOT NULL,
     socket_info VARCHAR2(64),
     local_contact VARCHAR2(128),
-    CONSTRAINT rls_watchers_rls_watcher_idx  UNIQUE (presentity_uri, callid, to_tag, from_tag)
+    CONSTRAINT rls_watchers_rls_watcher_idx  UNIQUE (callid, to_tag, from_tag)
 );
 
 CREATE OR REPLACE TRIGGER rls_watchers_tr

utils/kamctl/postgres/presence-create.sql

@@ -13,6 +13,7 @@ CREATE TABLE presentity (
 );
 
 CREATE INDEX presentity_presentity_expires ON presentity (expires);
+CREATE INDEX presentity_account_idx ON presentity (username, domain, event);
 
 INSERT INTO version (table_name, table_version) values ('active_watchers','9');
 CREATE TABLE active_watchers (
@@ -91,6 +92,11 @@ CREATE TABLE pua (
     contact VARCHAR(128) NOT NULL,
     remote_contact VARCHAR(128) NOT NULL,
     version INTEGER NOT NULL,
-    extra_headers TEXT NOT NULL
+    extra_headers TEXT NOT NULL,
+    CONSTRAINT pua_pua_idx UNIQUE (etag, tuple_id, call_id, from_tag)
 );
 
+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);
+

utils/kamctl/postgres/rls-create.sql

@@ -37,6 +37,6 @@ CREATE TABLE rls_watchers (
     version INTEGER DEFAULT 0 NOT NULL,
     socket_info VARCHAR(64) NOT NULL,
     local_contact VARCHAR(128) NOT NULL,
-    CONSTRAINT rls_watchers_rls_watcher_idx UNIQUE (presentity_uri, callid, to_tag, from_tag)
+    CONSTRAINT rls_watchers_rls_watcher_idx UNIQUE (callid, to_tag, from_tag)
 );