sr-dev

sr-dev@lists.kamailio.org

17 participants
44133 discussions

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, 10 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, 10 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, 10 months

git:janakj/postgres: - New postgres driver for the new db api in ser

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: 7c1f066c892d6d3685def250d9c2c7ef76b1d80b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7c1f066… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Mon May 5 15:07:05 2008 +0000 - New postgres driver for the new db api in ser - Support for prepared statements - Support for oid retrievals from system catalogs - More flexible data type conversion - Support for inet data fields --- modules/db_postgres/Makefile | 1 + modules/db_postgres/pg_cmd.c | 509 ++++++++++++++++++++++++++ modules/db_postgres/pg_cmd.h | 154 ++++++++ modules/db_postgres/pg_con.c | 351 ++++++++++++------ modules/db_postgres/pg_con.h | 112 ++++-- modules/db_postgres/pg_fld.c | 834 ++++++++++++++++++++++++++++++++++++++++++ modules/db_postgres/pg_fld.h | 146 ++++++++ modules/db_postgres/pg_mod.c | 535 +++++++++++++++++++++++++++ modules/db_postgres/pg_mod.h | 47 +++ modules/db_postgres/pg_oid.c | 184 ++++++++++ modules/db_postgres/pg_oid.h | 128 +++++++ modules/db_postgres/pg_res.c | 76 ++++ modules/db_postgres/pg_res.h | 58 +++ modules/db_postgres/pg_sql.c | 424 +++++++++++++++++++++ modules/db_postgres/pg_sql.h | 118 ++++++ modules/db_postgres/pg_uri.c | 292 +++++++++++++++ modules/db_postgres/pg_uri.h | 71 ++++ 17 files changed, 3883 insertions(+), 157 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=7c1…

15 years, 10 months

git:janakj/postgres: - removing forgotten files

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: 2b05a5d59e625277fb862434a8d26fb0bac03904 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2b05a5d… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Tue May 6 12:16:38 2008 +0000 - removing forgotten files --- modules/db_postgres/copy_to_psql | 133 ----- modules/db_postgres/db_con.c | 52 -- modules/db_postgres/db_mod.c | 191 ------- modules/db_postgres/db_mod.h | 40 -- modules/db_postgres/dbase.c | 1083 -------------------------------------- modules/db_postgres/dbase.h | 102 ---- modules/db_postgres/pg_type.h | 83 --- modules/db_postgres/res.c | 413 --------------- modules/db_postgres/res.h | 57 -- modules/db_postgres/serpgctl | 783 --------------------------- 10 files changed, 0 insertions(+), 2937 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=2b0…

15 years, 10 months

git:janakj/postgres: - fixed wrong parameter value passed to PQexecPrepared

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: c65b0d937609e7752b1e63daac7ea0cc0dd0ec0a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c65b0d9… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Wed May 7 17:36:36 2008 +0000 - fixed wrong parameter value passed to PQexecPrepared - few minor bugs fixed --- modules/db_postgres/pg_cmd.c | 27 +++++++++++++++++---------- modules/db_postgres/pg_cmd.h | 1 + modules/db_postgres/pg_mod.c | 10 +++++----- 3 files changed, 23 insertions(+), 15 deletions(-) diff --git a/modules/db_postgres/pg_cmd.c b/modules/db_postgres/pg_cmd.c index b0615f4..f09014c 100644 --- a/modules/db_postgres/pg_cmd.c +++ b/modules/db_postgres/pg_cmd.c @@ -78,7 +78,9 @@ static void pg_cmd_free(db_cmd_t* cmd, struct pg_cmd* payload) /** Generate a unique name for a server-side PostgreSQL command. * This function generates a unique name for each command that will be used to - * identify the prepared statement on the server. + * identify the prepared statement on the server. The name has only has to be + * unique within a connection to the server so we just keep a global counter + * and the name will be that number converted to text. * * @param cmd A command whose name is to be generated * @return A string allocated using pkg_malloc containing the name or NULL on @@ -128,7 +130,8 @@ static int create_pg_params(db_cmd_t* cmd) pcmd->params.len = (int*)pkg_malloc(sizeof(int) * num); pcmd->params.fmt = (int*)pkg_malloc(sizeof(int) * num); - if (!pcmd->params.val || !pcmd->params.len || !pcmd->params.fmt) { + if (!pcmd->params.val || + !pcmd->params.len || !pcmd->params.fmt) { ERR("postgres: No memory left\n"); goto error; } @@ -136,6 +139,7 @@ static int create_pg_params(db_cmd_t* cmd) memset(pcmd->params.val, '\0', sizeof(const char*) * num); memset(pcmd->params.len, '\0', sizeof(int) * num); memset(pcmd->params.fmt, '\0', sizeof(int) * num); + pcmd->params.n = num; return 0; error: @@ -240,24 +244,28 @@ int pg_cmd(db_cmd_t* cmd) break; case DB_SQL: - pcmd->sql_cmd.s = (char*)pkg_malloc(cmd->table.len); + pcmd->sql_cmd.s = (char*)pkg_malloc(cmd->table.len + 1); if (pcmd->sql_cmd.s == NULL) { ERR("postgres: Out of private memory\n"); goto error; } memcpy(pcmd->sql_cmd.s,cmd->table.s, cmd->table.len); + pcmd->sql_cmd.s[cmd->table.len] = '\0'; pcmd->sql_cmd.len = cmd->table.len; break; } DB_SET_PAYLOAD(cmd, pcmd); + /* Create parameter arrays for PostgreSQL API functions */ + if (create_pg_params(cmd) < 0) goto error; + /* Generate a unique name for the command on the server */ if (gen_cmd_name(cmd) != 0) goto error; /* Upload the command to the server */ if (upload_cmd(cmd) != 0) goto error; - + /* Obtain the description of the uploaded command, this includes * information about result and parameter fields */ if (get_types(cmd) != 0) goto error; @@ -272,8 +280,6 @@ int pg_cmd(db_cmd_t* cmd) if (check_types(cmd)) goto error; - /* Create parameter arrays for PostgreSQL API functions */ - if (create_pg_params(cmd) < 0) goto error; return 0; error: @@ -343,22 +349,23 @@ static int upload_cmd(db_cmd_t* cmd) /* FIXME: The function should take the connection as one of parameters */ pcon = DB_GET_PAYLOAD(cmd->ctx->con[db_payload_idx]); - DBG("postgres: Uploading query '%s'='%s'\n", pcmd->name, + DBG("postgres: Uploading comand '%s': '%s'\n", pcmd->name, pcmd->sql_cmd.s); res = PQprepare(pcon->con, pcmd->name, pcmd->sql_cmd.s, 0, NULL); st = PQresultStatus(res); - PQclear(res); if (st != PGRES_COMMAND_OK && st != PGRES_NONFATAL_ERROR && st != PGRES_TUPLES_OK) { ERR("postgres: Error while uploading command to server: %d, %s", st, PQresultErrorMessage(res)); ERR("postgres: Command: '%s'\n", pcmd->sql_cmd.s); + PQclear(res); return -1; } + PQclear(res); return 0; } @@ -392,9 +399,9 @@ int pg_cmd_exec(db_res_t* res, db_cmd_t* cmd) /* Execute the statement */ tmp = PQexecPrepared(pcon->con, pcmd->name, - cmd->match_count + cmd->vals_count, + pcmd->params.n, pcmd->params.val, pcmd->params.len, - NULL, 1); + pcmd->params.fmt, 1); if (!tmp) { ERR("postgres: PQexecPrepared returned no result\n"); continue; diff --git a/modules/db_postgres/pg_cmd.h b/modules/db_postgres/pg_cmd.h index 47be941..41914e9 100644 --- a/modules/db_postgres/pg_cmd.h +++ b/modules/db_postgres/pg_cmd.h @@ -51,6 +51,7 @@ #include <libpq-fe.h> struct pg_params { + int n; const char** val; int* len; int* fmt; diff --git a/modules/db_postgres/pg_mod.c b/modules/db_postgres/pg_mod.c index 1ed3c09..027e4af 100644 --- a/modules/db_postgres/pg_mod.c +++ b/modules/db_postgres/pg_mod.c @@ -359,15 +359,15 @@ int pg_test(void) goto error; } - put->vals[0].v.lstr.s = "abc"; + put->vals[0].v.lstr.s = "abc should not be there"; put->vals[0].v.lstr.len = 3; - put->vals[1].v.lstr.s = "abc"; + put->vals[1].v.lstr.s = "abc should not be there"; put->vals[1].v.lstr.len = 3; - put->vals[2].v.lstr.s = "abc"; + put->vals[2].v.lstr.s = "abc should not be there"; put->vals[2].v.lstr.len = 3; - put->vals[3].v.lstr.s = "abc"; + put->vals[3].v.lstr.s = "abc should not be there"; put->vals[3].v.lstr.len = 3; - put->vals[4].v.lstr.s = "a"; + put->vals[4].v.lstr.s = "a should not be there"; put->vals[4].v.lstr.len = 1; if (db_exec(NULL, put)) { ERR("Error while executing database command\n");

15 years, 10 months

git:janakj/postgres: - parameter name corrected

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: 840c3fd6edce58a3d7f423d84f9a5d3cbaa8fd75 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=840c3fd… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Mon May 12 12:15:36 2008 +0000 - parameter name corrected --- modules/db_postgres/pg_res.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/db_postgres/pg_res.h b/modules/db_postgres/pg_res.h index 1ce9be7..8b87c79 100644 --- a/modules/db_postgres/pg_res.h +++ b/modules/db_postgres/pg_res.h @@ -51,7 +51,7 @@ struct pg_res { int row, rows; }; -int pg_res(db_res_t* cmd); +int pg_res(db_res_t* res); /** @} */

15 years, 10 months

git:janakj/postgres: We also need <sys/types.h> and <sys/socket.h> to get AF_INET on FreeBSD.

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: 9550df5a016e1729356104851eae8e476364dda1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9550df5… Author: Maxim Sobolev <sobomax(a)sippysoft.com> Committer: Maxim Sobolev <sobomax(a)sippysoft.com> Date: Tue May 20 23:13:20 2008 +0000 We also need <sys/types.h> and <sys/socket.h> to get AF_INET on FreeBSD. --- modules/db_postgres/pg_fld.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/modules/db_postgres/pg_fld.c b/modules/db_postgres/pg_fld.c index c3bd09a..a9690a5 100644 --- a/modules/db_postgres/pg_fld.c +++ b/modules/db_postgres/pg_fld.c @@ -44,9 +44,11 @@ #include "../../mem/mem.h" #include "../../dprint.h" +#include <sys/types.h> +#include <sys/socket.h> +#include <netinet/in.h> #include <stdint.h> #include <string.h> -#include <netinet/in.h> /** * This is the epoch time in time_t format, this value is used to convert

15 years, 10 months

git:janakj/postgres: Despite what some people believe there is no such thing

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: 8fe0adf1581bd65f908ab595cdb35e387f212a87 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8fe0adf… Author: Maxim Sobolev <sobomax(a)sippysoft.com> Committer: Maxim Sobolev <sobomax(a)sippysoft.com> Date: Sat May 17 10:03:15 2008 +0000 Despite what some people believe there is no such thing as <malloc.h> in the C language nowadays. --- modules/db_postgres/pg_con.c | 2 +- modules/db_postgres/pg_oid.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/db_postgres/pg_con.c b/modules/db_postgres/pg_con.c index bba6af6..b846b18 100644 --- a/modules/db_postgres/pg_con.c +++ b/modules/db_postgres/pg_con.c @@ -44,7 +44,7 @@ #include "../../dprint.h" #include "../../ut.h" -#include <malloc.h> +#include <stdlib.h> #include <string.h> #include <netinet/in.h> #include <time.h> diff --git a/modules/db_postgres/pg_oid.c b/modules/db_postgres/pg_oid.c index ac4940f..bd2833e 100644 --- a/modules/db_postgres/pg_oid.c +++ b/modules/db_postgres/pg_oid.c @@ -41,7 +41,7 @@ #include "../../dprint.h" #include "../../ut.h" #include <strings.h> -#include <malloc.h> +#include <stdlib.h> #include <string.h> /** An array of supported PostgreSQL field types. */

15 years, 10 months

git:janakj/postgres: free_query changed to free_result

by Jan Janak

Module: sip-router Branch: janakj/postgres Commit: 8315fcc0a562f404b5a2cd8e054a139b35cacc12 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8315fcc… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Wed Aug 4 14:26:24 2004 +0000 free_query changed to free_result --- modules/db_postgres/db_mod.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/modules/db_postgres/db_mod.c b/modules/db_postgres/db_mod.c index bd0601c..435b8eb 100644 --- a/modules/db_postgres/db_mod.c +++ b/modules/db_postgres/db_mod.c @@ -49,15 +49,15 @@ static int mod_init(void); static cmd_export_t cmds[]={ - {"db_use_table", (cmd_function)use_table, 2, 0, 0}, - {"db_init", (cmd_function)db_init, 1, 0, 0}, - {"db_close", (cmd_function)db_close, 2, 0, 0}, - {"db_query", (cmd_function)db_query, 2, 0, 0}, - {"db_raw_query", (cmd_function)db_raw_query, 2, 0, 0}, - {"db_free_query", (cmd_function)db_free_query, 2, 0, 0}, - {"db_insert", (cmd_function)db_insert, 2, 0, 0}, - {"db_delete", (cmd_function)db_delete, 2, 0, 0}, - {"db_update", (cmd_function)db_update, 2, 0, 0}, + {"db_use_table", (cmd_function)use_table, 2, 0, 0}, + {"db_init", (cmd_function)db_init, 1, 0, 0}, + {"db_close", (cmd_function)db_close, 2, 0, 0}, + {"db_query", (cmd_function)db_query, 2, 0, 0}, + {"db_raw_query", (cmd_function)db_raw_query, 2, 0, 0}, + {"db_free_result", (cmd_function)db_free_query, 2, 0, 0}, + {"db_insert", (cmd_function)db_insert, 2, 0, 0}, + {"db_delete", (cmd_function)db_delete, 2, 0, 0}, + {"db_update", (cmd_function)db_update, 2, 0, 0}, {0,0,0,0,0} };

15 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev