[sr-dev] git:master: lib/srdb1/schema: Updated indices for rls_presentity and rls_watchers tables

[Peter Dunkley]

Module: sip-router
Branch: master
Commit: 1cdab1b92c7df5b9108e1dbb0059e955a6f5024e
URL:    http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1cdab1b92c7df5b9108e1dbb0059e955a6f5024e

Author: Peter Dunkley <peter.dunkley at crocodile-rcs.com>
Committer: Peter Dunkley <peter.dunkley at crocodile-rcs.com>
Date:   Mon Mar 19 16:08:30 2012 +0000

lib/srdb1/schema: Updated indices for rls_presentity and rls_watchers tables

- The rls_watchers table indices are now correct for DB-only mode

---

 lib/srdb1/schema/rls_presentity.xml |    9 +++++++++
 lib/srdb1/schema/rls_watchers.xml   |   26 ++++++++++++++++++++++----
 2 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/lib/srdb1/schema/rls_presentity.xml b/lib/srdb1/schema/rls_presentity.xml
index fc29c2d..ca7cf4a 100644
--- a/lib/srdb1/schema/rls_presentity.xml
+++ b/lib/srdb1/schema/rls_presentity.xml
@@ -89,8 +89,17 @@
     </index>
 
     <index>
+        <name>rlsubs_idx</name>
+        <colref linkend="rlsubs_did"/>
+    </index>
+
+    <index>
         <name>updated_idx</name>
         <colref linkend="updated"/>
     </index>
 
+    <index>
+        <name>expires_idx</name>
+        <colref linkend="expires"/>
+    </index>
 </table>
diff --git a/lib/srdb1/schema/rls_watchers.xml b/lib/srdb1/schema/rls_watchers.xml
index 3f67dc0..5db70b0 100644
--- a/lib/srdb1/schema/rls_watchers.xml
+++ b/lib/srdb1/schema/rls_watchers.xml
@@ -48,7 +48,7 @@
         <description>To domain</description>
     </column>
 
-    <column>
+    <column id="watcher_username">
         <name>watcher_username</name>
         <type>string</type>
         <size>&user_len;</size>
@@ -56,7 +56,7 @@
         <natural/>
     </column>
 
-    <column>
+    <column id="watcher_domain">
         <name>watcher_domain</name>
         <type>string</type>
         <size>&domain_len;</size>
@@ -64,7 +64,7 @@
         <natural/>
     </column>
 
-    <column>
+    <column id="event">
         <name>event</name>
         <type>string</type>
         <size>&user_len;</size>
@@ -129,7 +129,7 @@
         <description>Record route</description>
     </column>
 
-    <column>
+    <column id="expires">
         <name>expires</name>
         <type>int</type>
         <size>&expires_len;</size>
@@ -181,4 +181,22 @@
         <unique/>
     </index>
 
+    <index>
+        <name>rls_watchers_delete</name>
+        <colref linkend="callid"/>
+        <colref linkend="to_tag"/>
+    </index>
+
+    <index>
+        <name>rls_watchers_update</name>
+        <colref linkend="watcher_username"/>
+        <colref linkend="watcher_domain"/>
+        <colref linkend="event"/>
+    </index>
+
+    <index>
+        <name>rls_watchers_expires</name>
+        <colref linkend="expires"/>
+    </index>
+
 </table>