sr-dev

sr-dev@lists.kamailio.org

18 participants
44290 discussions

git:janakj/postgres: Remove compiler warning about uninitialized variable.

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: e2b6d847e0af1eee4aa77ca42c24fcc439883d5b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e2b6d84… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Sun Feb 15 17:03:28 2009 +0100 Remove compiler warning about uninitialized variable. --- modules/db_postgres/pg_oid.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/db_postgres/pg_oid.c b/modules/db_postgres/pg_oid.c index bd2833e..52f3e2a 100644 --- a/modules/db_postgres/pg_oid.c +++ b/modules/db_postgres/pg_oid.c @@ -79,7 +79,7 @@ static int get_index(char* name) pg_type_t* pg_new_oid_table(PGresult* res) { pg_type_t* table = NULL; - int row, n, end, idx, fields; + int row, n = 0, end, idx, fields; str s; if (res == NULL || PQresultStatus(res) != PGRES_TUPLES_OK) goto error;

15 years, 11 months

git:janakj/postgres: - remove test function

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: 9c2b45c7b429551201b13d3c4db351800730b70a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9c2b45c… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Thu Feb 16 14:29:34 2006 +0000 - remove test function --- modules/db_postgres/db_mod.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/db_postgres/db_mod.c b/modules/db_postgres/db_mod.c index f6cf5b3..123f057 100644 --- a/modules/db_postgres/db_mod.c +++ b/modules/db_postgres/db_mod.c @@ -181,7 +181,7 @@ struct module_exports exports = { cmds, 0, /* RPC methods */ params, /* module parameters */ - pg_test, /* module initialization function */ + 0, /* module initialization function */ 0, /* response function*/ 0, /* destroy function */ 0, /* oncancel function */

15 years, 11 months

git:janakj/postgres: - export param types adjusted to PARAM_STR/ STRING & PARAM_INT

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: 143572c02572e9aa639c736c49fa82aea1968967 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=143572c… Author: Tomas Mandys <tomas.mandys(a)iptel.org> Committer: Tomas Mandys <tomas.mandys(a)iptel.org> Date: Sun Jan 8 22:43:14 2006 +0000 - export param types adjusted to PARAM_STR/STRING & PARAM_INT - removed corresponding obsolete strlen(str_param) in init --- modules/db_postgres/db_mod.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/modules/db_postgres/db_mod.c b/modules/db_postgres/db_mod.c index 72faf7b..abed575 100644 --- a/modules/db_postgres/db_mod.c +++ b/modules/db_postgres/db_mod.c @@ -1,5 +1,5 @@ -/* - * $Id$ +/* + * $Id$ * * Postgres module interface * @@ -24,8 +24,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ @@ -60,8 +60,8 @@ static cmd_export_t cmds[]={ * Exported parameters */ static param_export_t params[] = { - {"connect_timeout", INT_PARAM, &connect_timeout }, - {"reconnect_attempts", INT_PARAM, &reconnect_attempts}, + {"connect_timeout", PARAM_INT, &connect_timeout }, + {"reconnect_attempts", PARAM_INT, &reconnect_attempts}, {0, 0, 0} }; @@ -84,12 +84,12 @@ static param_export_t params[] = { * varbit_col VARBIT NULL * ); * - * insert into test (bool_col, int2_col, int4_col, int8_col, float4_col, float8_col, - * timestamp_col, char_col, text_col, bpchar_col, varchar_col, - * bytea_col, bit_col, varbit_col) - * values - * (true, 22, 23, 24, 25.21, 25.22, '1999-10-18 21:35:00', 'a', - * 'ab', 'a', 'abcde', 'abcdddd', B'00110011001100110011001100110011', + * insert into test (bool_col, int2_col, int4_col, int8_col, float4_col, float8_col, + * timestamp_col, char_col, text_col, bpchar_col, varchar_col, + * bytea_col, bit_col, varbit_col) + * values + * (true, 22, 23, 24, 25.21, 25.22, '1999-10-18 21:35:00', 'a', + * 'ab', 'a', 'abcde', 'abcdddd', B'00110011001100110011001100110011', * b'10101010101010101010101010101010'); */ static int pg_test(void) @@ -120,7 +120,7 @@ static int pg_test(void) } INFO("Result contains %d columns\n", res->col.n); - + for(row = 0; row < res->n; row++) { for(col = 0; col < res->col.n; col++) { switch(res->col.types[col]) { @@ -165,7 +165,7 @@ static int pg_test(void) } -struct module_exports exports = { +struct module_exports exports = { "postgres", cmds, 0, /* RPC methods */

15 years, 11 months

git:janakj/postgres: - DB_FLOAT support

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: bf846b8d43e0f4d30bcc9b3074f605690175bfe3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bf846b8… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Tue Jan 10 22:16:07 2006 +0000 - DB_FLOAT support - fixed error in params_add in postgres module --- modules/db_postgres/db_mod.c | 15 +++++++++++++-- modules/db_postgres/dbase.c | 30 +++++++++++++++++++++++------- modules/db_postgres/res.c | 4 ++++ 3 files changed, 40 insertions(+), 9 deletions(-) diff --git a/modules/db_postgres/db_mod.c b/modules/db_postgres/db_mod.c index abed575..f6cf5b3 100644 --- a/modules/db_postgres/db_mod.c +++ b/modules/db_postgres/db_mod.c @@ -98,6 +98,8 @@ static int pg_test(void) db_res_t* res; db_con_t* con; struct tm* tt; + db_key_t keys[1]; + db_val_t vals[1]; con = pg_init("postgres://ser:heslo@localhost/ser"); if (!con) { @@ -107,7 +109,12 @@ static int pg_test(void) INFO("Successfuly connected\n"); pg_use_table(con, "test"); - pg_query(con, 0, 0, 0, 0, 0, 0, 0, &res); + keys[0] = "int4_col"; + vals[0].type = DB_INT; + vals[0].nul = 1; + vals[0].val.int_val = 1; + + pg_query(con, keys, 0, vals, 0, 1, 0, 0, &res); if (!res) { ERR("No result received\n"); return -1; @@ -128,6 +135,10 @@ static int pg_test(void) INFO("INT(%d)", res->rows[row].values[col].val.int_val); break; + case DB_FLOAT: + INFO("FLOAT(%f)", res->rows[row].values[col].val.float_val); + break; + case DB_DOUBLE: INFO("DOUBLE(%f)", res->rows[row].values[col].val.double_val); break; @@ -170,7 +181,7 @@ struct module_exports exports = { cmds, 0, /* RPC methods */ params, /* module parameters */ - 0, /* module initialization function */ + pg_test, /* module initialization function */ 0, /* response function*/ 0, /* destroy function */ 0, /* oncancel function */ diff --git a/modules/db_postgres/dbase.c b/modules/db_postgres/dbase.c index b0f121e..60ccc95 100644 --- a/modules/db_postgres/dbase.c +++ b/modules/db_postgres/dbase.c @@ -108,7 +108,7 @@ static struct pg_params* new_pg_params(int n) } -static inline int params_add(struct pg_params* p, db_con_t* con, db_val_t* vals, int n) +static inline int params_add(struct pg_params* p, db_con_t* con, db_val_t* vals, int n, int skip_null) { int i, i1, i2; db_val_t* val; @@ -126,13 +126,29 @@ static inline int params_add(struct pg_params* p, db_con_t* con, db_val_t* vals, for(i = 0; i < n; i++) { val = &vals[i]; p->formats[p->cur] = 1; - if (val->nul) continue; + if (val->nul) { + /* When assembling parameters for where clause we skip parameters + * that have null values because they are expressed as is null. + * At other places we include them. + */ + if (!skip_null) p->cur++; + continue; + } switch(val->type) { case DB_INT: val->val.int_val = ntohl(val->val.int_val); p->data[p->cur] = (const char*)&val->val.int_val; p->len[p->cur] = 4; break; + + case DB_FLOAT: + /* Change the byte order of 4-byte value to network + * byte order if necessary + */ + val->val.int_val = htonl(val->val.int_val); + p->data[p->cur] = (const char*)&val->val.int_val; + p->len[p->cur] = 4; + break; case DB_DOUBLE: /* Change the byte order of 8-byte value to network @@ -832,7 +848,7 @@ int pg_query(db_con_t* con, db_key_t* keys, db_op_t* ops, params = new_pg_params(n); if (!params) goto err; - if (params_add(params, con, vals, n) < 0) goto err; + if (params_add(params, con, vals, n, 1) < 0) goto err; do { ret = submit_query(res, con, select, params); @@ -914,7 +930,7 @@ int pg_insert(db_con_t* con, db_key_t* keys, db_val_t* vals, int n) params = new_pg_params(n); if (!params) goto err; - if (params_add(params, con, vals, n) < 0) goto err; + if (params_add(params, con, vals, n, 0) < 0) goto err; do { ret = submit_query(0, con, insert, params); @@ -963,7 +979,7 @@ int pg_delete(db_con_t* con, db_key_t* keys, db_op_t* ops, db_val_t* vals, int n params = new_pg_params(n); if (!params) goto err; - if (params_add(params, con, vals, n) < 0) goto err; + if (params_add(params, con, vals, n, 1) < 0) goto err; do { ret = submit_query(0, con, delete, params); @@ -1016,8 +1032,8 @@ int pg_update(db_con_t* con, db_key_t* keys, db_op_t* ops, db_val_t* vals, params = new_pg_params(n + un); if (!params) goto err; - if (params_add(params, con, uvals, un) < 0) goto err; - if (params_add(params, con, vals, n) < 0) goto err; + if (params_add(params, con, uvals, un, 0) < 0) goto err; + if (params_add(params, con, vals, n, 1) < 0) goto err; do { ret = submit_query(0, con, update, params); diff --git a/modules/db_postgres/res.c b/modules/db_postgres/res.c index 3722ce0..b94e51c 100644 --- a/modules/db_postgres/res.c +++ b/modules/db_postgres/res.c @@ -97,6 +97,9 @@ static inline int get_columns(db_res_t* res) break; case FLOAT4OID: /* single-precision floating point number, 4-byte storage */ + res->col.types[i] = DB_FLOAT; + break; + case FLOAT8OID: /* double-precision floating point number, 8-byte storage */ res->col.types[i] = DB_DOUBLE; break; @@ -195,6 +198,7 @@ static inline int convert_cell(db_con_t* con, db_res_t* res, int row, int col) val->nul = 1; switch(res->col.types[col]) { case DB_INT: val->val.int_val = 0; break; + case DB_FLOAT: val->val.float_val = 0; break; case DB_DOUBLE: val->val.double_val = 0; break; case DB_STRING: val->val.string_val = dummy_str.s; break; case DB_STR: val->val.str_val = dummy_str; break;

15 years, 11 months

git:janakj/postgres: - more warnings fixes

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: 8bde22abd667e38d2aafdf948eddfd3f0f3bc4d9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8bde22a… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Dec 7 19:12:55 2006 +0000 - more warnings fixes --- modules/db_postgres/db_mod.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/modules/db_postgres/db_mod.c b/modules/db_postgres/db_mod.c index 123f057..95774b6 100644 --- a/modules/db_postgres/db_mod.c +++ b/modules/db_postgres/db_mod.c @@ -92,6 +92,7 @@ static param_export_t params[] = { * 'ab', 'a', 'abcde', 'abcdddd', B'00110011001100110011001100110011', * b'10101010101010101010101010101010'); */ +#if 0 static int pg_test(void) { int row, col; @@ -174,6 +175,7 @@ static int pg_test(void) pg_close(con); return -1; } +#endif struct module_exports exports = {

15 years, 11 months

git:janakj/postgres: - removed reference to serhelp@iptel.org, we will be using serusers@iptel.org instead

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: 6140cbfd4857ccf0a2df37b356f2c3b54b386990 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6140cbf… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Wed Nov 29 12:23:58 2006 +0000 - removed reference to serhelp(a)iptel.org, we will be using serusers(a)iptel.org instead --- modules/db_postgres/README | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/modules/db_postgres/README b/modules/db_postgres/README index 6e2bd9c..e943699 100644 --- a/modules/db_postgres/README +++ b/modules/db_postgres/README @@ -127,8 +127,6 @@ Chapter 3. Frequently Asked Questions <serusers(a)iptel.org> and e-mail regarding development versions or CVS snapshots should be send to <serdev(a)iptel.org>. - If you want to keep the mail private, send it to - <serhelp(a)iptel.org>. 3.3. How can I report a bug?

15 years, 11 months

git:janakj/postgres:

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: 62925779f2f900351e4e614d10725631d68741cf URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6292577… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Feb 22 00:24:16 2007 +0000 - fix: db connections should not be opened from child_init(PROC_MAIN), or they will be inherited by all the tcp processes (bad). Bug reported by Jan Andres <jan.andres(a)freenet-ag.de>. closes SER-227 --- modules/db_postgres/dbase.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/modules/db_postgres/dbase.c b/modules/db_postgres/dbase.c index 60ccc95..0305efa 100644 --- a/modules/db_postgres/dbase.c +++ b/modules/db_postgres/dbase.c @@ -39,6 +39,7 @@ #include "../../dprint.h" #include "../../db/db_pool.h" #include "../../ut.h" +#include "../../globals.h" #include "pg_con.h" #include "pg_type.h" #include "db_mod.h" @@ -227,6 +228,11 @@ db_con_t* pg_init(const char* url) id = 0; res = 0; + if (is_main){ + LOG(L_ERR, "BUG: postgres: pg_init: called from the main process," + " ignoring...\n"); + return 0; + } if (!url) { ERR("Invalid parameter value\n"); return 0;

15 years, 11 months

git:janakj/postgres:

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: 89143e1d58105a293193d92b132534295be4e717 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=89143e1… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Feb 22 15:56:48 2007 +0000 - fix the yesterday's fix: allow db_init from main if it's done from mod_init (but don't allow it and log a BUG if it happens from child_init(PROC_MAIN)). (SER-227 related) --- modules/db_postgres/dbase.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/modules/db_postgres/dbase.c b/modules/db_postgres/dbase.c index 0305efa..17a86d5 100644 --- a/modules/db_postgres/dbase.c +++ b/modules/db_postgres/dbase.c @@ -40,6 +40,7 @@ #include "../../db/db_pool.h" #include "../../ut.h" #include "../../globals.h" +#include "../../pt.h" #include "pg_con.h" #include "pg_type.h" #include "db_mod.h" @@ -228,7 +229,8 @@ db_con_t* pg_init(const char* url) id = 0; res = 0; - if (is_main){ + /* if called from PROC_MAIN, allow it only from mod_init( when pt==0)*/ + if (is_main && pt){ LOG(L_ERR, "BUG: postgres: pg_init: called from the main process," " ignoring...\n"); return 0;

15 years, 11 months

git:janakj/postgres:

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: 28e784e43347a05cf433a8371f56cea813c4870b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=28e784e… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Feb 23 21:03:38 2007 +0000 - relax db_init BUG check (allow db init from fixup functions) (SER-227 related) --- modules/db_postgres/dbase.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/modules/db_postgres/dbase.c b/modules/db_postgres/dbase.c index 17a86d5..718d770 100644 --- a/modules/db_postgres/dbase.c +++ b/modules/db_postgres/dbase.c @@ -230,10 +230,9 @@ db_con_t* pg_init(const char* url) res = 0; /* if called from PROC_MAIN, allow it only from mod_init( when pt==0)*/ - if (is_main && pt){ + if (is_main && fixup_complete){ LOG(L_ERR, "BUG: postgres: pg_init: called from the main process," " ignoring...\n"); - return 0; } if (!url) { ERR("Invalid parameter value\n");

15 years, 11 months

git:janakj/postgres: Pass parmeter types to PQexecParams() explicitly, otherwise PostgreSQL

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: e698c560e636d1fe2eb8b0b26909ffc29f2f2a82 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e698c56… Author: Maxim Sobolev <sobomax(a)sippysoft.com> Committer: Maxim Sobolev <sobomax(a)sippysoft.com> Date: Wed Jun 6 01:09:34 2007 +0000 Pass parmeter types to PQexecParams() explicitly, otherwise PostgreSQL will be guessing them based on field type and in the case of mismatch may bail with cryptic error message: "ERROR: dbase.c:783: Error: ERROR: insufficient data left in message" Particularly, this happens easily with integers - SER is packing 4 bytes, while PG expects 8 bytes. Sponsored by: Sippy Software, Inc. ( http://www.sippysoft.com/ ) --- modules/db_postgres/dbase.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/modules/db_postgres/dbase.c b/modules/db_postgres/dbase.c index 718d770..4cb5216 100644 --- a/modules/db_postgres/dbase.c +++ b/modules/db_postgres/dbase.c @@ -68,6 +68,7 @@ struct pg_params { const char** data; int* len; int* formats; + Oid* types; }; @@ -77,6 +78,7 @@ static void free_pg_params(struct pg_params* ptr) if (ptr->data) pkg_free(ptr->data); if (ptr->len) pkg_free(ptr->len); if (ptr->formats) pkg_free(ptr->formats); + if (ptr->types) pkg_free(ptr->types); pkg_free(ptr); } @@ -96,9 +98,13 @@ static struct pg_params* new_pg_params(int n) ptr->len = (int*)pkg_malloc(sizeof(int) * n); if (!ptr->len) goto error; + + ptr->types = (int*)pkg_malloc(sizeof(Oid) * n); + if (!ptr->types) goto error; memset((char*)ptr->data, 0, sizeof(const char*) * n); memset(ptr->len, 0, sizeof(int) * n); + memset(ptr->types, 0, sizeof(Oid) * n); ptr->n = n; ptr->cur = 0; return ptr; @@ -141,6 +147,7 @@ static inline int params_add(struct pg_params* p, db_con_t* con, db_val_t* vals, val->val.int_val = ntohl(val->val.int_val); p->data[p->cur] = (const char*)&val->val.int_val; p->len[p->cur] = 4; + p->types[p->cur] = INT4OID; break; case DB_FLOAT: @@ -150,6 +157,7 @@ static inline int params_add(struct pg_params* p, db_con_t* con, db_val_t* vals, val->val.int_val = htonl(val->val.int_val); p->data[p->cur] = (const char*)&val->val.int_val; p->len[p->cur] = 4; + p->types[p->cur] = FLOAT4OID; break; case DB_DOUBLE: @@ -162,6 +170,7 @@ static inline int params_add(struct pg_params* p, db_con_t* con, db_val_t* vals, (&val->val.int_val)[1] = i2; p->data[p->cur] = (const char*)&val->val.int_val; p->len[p->cur] = 8; + p->types[p->cur] = FLOAT8OID; break; case DB_STRING: @@ -187,6 +196,7 @@ static inline int params_add(struct pg_params* p, db_con_t* con, db_val_t* vals, (&val->val.int_val)[1] = i2; p->data[p->cur] = (const char*)&val->val.int_val; p->len[p->cur] = 8; + p->types[p->cur] = TIMESTAMPOID; break; case DB_BLOB: @@ -199,6 +209,7 @@ static inline int params_add(struct pg_params* p, db_con_t* con, db_val_t* vals, val->val.int_val = htonl(32); p->data[p->cur] = (const char*)&val->val.int_val; p->len[p->cur] = 8; + p->types[p->cur] = BITOID; break; } @@ -756,7 +767,7 @@ static int submit_query(db_res_t** res, db_con_t* con, const char* query, struct DBG("Executing '%s'\n", query); if (params && params->cur) { pgres = PQexecParams(CON_CONNECTION(con), query, - params->cur, 0, + params->cur, params->types, params->data, params->len, params->formats, 1); } else {

15 years, 11 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev