Updated DB schema for dispatcher in order to reflect latest changes (…

…state persistency)
OpenSIPS · Dec 2, 2013 · bd1b78e · bd1b78e
1 parent 3583ab2
commit bd1b78e
Show file tree

Hide file tree

Showing 12 changed files with 23 additions and 23 deletions.
diff --git a/db/schema/dispatcher.xml b/db/schema/dispatcher.xml
@@ -9,7 +9,7 @@
 
 <table id="dispatcher" xmlns:db="http://docbook.org/ns/docbook">
     <name>dispatcher</name>
-    <version>5</version>
+    <version>6</version>
     <type db="mysql">&MYSQL_TABLE_TYPE;</type>
     <description>
         <db:para>This table is used by the dispatcher module. It contains the sets of destinations used for load balancing and dispatching. More information about the dispatcher module can be found at: &OPENSIPS_MOD_DOC;dispatcher.html
@@ -53,10 +53,10 @@
         </description>
     </column>
 
-    <column id="flags">
-        <name>flags</name>
+    <column>
+        <name>state</name>
         <type>int</type>
-        <description>Flags of destination SIP address</description>
+        <description>The state of the destination (0 enabled, 1 disabled , 2 probing)</description>
         <default>0</default>
         <natural/>
     </column>

diff --git a/modules/dispatcher/dispatch.c b/modules/dispatcher/dispatch.c
@@ -67,7 +67,7 @@
 
 #include "dispatch.h"
 
-#define DS_TABLE_VERSION	5
+#define DS_TABLE_VERSION	6
 
 extern struct socket_info *probing_sock;
 extern event_id_t dispatch_evi_id;

diff --git a/scripts/db_berkeley/opensips/dispatcher b/scripts/db_berkeley/opensips/dispatcher
@@ -1,5 +1,5 @@
 METADATA_COLUMNS
-id(int) setid(int) destination(str) socket(str) flags(int) weight(int) attrs(str) description(str)
+id(int) setid(int) destination(str) socket(str) state(int) weight(int) attrs(str) description(str)
 METADATA_KEY
 1 4 5 
 METADATA_READONLY

diff --git a/scripts/db_berkeley/opensips/version b/scripts/db_berkeley/opensips/version
@@ -49,7 +49,7 @@ carrierfailureroute|2
 watchers|
 watchers|4
 dispatcher|
-dispatcher|5
+dispatcher|6
 domain|
 domain|2
 registrant|

diff --git a/scripts/dbtext/opensips/dispatcher b/scripts/dbtext/opensips/dispatcher
@@ -1 +1 @@
-id(int,auto) setid(int) destination(string) socket(string,null) flags(int) weight(int) attrs(string) description(string) 
+id(int,auto) setid(int) destination(string) socket(string,null) state(int) weight(int) attrs(string) description(string) 
diff --git a/scripts/dbtext/opensips/version b/scripts/dbtext/opensips/version
@@ -19,7 +19,7 @@ address:5
 dr_carriers:1
 carrierfailureroute:2
 watchers:4
-dispatcher:5
+dispatcher:6
 domain:2
 registrant:1
 imc_rooms:2

diff --git a/scripts/mysql/dispatcher-create.sql b/scripts/mysql/dispatcher-create.sql
@@ -1,10 +1,10 @@
-INSERT INTO version (table_name, table_version) values ('dispatcher','5');
+INSERT INTO version (table_name, table_version) values ('dispatcher','6');
 CREATE TABLE dispatcher (
     id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL,
     setid INT DEFAULT 0 NOT NULL,
     destination CHAR(192) DEFAULT '' NOT NULL,
     socket CHAR(128) DEFAULT NULL,
-    flags INT DEFAULT 0 NOT NULL,
+    state INT DEFAULT 0 NOT NULL,
     weight INT DEFAULT 1 NOT NULL,
     attrs CHAR(128) DEFAULT '' NOT NULL,
     description CHAR(64) DEFAULT '' NOT NULL

diff --git a/scripts/oracle/dispatcher-create.sql b/scripts/oracle/dispatcher-create.sql
@@ -1,10 +1,10 @@
-INSERT INTO version (table_name, table_version) values ('dispatcher','5');
+INSERT INTO version (table_name, table_version) values ('dispatcher','6');
 CREATE TABLE dispatcher (
     id NUMBER(10) PRIMARY KEY,
     setid NUMBER(10) DEFAULT 0 NOT NULL,
     destination VARCHAR2(192) DEFAULT '',
     socket VARCHAR2(128) DEFAULT NULL,
-    flags NUMBER(10) DEFAULT 0 NOT NULL,
+    state NUMBER(10) DEFAULT 0 NOT NULL,
     weight NUMBER(10) DEFAULT 1 NOT NULL,
     attrs VARCHAR2(128) DEFAULT '',
     description VARCHAR2(64) DEFAULT ''

diff --git a/scripts/pi_http/dispatcher-mod b/scripts/pi_http/dispatcher-mod
@@ -8,7 +8,7 @@
 				<col><field>setid</field></col>
 				<col><field>destination</field></col>
 				<col><field>socket</field></col>
-				<col><field>flags</field></col>
+				<col><field>state</field></col>
 				<col><field>weight</field></col>
 				<col><field>attrs</field></col>
 				<col><field>description</field></col>
@@ -21,7 +21,7 @@
 				<col><field>setid</field></col>
 				<col><field>destination</field></col>
 				<col><field>socket</field></col>
-				<col><field>flags</field></col>
+				<col><field>state</field></col>
 				<col><field>weight</field></col>
 				<col><field>attrs</field></col>
 				<col><field>description</field></col>
@@ -37,7 +37,7 @@
 				<col><field>setid</field></col>
 				<col><field>destination</field></col>
 				<col><field>socket</field></col>
-				<col><field>flags</field></col>
+				<col><field>state</field></col>
 				<col><field>weight</field></col>
 				<col><field>attrs</field></col>
 				<col><field>description</field></col>

diff --git a/scripts/pi_http/dispatcher-table b/scripts/pi_http/dispatcher-table
@@ -6,7 +6,7 @@
 		<column><field>setid</field><type>DB_INT</type></column>
 		<column><field>destination</field><type>DB_STR</type></column>
 		<column><field>socket</field><type>DB_STR</type></column>
-		<column><field>flags</field><type>DB_INT</type></column>
+		<column><field>state</field><type>DB_INT</type></column>
 		<column><field>weight</field><type>DB_INT</type></column>
 		<column><field>attrs</field><type>DB_STR</type></column>
 		<column><field>description</field><type>DB_STR</type></column>

diff --git a/scripts/pi_http/pi_framework.xml b/scripts/pi_http/pi_framework.xml
@@ -281,7 +281,7 @@
 		<column><field>setid</field><type>DB_INT</type></column>
 		<column><field>destination</field><type>DB_STR</type></column>
 		<column><field>socket</field><type>DB_STR</type></column>
-		<column><field>flags</field><type>DB_INT</type></column>
+		<column><field>state</field><type>DB_INT</type></column>
 		<column><field>weight</field><type>DB_INT</type></column>
 		<column><field>attrs</field><type>DB_STR</type></column>
 		<column><field>description</field><type>DB_STR</type></column>
@@ -1683,7 +1683,7 @@
 				<col><field>setid</field></col>
 				<col><field>destination</field></col>
 				<col><field>socket</field></col>
-				<col><field>flags</field></col>
+				<col><field>state</field></col>
 				<col><field>weight</field></col>
 				<col><field>attrs</field></col>
 				<col><field>description</field></col>
@@ -1696,7 +1696,7 @@
 				<col><field>setid</field></col>
 				<col><field>destination</field></col>
 				<col><field>socket</field></col>
-				<col><field>flags</field></col>
+				<col><field>state</field></col>
 				<col><field>weight</field></col>
 				<col><field>attrs</field></col>
 				<col><field>description</field></col>
@@ -1712,7 +1712,7 @@
 				<col><field>setid</field></col>
 				<col><field>destination</field></col>
 				<col><field>socket</field></col>
-				<col><field>flags</field></col>
+				<col><field>state</field></col>
 				<col><field>weight</field></col>
 				<col><field>attrs</field></col>
 				<col><field>description</field></col>

diff --git a/scripts/postgres/dispatcher-create.sql b/scripts/postgres/dispatcher-create.sql
@@ -1,10 +1,10 @@
-INSERT INTO version (table_name, table_version) values ('dispatcher','5');
+INSERT INTO version (table_name, table_version) values ('dispatcher','6');
 CREATE TABLE dispatcher (
     id SERIAL PRIMARY KEY NOT NULL,
     setid INTEGER DEFAULT 0 NOT NULL,
     destination VARCHAR(192) DEFAULT '' NOT NULL,
     socket VARCHAR(128) DEFAULT NULL,
-    flags INTEGER DEFAULT 0 NOT NULL,
+    state INTEGER DEFAULT 0 NOT NULL,
     weight INTEGER DEFAULT 1 NOT NULL,
     attrs VARCHAR(128) DEFAULT '' NOT NULL,
     description VARCHAR(64) DEFAULT '' NOT NULL