sr-dev February 2009

sr-dev@lists.kamailio.org

13 participants
478 discussions

git:janakj/bdb: - DB API export updated to be done via db_bind_api()

by Jan Janak

Module: sip-router Branch: janakj/bdb Commit: 6a6d498f4437d0717af063aaa1ec8d29d6919a22 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6a6d498… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Mar 4 16:12:41 2008 +0000 - DB API export updated to be done via db_bind_api() git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3844 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_berkeley/km_db_berkeley.c | 31 +++++++++++++++++++++++-------- 1 files changed, 23 insertions(+), 8 deletions(-) diff --git a/modules/db_berkeley/km_db_berkeley.c b/modules/db_berkeley/km_db_berkeley.c index c0483ca..b829ddb 100644 --- a/modules/db_berkeley/km_db_berkeley.c +++ b/modules/db_berkeley/km_db_berkeley.c @@ -38,6 +38,7 @@ #include "../../sr_module.h" #include "../../db/db_res.h" +#include "../../db/db.h" #include "db_berkeley.h" #include "bdb_lib.h" #include "bdb_res.h" @@ -63,18 +64,13 @@ int journal_roll_interval = 0; static int mod_init(void); static void destroy(void); +int bdb_bind_api(db_func_t *dbb); + /* * Exported functions */ static cmd_export_t cmds[] = { - {"db_use_table", (cmd_function)bdb_use_table, 2, 0, 0, 0}, - {"db_init", (cmd_function)bdb_init, 1, 0, 0, 0}, - {"db_close", (cmd_function)bdb_close, 2, 0, 0, 0}, - {"db_query", (cmd_function)bdb_query, 2, 0, 0, 0}, - {"db_free_result", (cmd_function)bdb_free_query, 2, 0, 0, 0}, - {"db_insert", (cmd_function)bdb_insert, 2, 0, 0, 0}, - {"db_delete", (cmd_function)bdb_delete, 2, 0, 0, 0}, - {"db_update", (cmd_function)bdb_update, 2, 0, 0, 0}, + {"db_bind_api", (cmd_function)bdb_bind_api, 0, 0, 0, 0}, {0, 0, 0, 0, 0, 0} }; @@ -133,6 +129,25 @@ static void destroy(void) bdblib_destroy(); } +int dbt_bind_api(db_func_t *dbb) +{ + if(dbb==NULL) + return -1; + + memset(dbb, 0, sizeof(db_func_t)); + + dbb->use_table = bdb_use_table; + dbb->init = bdb_init; + dbb->close = bdb_close; + dbb->query = (db_query_f)bdb_query; + dbb->free_result = bdb_free_query; + dbb->insert = (db_insert_f)bdb_insert; + dbb->delete = (db_delete_f)bdb_delete; + dbb->update = (db_update_f)bdb_update; + + return 0; +} + int bdb_use_table(db_con_t* _h, const str* _t) { return db_use_table(_h, _t);

15 years, 10 months

git:janakj/bdb: - port db_text and db_berkeley to the new core DB API

by Jan Janak

Module: sip-router Branch: janakj/bdb Commit: 873c8d310fb3769aa343788c9a5fbbc7b05df5ed URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=873c8d3… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri Feb 8 14:32:23 2008 +0000 - port db_text and db_berkeley to the new core DB API - remove free_* methods that are not needed anymore - adjust structure to the other SQL based modules - basic queries works, but otherwise not that much tested git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3668 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_berkeley/km_bdb_res.c | 426 ++++++++-------------------------- modules/db_berkeley/km_bdb_res.h | 5 - modules/db_berkeley/km_bdb_val.c | 2 + modules/db_berkeley/km_db_berkeley.c | 10 +- 4 files changed, 107 insertions(+), 336 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=873…

15 years, 10 months

git:janakj/bdb: further changes after the db name change

by Jan Janak

Module: sip-router Branch: janakj/bdb Commit: 1bae0321cddb37c8fa9e3f58f9df1b5efee814aa URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1bae032… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Feb 6 15:46:09 2008 +0000 further changes after the db name change - update INSTALL file - fix Makefile skip modules variable - fix module Makefile, lib name - change db_bind_mod to add the db prefix in the function - change db url defines in db_berkeley and db_text - change database modules names in module struct - fix debian packaging - fix tests git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3642 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_berkeley/km_README | 4 ++-- modules/db_berkeley/km_db_berkeley.c | 2 +- modules/db_berkeley/km_doc/db_berkeley_user.sgml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/db_berkeley/km_README b/modules/db_berkeley/km_README index 1f7dda5..4cc84b4 100644 --- a/modules/db_berkeley/km_README +++ b/modules/db_berkeley/km_README @@ -228,8 +228,8 @@ by default none is loaded Modify the OpenSER configuration file to use db_berkeley module. The database URL for modules must be the path to the directory where the Berkeley DB table-files are located, - prefixed by "db_berkeley://", e.g., - "db_berkeley:///usr/local/etc/openser/db_berkeley". + prefixed by "berkeley://", e.g., + "berkeley:///usr/local/etc/openser/db_berkeley". A couple other IMPORTANT things to consider are the 'db_mode' and the 'use_domain' modparams. The description of these diff --git a/modules/db_berkeley/km_db_berkeley.c b/modules/db_berkeley/km_db_berkeley.c index 74fea05..7c69751 100644 --- a/modules/db_berkeley/km_db_berkeley.c +++ b/modules/db_berkeley/km_db_berkeley.c @@ -47,7 +47,7 @@ #define CFG_DIR "/tmp" #endif -#define BDB_ID "db_berkeley://" +#define BDB_ID "berkeley://" #define BDB_ID_LEN (sizeof(BDB_ID)-1) #define BDB_PATH_LEN 256 diff --git a/modules/db_berkeley/km_doc/db_berkeley_user.sgml b/modules/db_berkeley/km_doc/db_berkeley_user.sgml index c08222f..b2bd6e3 100644 --- a/modules/db_berkeley/km_doc/db_berkeley_user.sgml +++ b/modules/db_berkeley/km_doc/db_berkeley_user.sgml @@ -253,8 +253,8 @@ modparam("db_berkeley", "journal_roll_interval", 3600) <para> Modify the OpenSER configuration file to use db_berkeley module. The database URL for modules must be the path to the directory where - the Berkeley DB table-files are located, prefixed by "db_berkeley://", - e.g., "db_berkeley:///usr/local/etc/openser/db_berkeley". + the Berkeley DB table-files are located, prefixed by "berkeley://", + e.g., "berkeley:///usr/local/etc/openser/db_berkeley". </para> <para>

15 years, 10 months

git:janakj/bdb: - first round of cleanups for documentation

by Jan Janak

Module: sip-router Branch: janakj/bdb Commit: 0b20fe03d98988177ca55954bfbc14d50feb9f2b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0b20fe0… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Feb 27 13:53:33 2008 +0000 - first round of cleanups for documentation - remove all FAQ and DEVEL files considered empty in content (no content at all or just the default lines) - remove of the <RevHistory>/</RevHistory> tag (and of course anything between them) - remove the comments at the end of the file that begins with " - -<chapter> - <chapterinfo> - <revhistory> - <revision> - <revnumber>$Revision: 846 $</revnumber> - <date>$Date: 2006-05-22 09:15:40 -0500 (Mon, 22 May 2006) $</date> - </revision> - </revhistory> - </chapterinfo> - <title>Developer's Guide</title> - <para> - The module does not provide any <acronym>API</acronym> to use in other &ser; modules. - </para> -</chapter> - - diff --git a/modules/db_berkeley/km_doc/db_berkeley_faq.sgml b/modules/db_berkeley/km_doc/db_berkeley_faq.sgml deleted file mode 100644 index 4fc364e..0000000 --- a/modules/db_berkeley/km_doc/db_berkeley_faq.sgml +++ /dev/null @@ -1,70 +0,0 @@ - - -<chapter> - <chapterinfo> - <revhistory> - <revision> - <revnumber>$Revision: 846 $</revnumber> - <date>$Date: 2006-05-22 09:15:40 -0500 (Mon, 22 May 2006) $</date> - </revision> - </revhistory> - </chapterinfo> - <title>Frequently Asked Questions</title> - <qandaset defaultlabel="number"> - <qandaentry> - <question> - <para>Where can I find more about OpenSER?</para> - </question> - <answer> - <para> - Take a look at &serhomelink;. - </para> - </answer> - </qandaentry> - <qandaentry> - <question> - <para>Where can I post a question about this module?</para> - </question> - <answer> - <para> - First at all check if your question was already answered on one of - our mailing lists: - </para> - <itemizedlist> - <listitem> - <para>User Mailing List - &seruserslink;</para> - </listitem> - <listitem> - <para>Developer Mailing List - &serdevlink;</para> - </listitem> - </itemizedlist> - <para> - E-mails regarding any stable &ser; release should be sent to - &serusersmail; and e-mails regarding development versions - should be sent to &serdevmail;. - </para> - <para> - If you want to keep the mail private, send it to - &serhelpmail;. - </para> - </answer> - </qandaentry> - <qandaentry> - <question> - <para>How can I report a bug?</para> - </question> - <answer> - <para> - Please follow the guidelines provided at: - &serbugslink;. - </para> - </answer> - </qandaentry> - </qandaset> -</chapter> - - diff --git a/modules/db_berkeley/km_doc/db_berkeley_user.sgml b/modules/db_berkeley/km_doc/db_berkeley_user.sgml index b2bd6e3..affdf40 100644 --- a/modules/db_berkeley/km_doc/db_berkeley_user.sgml +++ b/modules/db_berkeley/km_doc/db_berkeley_user.sgml @@ -2,12 +2,6 @@ <chapter> <chapterinfo> - <revhistory> - <revision> - <revnumber>$Revision: 846 $</revnumber> - <date>$Date: 2006-05-22 09:15:40 -0500 (Mon, 22 May 2006) $</date> - </revision> - </revhistory> </chapterinfo> <title>User's Guide</title> @@ -587,8 +581,3 @@ usage: ./bdb_recover -s schemadir [-h home] [-R lastN] </chapter> -

15 years, 10 months

git:janakj/bdb: - port database interface (almost) complete from ' const char*' to 'str'

by Jan Janak

Module: sip-router Branch: janakj/bdb Commit: f024b7f592a60db35d21bc94d00d0785d5f7deca URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f024b7f… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue Jan 22 13:55:43 2008 +0000 - port database interface (almost) complete from 'const char*' to 'str' for more safety (e.g. not null terminated strings) and performance (save strlen calls in core and library code) - adapt existing modules to use the new interface - change bind_dbmod and use_table function to the naming scheme of the other functions of the API - port existing module to use 'str' values for database related parameters - if modules uses already 'str' functions internally, remove the unnecessary temporary variables - make functions and parameter that needs only locally be used static - introduce new column variables needed for the keys for modules that don't have them already, this could be used to make them configurable later on - add 'const' to more db related functions - fix postgres driver, async queries must be finished, otherwise the next one will not complete - smaller whitespace and formatting changes and cleanups all over the place - reviewed and tested with testcases, but probably not error free because of the change size - basic DB operations should work, but no extensive load testing has yet be done, as some work still remains: - remove dead code and superflous comments in postgres driver - clean up memory management, at the moment there exists two flavors: don't copy that much (mysql, unixodbc), don't trust the driver, copy everything (postgres, db_berkeley) - after this is unified, then only one implementation for the memory management of the db API could be used for all modules - Foundations of this change have been created from Frederick Bullik, Frederick.Bullik at 1und1 dot de - Please review and test. git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3563 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_berkeley/km_bdb_res.c | 61 +++++++++++++++++++++------------- modules/db_berkeley/km_db_berkeley.c | 50 +++++++++------------------- modules/db_berkeley/km_db_berkeley.h | 4 +- 3 files changed, 56 insertions(+), 59 deletions(-) diff --git a/modules/db_berkeley/km_bdb_res.c b/modules/db_berkeley/km_bdb_res.c index 78f2ac5..0e80d41 100644 --- a/modules/db_berkeley/km_bdb_res.c +++ b/modules/db_berkeley/km_bdb_res.c @@ -34,9 +34,6 @@ #include "bdb_res.h" -/** -* -*/ int bdb_get_columns(table_p _tp, db_res_t* _res, int* _lres, int _nc) { int col, len; @@ -105,24 +102,40 @@ int bdb_get_columns(table_p _tp, db_res_t* _res, int* _lres, int _nc) column_p cp = NULL; cp = (_lres) ? _tp->colp[_lres[col]] : _tp->colp[col]; len = cp->name.len; - RES_NAMES(_res)[col] = pkg_malloc(len+1); + + RES_NAMES(_res)[col] = (str*)pkg_malloc(sizeof(str)); + if (! RES_NAMES(_res)[col]) { + LM_ERR("no private memory left\n"); + pkg_free(RES_NAMES(_res)); + pkg_free(RES_TYPES(_res)); + // FIXME we should also free all previous allocated RES_NAMES[col] + return -5; + } #ifdef BDB_EXTRA_DEBUG LM_DBG("%p=pkg_malloc(%d) RES_NAMES[%d]\n" - , RES_NAMES(_res)[col], len+1, col); + , RES_NAMES(_res)[col], len, col); +#endif + + RES_NAMES(_res)[col]->s = (char*)pkg_malloc(len); + +#ifdef BDB_EXTRA_DEBUG + LM_DBG("%p=pkg_malloc(%d) RES_NAMES[%d]->s\n" + , RES_NAMES(_res)[col]->s, len, col); #endif - if (! RES_NAMES(_res)[col]) + if (! RES_NAMES(_res)[col]->s) { LM_ERR("Failed to allocate %d bytes to hold column name\n", len+1); return -1; } - memset((char *)RES_NAMES(_res)[col], 0, len+1); - strncpy((char *)RES_NAMES(_res)[col], cp->name.s, len); + memset((char *)RES_NAMES(_res)[col]->s, 0, len); + strncpy((char *)RES_NAMES(_res)[col]->s, cp->name.s, len); + RES_NAMES(_res)[col]->len = len; - LM_DBG("RES_NAMES(%p)[%d]=[%s]\n", RES_NAMES(_res)[col] - , col, RES_NAMES(_res)[col]); + LM_DBG("RES_NAMES(%p)[%d]=[%.*s]\n", RES_NAMES(_res)[col] + , col, RES_NAMES(_res)[col]->len, RES_NAMES(_res)[col]->s); RES_TYPES(_res)[col] = cp->type; } @@ -136,7 +149,7 @@ int bdb_get_columns(table_p _tp, db_res_t* _res, int* _lres, int _nc) */ int bdb_convert_row(db_res_t* _res, char *bdb_result, int* _lres) { - int col, len, i, j; + int col, len, i, j; char **row_buf, *s; db_row_t* row = NULL; col = len = i = j = 0; @@ -275,8 +288,8 @@ int bdb_convert_row(db_res_t* _res, char *bdb_result, int* _lres) break; default: #ifdef BDB_EXTRA_DEBUG - LM_DBG("col[%d] Col[%s] Type[%d] Freeing row_buf[%p]\n", col - , RES_NAMES(_res)[col], RES_TYPES(_res)[col] + LM_DBG("col[%d] Col[%.*s] Type[%d] Freeing row_buf[%p]\n", col + , RES_NAMES(_res)[col]->len, RES_NAMES(_res)[col]->s, RES_TYPES(_res)[col] , (char*) row_buf[col]); LM_DBG("%p=pkg_free() row_buf[%d]\n", (char *)row_buf[col], col); @@ -440,8 +453,8 @@ int bdb_append_row(db_res_t* _res, char *bdb_result, int* _lres, int _rx) if (RES_TYPES(_res)[col] != DB_STRING) { #ifdef BDB_EXTRA_DEBUG - LM_DBG("[%d][%d] Col[%s] Type[%d] Freeing row_buf[%i]\n" - , _rx, col, RES_NAMES(_res)[col], RES_TYPES(_res)[col], col); + LM_DBG("[%d][%d] Col[%.*s] Type[%d] Freeing row_buf[%i]\n" + , _rx, col, RES_NAMES(_res)[col]->len, RES_NAMES(_res)[col]->s, RES_TYPES(_res)[col], col); #endif pkg_free((char *)row_buf[col]); } @@ -478,8 +491,8 @@ int* bdb_get_colmap(table_p _dtp, db_key_t* _k, int _n) { for(j=0; j<_dtp->ncols; j++) { - if(strlen(_k[i])==_dtp->colp[j]->name.len - && !strncasecmp(_k[i], _dtp->colp[j]->name.s, + if(_k[i]->len==_dtp->colp[j]->name.len + && !strncasecmp(_k[i]->s, _dtp->colp[j]->name.s, _dtp->colp[j]->name.len)) { _lref[i] = j; @@ -489,7 +502,7 @@ int* bdb_get_colmap(table_p _dtp, db_key_t* _k, int _n) if(i>=_dtp->ncols) { - LM_DBG("ERROR column <%s> not found\n", _k[i]); + LM_DBG("ERROR column <%.*s> not found\n", _k[i]->len, _k[i]->s); pkg_free(_lref); return NULL; } @@ -592,13 +605,15 @@ int bdb_free_columns(db_res_t* _res) for(col = 0; col < RES_COL_N(_res); col++) { #ifdef BDB_EXTRA_DEBUG - LM_DBG("Freeing RES_NAMES(%p)[%d] -> free(%p) '%s'\n", _res - , col, RES_NAMES(_res)[col], RES_NAMES(_res)[col]); LM_DBG("%p=pkg_free() RES_NAMES[%d]\n", RES_NAMES(_res)[col], col); -#endif - + LM_DBG("Freeing RES_NAMES(%p)[%d] -> free(%p) '%s'\n", _res + , col, RES_NAMES(_res)[col], RES_NAMES(_res)[col]->s); + LM_DBG("%p=pkg_free() RES_NAMES[%d]->s\n", RES_NAMES(_res)[col]->s, col); +#endif + + pkg_free((char *)RES_NAMES(_res)[col]->s); pkg_free((char *)RES_NAMES(_res)[col]); - RES_NAMES(_res)[col] = (char *)NULL; + RES_NAMES(_res)[col] = (str*)NULL; } if (RES_NAMES(_res)) diff --git a/modules/db_berkeley/km_db_berkeley.c b/modules/db_berkeley/km_db_berkeley.c index 8049baf..74fea05 100644 --- a/modules/db_berkeley/km_db_berkeley.c +++ b/modules/db_berkeley/km_db_berkeley.c @@ -33,6 +33,7 @@ #include "../../str.h" +#include "../../ut.h" #include "../../mem/mem.h" #include "../../sr_module.h" @@ -132,7 +133,7 @@ static void destroy(void) bdblib_destroy(); } -int bdb_use_table(db_con_t* _h, const char* _t) +int bdb_use_table(db_con_t* _h, const str* _t) { return db_use_table(_h, _t); } @@ -140,17 +141,19 @@ int bdb_use_table(db_con_t* _h, const char* _t) /* * Initialize database connection */ -db_con_t* bdb_init(const char* _sqlurl) +db_con_t* bdb_init(const str* _sqlurl) { db_con_t* _res; str _s; char bdb_path[BDB_PATH_LEN]; - if (!_sqlurl) - return NULL; + if (!_sqlurl || !_sqlurl->s) { + LM_ERR("invalid parameter value\n"); + return 0; + } - _s.s = (char*)_sqlurl; - _s.len = strlen(_sqlurl); + _s.s = _sqlurl->s; + _s.len = _sqlurl->len; if(_s.len <= BDB_ID_LEN || strncmp(_s.s, BDB_ID, BDB_ID_LEN)!=0) { LM_ERR("invalid database URL - should be:" @@ -237,7 +240,6 @@ int bdb_reload(char* _n) */ void bdb_check_reload(db_con_t* _con) { - str s; char* p; int rc, len; @@ -277,8 +279,8 @@ void bdb_check_reload(db_con_t* _con) p++; /*get table name*/ - s.s = (char*)CON_TABLE(_con); - s.len = strlen(CON_TABLE(_con)); + s.s = CON_TABLE(_con)->s; + s.len = CON_TABLE(_con)->len; len+=s.len; if((len>MAX_ROW_SIZE) || (s.len > MAX_TABLENAME_SIZE) ) @@ -345,7 +347,6 @@ int bdb_query(db_con_t* _con, db_key_t* _k, db_op_t* _op, db_val_t* _v, u_int32_t i, len, ret; int klen=MAX_ROW_SIZE; int *lkey=NULL, *lres=NULL; - str s; DBT key, data; DB *db; DBC *dbcp; @@ -363,10 +364,7 @@ int bdb_query(db_con_t* _con, db_key_t* _k, db_op_t* _op, db_val_t* _v, if(auto_reload) bdb_check_reload(_con); - s.s = (char*)CON_TABLE(_con); - s.len = strlen(CON_TABLE(_con)); - - _tbc = bdblib_get_table(BDB_CON_CONNECTION(_con), &s); + _tbc = bdblib_get_table(BDB_CON_CONNECTION(_con), (str*)CON_TABLE(_con)); if(!_tbc) { LM_WARN("table does not exist!\n"); return -1; @@ -629,7 +627,6 @@ int bdb_insert(db_con_t* _h, db_key_t* _k, db_val_t* _v, int _n) int *lkey=NULL; DBT key, data; DB *db; - str s; i = j = ret = 0; klen=MAX_ROW_SIZE; @@ -647,10 +644,7 @@ int bdb_insert(db_con_t* _h, db_key_t* _k, db_val_t* _v, int _n) return -2; } - s.s = (char*)CON_TABLE(_h); - s.len = strlen(CON_TABLE(_h)); - - _tbc = bdblib_get_table(BDB_CON_CONNECTION(_h), &s); + _tbc = bdblib_get_table(BDB_CON_CONNECTION(_h), (str*)CON_TABLE(_h)); if(!_tbc) { LM_WARN("table does not exist!\n"); return -3; @@ -769,7 +763,6 @@ int bdb_delete(db_con_t* _h, db_key_t* _k, db_op_t* _op, db_val_t* _v, int _n) DBT key; DB *db; DBC *dbcp; - str s; i = j = ret = 0; klen=MAX_ROW_SIZE; @@ -780,10 +773,7 @@ int bdb_delete(db_con_t* _h, db_key_t* _k, db_op_t* _op, db_val_t* _v, int _n) if ((!_h) || !CON_TABLE(_h)) return -1; - s.s = (char*)CON_TABLE(_h); - s.len = strlen(CON_TABLE(_h)); - - _tbc = bdblib_get_table(BDB_CON_CONNECTION(_h), &s); + _tbc = bdblib_get_table(BDB_CON_CONNECTION(_h), (str*)CON_TABLE(_h)); if(!_tbc) { LM_WARN("table does not exist!\n"); return -3; @@ -901,17 +891,13 @@ int _bdb_delete_cursor(db_con_t* _h, db_key_t* _k, db_op_t* _op, db_val_t* _v, i DB *db; DBC *dbcp; int *lkey=NULL; - str s; i = ret = 0; if ((!_h) || !CON_TABLE(_h)) return -1; - s.s = (char*)CON_TABLE(_h); - s.len = strlen(CON_TABLE(_h)); - - _tbc = bdblib_get_table(BDB_CON_CONNECTION(_h), &s); + _tbc = bdblib_get_table(BDB_CON_CONNECTION(_h), (str*)CON_TABLE(_h)); if(!_tbc) { LM_WARN("table does not exist!\n"); return -3; @@ -1023,7 +1009,6 @@ error: int bdb_update(db_con_t* _con, db_key_t* _k, db_op_t* _op, db_val_t* _v, db_key_t* _uk, db_val_t* _uv, int _n, int _un) { - str s; char *c, *t; int ret, i, qcol, len, sum; int *lkey=NULL; @@ -1039,11 +1024,8 @@ int bdb_update(db_con_t* _con, db_key_t* _k, db_op_t* _op, db_val_t* _v, if (!_con || !CON_TABLE(_con) || !_uk || !_uv || _un <= 0) return -1; - - s.s = (char*)CON_TABLE(_con); - s.len = strlen(CON_TABLE(_con)); - _tbc = bdblib_get_table(BDB_CON_CONNECTION(_con), &s); + _tbc = bdblib_get_table(BDB_CON_CONNECTION(_con), (str*)CON_TABLE(_con)); if(!_tbc) { LM_ERR("table does not exist\n"); return -1; diff --git a/modules/db_berkeley/km_db_berkeley.h b/modules/db_berkeley/km_db_berkeley.h index a9f9793..869983a 100644 --- a/modules/db_berkeley/km_db_berkeley.h +++ b/modules/db_berkeley/km_db_berkeley.h @@ -41,12 +41,12 @@ int bdb_reload(char* _n); void bdb_check_reload(db_con_t* _con); -int bdb_use_table(db_con_t* _h, const char* _t); +int bdb_use_table(db_con_t* _h, const str* _t); /* * Initialize database connection */ -db_con_t* bdb_init(const char* _sqlurl); +db_con_t* bdb_init(const str* _sqlurl); /*

15 years, 10 months

git:janakj/bdb: further cleanups in core database API

by Jan Janak

Module: sip-router Branch: janakj/bdb Commit: 2eb8cc0833aef2a0dcacdb25c804c0187cd74a13 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2eb8cc0… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Jan 7 14:26:27 2008 +0000 further cleanups in core database API - move use_table and close function for SQL DBs to core - move query, raw_query, insert, update, delete functions for SQL DBs to core - all this functions were almost identical implemented in the three DB, this functions uses now a function pointer based interface to do the work - the use_table functions from dbtext and db_berkeley uses also now the core API - move result management function from db_col to db_res to the other result management functions, they are not useful alone - change postgres module to match more the structure of mysql and unixodbc, remove the 'PARANOID' #define, the other modules don't have this and prefix all functions with db_postgres, make this more consistent to mysql module - prefix all functions in unixodbc module with db_unixodbc, make this consistent to the other modules, cleanup the namespace - prefix val2str function in mysql with db_mysql too - move the SQL_BUF_LENGTH to core API, all modules need this - remove the static SQL char buffer from postgres and unixodbc, uses the one provided from the core API - move documentation from db/doc to API files in doxygen format - improve and extend documentation for the whole API - make database API const correct, to guard against implementation errors and allow better compiler optimizations - change interface free_connection function in SQL DBs to connection structure to allow the usage of core API do_close - fix indention for postgres driver and make logging messages consistent - remove now unneeded system header includes for SQL DBs - remove transaction related code from postgres driver, this is not used at all and according to Klaus also brings no performance benefit if used. - probably some other smaller cleanups Tested with the testcases, so basic functionality should work.. Please test! :-) git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3506 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_berkeley/km_db_berkeley.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/modules/db_berkeley/km_db_berkeley.c b/modules/db_berkeley/km_db_berkeley.c index b4ccc7c..8049baf 100644 --- a/modules/db_berkeley/km_db_berkeley.c +++ b/modules/db_berkeley/km_db_berkeley.c @@ -134,11 +134,7 @@ static void destroy(void) int bdb_use_table(db_con_t* _h, const char* _t) { - if ((!_h) || (!_t)) - return -1; - - CON_TABLE(_h) = _t; - return 0; + return db_use_table(_h, _t); } /*

15 years, 10 months

git:janakj/bdb: - all README files regenerated from SGML

by Jan Janak

Module: sip-router Branch: janakj/bdb Commit: 773c074c415b71d2fe4a25896308d3442b383b0d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=773c074… Author: Bogdan-Andrei Iancu <bogdan(a)voice-system.ro> Committer: Bogdan-Andrei Iancu <bogdan(a)voice-system.ro> Date: Thu Dec 13 10:43:52 2007 +0000 - all README files regenerated from SGML git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3351 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_berkeley/km_README | 599 +++++++++++++++++++++-------------------- 1 files changed, 312 insertions(+), 287 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=773…

15 years, 10 months

git:janakj/bdb: Moved definition of STANDARD_TABLES, EXTRA_TABLES, PRESENCE_TABLES to openserdbctl.base.

by Jan Janak

Module: sip-router Branch: janakj/bdb Commit: b75657222b654f20d75408be5c2161a4b8880127 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b756572… Author: Will Quan <wiquan(a)employees.org> Committer: Will Quan <wiquan(a)employees.org> Date: Wed Nov 28 20:34:07 2007 +0000 Moved definition of STANDARD_TABLES, EXTRA_TABLES, PRESENCE_TABLES to openserdbctl.base. Add tables 'dispatcher' and 'dialog' to list of STANDARD_TABLES (Patch provided from Ovidiu Sas). Modified bdb_lib::bdblib_create_table to return error if the table does not exist. These are all fixes for Bug# 1836601: db_berkeley don't work git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3227 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_berkeley/km_bdb_lib.c | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/modules/db_berkeley/km_bdb_lib.c b/modules/db_berkeley/km_bdb_lib.c index 54ee975..8b9f37f 100644 --- a/modules/db_berkeley/km_bdb_lib.c +++ b/modules/db_berkeley/km_bdb_lib.c @@ -543,6 +543,20 @@ void bdblib_log(int op, table_p _tp, char* _msg, int len) } /** + * The function is called to create a handle to a db table. + * + * On startup, we do not create any of the db handles. + * Instead it is done on first-use (lazy-initialized) to only create handles to + * files (db) that we require. + * + * There is one db file per openser table (eg. acc), and they should exist + * in your DB_PATH (refer to openserctlrc) directory. + * + * This function does _not_ create the underlying binary db tables. + * Creating the tables MUST be manually performed before + * openser startup by 'openserdbctl create' + * + * Function returns NULL on error, which will cause openser to exit. * */ table_p bdblib_create_table(database_p _db, str *_s) @@ -581,12 +595,12 @@ table_p bdblib_create_table(database_p _db, str *_s) LM_DBG("CREATE TABLE = %s\n", tblname); #endif - flags = DB_CREATE | DB_THREAD; + flags = DB_THREAD; if ((rc = bdb->open(bdb, NULL, tblname, NULL, DB_HASH, flags, 0664)) != 0) { _db->dbenv->err(_db->dbenv, rc, "DB->open: %s", tblname); - LM_ERR("bdb open: %s.\n",db_strerror(rc)); + LM_ERR("bdb open failed: %s.\n",db_strerror(rc)); pkg_free(tp); return NULL; }

15 years, 10 months

git:janakj/bdb: - improve error msg on startup like in commit r3205 for dbtext

by Jan Janak

Module: sip-router Branch: janakj/bdb Commit: 49de133c51030626b643ed35d4698f37f34c7350 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=49de133… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Nov 26 13:22:51 2007 +0000 - improve error msg on startup like in commit r3205 for dbtext git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3207 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_berkeley/km_bdb_lib.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/modules/db_berkeley/km_bdb_lib.c b/modules/db_berkeley/km_bdb_lib.c index 571ee09..54ee975 100644 --- a/modules/db_berkeley/km_bdb_lib.c +++ b/modules/db_berkeley/km_bdb_lib.c @@ -366,7 +366,8 @@ database_p bdblib_get_db(str *_s) if( !_cachedb) { - LM_ERR("_cachedb is not initialized!\n"); + LM_ERR("db_berkeley cache is not initialized! Check if you loaded db_berkeley " + "before any other module that uses it.\n"); return NULL; }

15 years, 10 months

git:janakj/bdb: - output the database location on startup

by Jan Janak

Module: sip-router Branch: janakj/bdb Commit: 1e8db50b481f5281938a6a987a8641a0d264f9cb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1e8db50… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Nov 22 18:09:46 2007 +0000 - output the database location on startup git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3200 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_berkeley/km_db_berkeley.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/modules/db_berkeley/km_db_berkeley.c b/modules/db_berkeley/km_db_berkeley.c index f5e755f..b4ccc7c 100644 --- a/modules/db_berkeley/km_db_berkeley.c +++ b/modules/db_berkeley/km_db_berkeley.c @@ -186,7 +186,8 @@ db_con_t* bdb_init(const char* _sqlurl) } memset(_res, 0, sizeof(db_con_t) + sizeof(bdb_con_t)); _res->tail = (unsigned long)((char*)_res+sizeof(db_con_t)); - + + LM_INFO("using database at: %.*s", _s.len, _s.s); BDB_CON_CONNECTION(_res) = bdblib_get_db(&_s); if (!BDB_CON_CONNECTION(_res)) {

15 years, 10 months

← Newer
1
...
6
7
8
9
10
11
12
...
48
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2009