Add index on the pua table for peformance reasons.

Credits go to "lirakin" on IRC
OpenSIPS · Jul 1, 2014 · 59061f1 · 59061f1
1 parent f80f9fc
commit 59061f1
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 11 deletions.
diff --git a/db/schema/pr_pua.xml b/db/schema/pr_pua.xml
@@ -26,30 +26,30 @@
         <description>Unique ID</description>
     </column>
 
-    <column>
+    <column id="pres_uri">
         <name>pres_uri</name>
         <type>string</type>
         <size>&uri_len;</size>
         <description>URI</description>
         <natural/>
     </column>
 
-    <column>
+    <column id="pres_id">
         <name>pres_id</name>
         <type>string</type>
         <size>255</size>
         <description>ID</description>
     </column>
 
-    <column>
+    <column id="event">
         <name>event</name>
         <type>int</type>
         <size>11</size>
         <description>Event</description>
         <natural/>
     </column>
 
-    <column>
+    <column id="expires">
         <name>expires</name>
         <type>int</type>
         <size>&expires_len;</size>
@@ -63,7 +63,7 @@
         <description>Desired Expires</description>
     </column>
 
-    <column>
+    <column id="flag">
         <name>flag</name>
         <type>int</type>
         <size>&flag_len;</size>
@@ -170,4 +170,23 @@
         <description>Extra Headers</description>
     </column>
 
+    <index>
+        <name>del1_idx</name>
+        <colref linkend="pres_uri"/>
+        <colref linkend="event"/>
+    </index>
+
+    <index>
+        <name>del2_idx</name>
+        <colref linkend="expires"/>
+    </index>
+
+    <index>
+        <name>update_idx</name>
+        <colref linkend="pres_uri"/>
+        <colref linkend="pres_id"/>
+        <colref linkend="flag"/>
+        <colref linkend="event"/>
+    </index>
+
 </table>
diff --git a/modules/pua/hash.c b/modules/pua/hash.c
@@ -430,6 +430,12 @@ static void pua_db_delete(ua_pres_t* pres)
 	vals[n_query_cols].val.str_val = *pres->pres_uri;
 	n_query_cols++;
 
+	cols[n_query_cols] = &str_event_col;
+	vals[n_query_cols].type = DB_INT;
+	vals[n_query_cols].nul = 0;
+	vals[n_query_cols].val.int_val = pres->event;
+	n_query_cols++;
+
 	if(pres->flag)
 	{
 		cols[n_query_cols] = &str_flag_col;
@@ -439,12 +445,6 @@ static void pua_db_delete(ua_pres_t* pres)
 		n_query_cols++;
 	}
 
-	cols[n_query_cols] = &str_event_col;
-	vals[n_query_cols].type = DB_INT;
-	vals[n_query_cols].nul = 0;
-	vals[n_query_cols].val.int_val = pres->event;
-	n_query_cols++;
-
 	if(pres->id.s && pres->id.len)
 	{
 		cols[n_query_cols] = &str_pres_id_col;

diff --git a/scripts/mysql/presence-create.sql b/scripts/mysql/presence-create.sql
@@ -92,3 +92,7 @@ CREATE TABLE pua (
     extra_headers TEXT
 ) ENGINE=MyISAM;
 
+CREATE INDEX del1_idx ON pua (pres_uri, event);
+CREATE INDEX del2_idx ON pua (expires);
+CREATE INDEX update_idx ON pua (pres_uri, pres_id, flag, event);
+
diff --git a/scripts/oracle/presence-create.sql b/scripts/oracle/presence-create.sql
@@ -132,3 +132,7 @@ END pua_tr;
 /
 BEGIN map2users('pua'); END;
 /
+CREATE INDEX pua_del1_idx  ON pua (pres_uri, event);
+CREATE INDEX pua_del2_idx  ON pua (expires);
+CREATE INDEX pua_update_idx  ON pua (pres_uri, pres_id, flag, event);
+
diff --git a/scripts/postgres/presence-create.sql b/scripts/postgres/presence-create.sql
@@ -97,3 +97,7 @@ CREATE TABLE pua (
 );
 
 ALTER SEQUENCE pua_id_seq MAXVALUE 2147483647 CYCLE;
+CREATE INDEX pua_del1_idx ON pua (pres_uri, event);
+CREATE INDEX pua_del2_idx ON pua (expires);
+CREATE INDEX pua_update_idx ON pua (pres_uri, pres_id, flag, event);
+