sr-dev

sr-dev@lists.kamailio.org

17 participants
44126 discussions

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: - 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: 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: - 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: - remove raw_query module export, this is not implemented anyway

by Jan Janak

Module: sip-router Branch: janakj/bdb Commit: 697c6ee7ceeb32d276ebee6040d4df8125687c44 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=697c6ee… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri Oct 12 15:12:11 2007 +0000 - remove raw_query module export, this is not implemented anyway git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2912 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_berkeley/km_db_berkeley.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/modules/db_berkeley/km_db_berkeley.c b/modules/db_berkeley/km_db_berkeley.c index af464a4..105186d 100644 --- a/modules/db_berkeley/km_db_berkeley.c +++ b/modules/db_berkeley/km_db_berkeley.c @@ -70,7 +70,6 @@ static cmd_export_t cmds[] = { {"db_init", (cmd_function)sc_init, 1, 0, 0, 0}, {"db_close", (cmd_function)sc_close, 2, 0, 0, 0}, {"db_query", (cmd_function)sc_query, 2, 0, 0, 0}, - {"db_raw_query", (cmd_function)sc_raw_query, 2, 0, 0, 0}, {"db_free_result", (cmd_function)sc_free_query, 2, 0, 0, 0}, {"db_insert", (cmd_function)sc_insert, 2, 0, 0, 0}, {"db_delete", (cmd_function)sc_delete, 2, 0, 0, 0},

15 years, 10 months

git:janakj/bdb: - port to new logging system

by Jan Janak

Module: sip-router Branch: janakj/bdb Commit: ce426ea4bc55dac202777368c85bc7cf51308f1b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ce426ea… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Oct 4 12:28:04 2007 +0000 - port to new logging system - increase log level for messages in db operation errors git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2851 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_berkeley/km_bdb_lib.c | 124 ++++++++---------- modules/db_berkeley/km_bdb_res.c | 247 ++++++++++++++++----------------- modules/db_berkeley/km_bdb_val.c | 40 +++--- modules/db_berkeley/km_db_berkeley.c | 191 +++++++++++---------------- 4 files changed, 273 insertions(+), 329 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=ce4…

15 years, 10 months

git:janakj/bdb: - move new_result and free_columns function to db directory

by Jan Janak

Module: sip-router Branch: janakj/bdb Commit: bf8025342869781330da349b61dafad996bff09c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bf80253… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri Oct 5 14:32:16 2007 +0000 - move new_result and free_columns function to db directory - remove the implementation of this functions in all database modules - still missing - postgresql and db_berkeley implement different, more thouroughly free methods for colums and such - review if we can use the common functions like the other three modules git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2871 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_berkeley/km_bdb_res.c | 16 ---------------- modules/db_berkeley/km_bdb_res.h | 1 - modules/db_berkeley/km_db_berkeley.c | 7 ++++--- 3 files changed, 4 insertions(+), 20 deletions(-) diff --git a/modules/db_berkeley/km_bdb_res.c b/modules/db_berkeley/km_bdb_res.c index a8a1a63..a6823ac 100644 --- a/modules/db_berkeley/km_bdb_res.c +++ b/modules/db_berkeley/km_bdb_res.c @@ -499,22 +499,6 @@ int* sc_get_colmap(table_p _dtp, db_key_t* _k, int _n) } -db_res_t* sc_result_new(void) -{ - db_res_t* _res = NULL; - _res = (db_res_t*)pkg_malloc(sizeof(db_res_t)); - if (!_res) - { - LM_ERR("Failed to allocate %lu bytes for result structure\n" - , (unsigned long)sizeof(db_res_t)); - return NULL; - } - - memset(_res, 0, sizeof(db_res_t)); - return _res; -} - - int sc_free_result(db_res_t* _res) { sc_free_columns(_res); diff --git a/modules/db_berkeley/km_bdb_res.h b/modules/db_berkeley/km_bdb_res.h index 79685fd..77fded0 100644 --- a/modules/db_berkeley/km_bdb_res.h +++ b/modules/db_berkeley/km_bdb_res.h @@ -53,7 +53,6 @@ int sc_convert_row( db_res_t* _res, char *bdb_result, int* _lres); int sc_append_row(db_res_t* _res, char *bdb_result, int* _lres, int _rx); int* sc_get_colmap(table_p _tp, db_key_t* _k, int _n); -db_res_t* sc_result_new(void); int sc_free_result(db_res_t* _res); int sc_free_columns(db_res_t* _res); int sc_free_rows(db_res_t* _res); diff --git a/modules/db_berkeley/km_db_berkeley.c b/modules/db_berkeley/km_db_berkeley.c index 08fc907..af464a4 100644 --- a/modules/db_berkeley/km_db_berkeley.c +++ b/modules/db_berkeley/km_db_berkeley.c @@ -36,6 +36,7 @@ #include "../../mem/mem.h" #include "../../sr_module.h" +#include "../../db/db_res.h" #include "db_berkeley.h" #include "bdb_lib.h" #include "bdb_res.h" @@ -428,7 +429,7 @@ int sc_query(db_con_t* _con, db_key_t* _k, db_op_t* _op, db_val_t* _v, LM_DBG("%i = SELECT COUNT(*) FROM %.*s\n", i, _tp->name.len, _tp->name.s); #endif - *_r = sc_result_new(); + *_r = db_new_result(); if (!*_r) { LM_ERR("no memory left for result \n"); ret = -2; @@ -504,7 +505,7 @@ int sc_query(db_con_t* _con, db_key_t* _k, db_op_t* _op, db_val_t* _v, data.flags = DB_DBT_USERMEM; /*create an empty db_res_t which gets returned even if no result*/ - *_r = sc_result_new(); + *_r = db_new_result(); if (!*_r) { LM_ERR("no memory left for result \n"); ret = -2; @@ -926,7 +927,7 @@ int _sc_delete_cursor(db_con_t* _h, db_key_t* _k, db_op_t* _op, db_val_t* _v, in } /* create an empty db_res_t which gets returned even if no result */ - _r = sc_result_new(); + _r = db_new_result(); if (!_r) { LM_ERR("no memory for result \n"); }

15 years, 10 months

git:janakj/bdb: Add function bdb_time2str

by Jan Janak

Module: sip-router Branch: janakj/bdb Commit: 56177cc155a42959aadbcbf720fb88ac289905b0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=56177cc… Author: Will Quan <wiquan(a)employees.org> Committer: Will Quan <wiquan(a)employees.org> Date: Wed Nov 7 17:32:35 2007 +0000 Add function bdb_time2str git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3049 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_berkeley/km_bdb_val.c | 43 +++++++++++++++++++++++++++++++++++++- 1 files changed, 42 insertions(+), 1 deletions(-) diff --git a/modules/db_berkeley/km_bdb_val.c b/modules/db_berkeley/km_bdb_val.c index b030ec6..c1330c9 100644 --- a/modules/db_berkeley/km_bdb_val.c +++ b/modules/db_berkeley/km_bdb_val.c @@ -35,6 +35,47 @@ #include "bdb_val.h" #include <string.h> +/** + * A copy of db_ut::db_time2str EXCEPT does not wrap the date in single-quotes + * + * Convert a time_t value to string (w.o single-quote) + * \param _v source value + * \param _s target string + * \param _l available length and target length + * \return -1 on error, 0 on success + * \todo This functions add quotes to the time value. This + * should be done in the val2str function, as some databases + * like db_berkeley don't need or like this at all. + */ +inline int bdb_time2str(time_t _v, char* _s, int* _l) +{ + struct tm* t; + int l; + + if ((!_s) || (!_l) || (*_l < 2)) { + LM_ERR("Invalid parameter value\n"); + return -1; + } + +// *_s++ = '\''; + + /* Convert time_t structure to format accepted by the database */ + t = localtime(&_v); + l = strftime(_s, *_l -1, "%Y-%m-%d %H:%M:%S", t); + + if (l == 0) { + LM_ERR("Error during time conversion\n"); + /* the value of _s is now unspecified */ + _s = NULL; + _l = 0; + return -1; + } + *_l = l; + +// *(_s + l) = '\''; +// *_l = l + 2; + return 0; +} /** * Does not copy strings @@ -207,7 +248,7 @@ int bdb_val2str(db_val_t* _v, char* _s, int* _len) break; case DB_DATETIME: - if (db_time2str(VAL_TIME(_v), _s, _len) < 0) { + if (bdb_time2str(VAL_TIME(_v), _s, _len) < 0) { LM_ERR("Error while converting time_t to string\n"); return -6; } else {

15 years, 10 months

git:janakj/bdb: -fix memory leak in 'bdb_insert'

by Jan Janak

Module: sip-router Branch: janakj/bdb Commit: f6fdcb923df31763163b5d461c3ee5c12d39c8f5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f6fdcb9… Author: Will Quan <wiquan(a)employees.org> Committer: Will Quan <wiquan(a)employees.org> Date: Wed Nov 7 00:44:14 2007 +0000 -fix memory leak in 'bdb_insert' -fix memory scribbler in '_bdb_delete_cursor' -renamed function prefixes from 'sc_' to 'bdb_' -added mi command for bdb_reload (added openserctl.db_berkeley) -globally replaced openserctlrc parameter 'DBTEXT_PATH' with 'DB_PATH' so db_berkeley can use it too. -modified openserdbctl to print error when invoking serweb with DBTEXT or DB_BERKELEY -update docs for db_berkeley git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3036 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_berkeley/km_Makefile | 2 +- modules/db_berkeley/km_README | 568 ++++++++++++---------- modules/db_berkeley/km_bdb_lib.c | 91 ++-- modules/db_berkeley/km_bdb_lib.h | 30 +- modules/db_berkeley/km_bdb_mi.c | 63 +++ modules/db_berkeley/km_bdb_mi.h | 36 ++ modules/db_berkeley/km_bdb_res.c | 76 ++-- modules/db_berkeley/km_bdb_res.h | 30 +- modules/db_berkeley/km_bdb_util.c | 2 +- modules/db_berkeley/km_bdb_util.h | 2 +- modules/db_berkeley/km_bdb_val.c | 5 +- modules/db_berkeley/km_bdb_val.h | 4 +- modules/db_berkeley/km_db_berkeley.c | 290 ++++++------ modules/db_berkeley/km_db_berkeley.h | 24 +- modules/db_berkeley/km_doc/db_berkeley_user.sgml | 218 ++++++--- 15 files changed, 835 insertions(+), 606 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=f6f…

15 years, 10 months

git:janakj/bdb: add support for default values on table columns

by Jan Janak

Module: sip-router Branch: janakj/bdb Commit: f85bcb84be26ba9dc58e1a0c5f6af5f18bf77beb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f85bcb8… Author: Will Quan <wiquan(a)employees.org> Committer: Will Quan <wiquan(a)employees.org> Date: Tue Nov 13 08:13:30 2007 +0000 add support for default values on table columns git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3113 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_berkeley/km_bdb_lib.c | 97 +++++++++++++++++++++++++++++++++++-- modules/db_berkeley/km_bdb_lib.h | 3 + 2 files changed, 94 insertions(+), 6 deletions(-) diff --git a/modules/db_berkeley/km_bdb_lib.c b/modules/db_berkeley/km_bdb_lib.c index 9c0a386..571ee09 100644 --- a/modules/db_berkeley/km_bdb_lib.c +++ b/modules/db_berkeley/km_bdb_lib.c @@ -619,7 +619,15 @@ table_p bdblib_create_table(database_p _db, str *_s) LM_ERR("FAILED to load METADATA COLS in table: %s.\n", tblname); goto error; } - + + /*initialize columns default values from metadata*/ + rc = load_metadata_defaults(tp); + if(rc!=0) + { + LM_ERR("FAILED to load METADATA DEFAULTS in table: %s.\n", tblname); + goto error; + } + rc = load_metadata_keys(tp); if(rc!=0) { @@ -937,6 +945,81 @@ int load_metadata_logflags(table_p _tp) return 0; } +int load_metadata_defaults(table_p _tp) +{ + int ret,n,len; + char dbuf[MAX_ROW_SIZE]; + char *s = NULL; + char cv[64]; + DB *db = NULL; + DBT key, data; + column_p col; + ret = n = len = 0; + + if(!_tp || !_tp->db) + return -1; + + db = _tp->db; + memset(&key, 0, sizeof(DBT)); + memset(&data, 0, sizeof(DBT)); + memset(dbuf, 0, MAX_ROW_SIZE); + + key.data = METADATA_DEFAULTS; + key.size = strlen(METADATA_DEFAULTS); + + /*memory for the result*/ + data.data = dbuf; + data.ulen = MAX_ROW_SIZE; + data.flags = DB_DBT_USERMEM; + + if ((ret = db->get(db, NULL, &key, &data, 0)) != 0) + { +#ifdef BDB_EXTRA_DEBUG + LM_DBG("NO DEFAULTS ; SETTING ALL columns to NULL! \n" ); +#endif + + /*no defaults in DB; make some up.*/ + for(n=0; n<_tp->ncols; n++) + { + col = _tp->colp[n]; + if( col ) + { /*set all columns default value to 'NULL' */ + len = strlen("NULL"); + col->dv.s = (char*)pkg_malloc(len * sizeof(char)); + memcpy(col->dv.s, "NULL", len); + col->dv.len = len; + } + } + return 0; + } + + /* use the defaults provided*/ + s = strtok(dbuf, DELIM); + while(s!=NULL && n< _tp->ncols) + { ret = sscanf(s,"%s", cv); + if(ret != 1) return -1; + col = _tp->colp[n]; + if( col ) + { /*set column default*/ + len = strlen(s); + col->dv.s = (char*)pkg_malloc(len * sizeof(char)); + memcpy(col->dv.s, cv, len); + col->dv.len = len; +#ifdef BDB_EXTRA_DEBUG + LM_DBG("COLUMN DEFAULT is %.*s for column[%.*s] \n" + , col->dv.len , ZSW(col->dv.s) + , col->name.len , ZSW(col->name.s) + ); +#endif + + } + n++; + s=strtok(NULL, DELIM); + } + + return 0; +} + /*creates a composite key _k of length _klen from n values of _v; provide your own initialized memory for target _k and _klen; @@ -1086,23 +1169,24 @@ int bdblib_valtochar(table_p _tp, int* _lres, char* _k, int* _klen, db_val_t* _v } /* - NO KEY provided; append a 'NULL' value since i - is considered a key according to our schema. + NO KEY provided; use the column default value (dv) + i.e _tp->colp[i]->dv */ #ifdef BDB_EXTRA_DEBUG - LM_DBG("Missing KEY[%i]: %.*s.%.*s \n", i + LM_DBG("Missing KEY[%i]: %.*s.%.*s using default [%.*s] \n", i , _tp->name.len , ZSW(_tp->name.s) , _tp->colp[i]->name.len, ZSW(_tp->colp[i]->name.s) + , _tp->colp[i]->dv.len , ZSW(_tp->colp[i]->dv.s) ); #endif - len = strlen(cNULL); + len = _tp->colp[i]->dv.len; sum += len; if(sum > total) { LM_ERR("Destination buffer too short for subval %s\n",cNULL); return -5; } - strncpy(p, cNULL, len); + strncpy(p, _tp->colp[i]->dv.s, len); p += len; *_klen = sum; @@ -1195,6 +1279,7 @@ int tbl_free(table_p _tp) for(i=0;i<_tp->ncols;i++) { if(_tp->colp[i]) { pkg_free(_tp->colp[i]->name.s); + pkg_free(_tp->colp[i]->dv.s); pkg_free(_tp->colp[i]); } } diff --git a/modules/db_berkeley/km_bdb_lib.h b/modules/db_berkeley/km_bdb_lib.h index 399d495..533b111 100644 --- a/modules/db_berkeley/km_bdb_lib.h +++ b/modules/db_berkeley/km_bdb_lib.h @@ -54,6 +54,7 @@ #define METADATA_KEY "METADATA_KEY" #define METADATA_READONLY "METADATA_READONLY" #define METADATA_LOGFLAGS "METADATA_LOGFLAGS" +#define METADATA_DEFAULTS "METADATA_DEFAULTS" /*journal logging flag masks */ #define JLOG_NONE 0 @@ -79,6 +80,7 @@ typedef struct _row typedef struct _column { str name; + str dv; /* default value */ int type; int flag; } column_t, *column_p; @@ -142,6 +144,7 @@ int load_metadata_columns(table_p _tp); int load_metadata_keys(table_p _tp); int load_metadata_readonly(table_p _tp); int load_metadata_logflags(table_p _tp); +int load_metadata_defaults(table_p _tp); int bdblib_valtochar(table_p _tp, int* _lres, char* _k, int* _klen, db_val_t* _v, int _n, int _ko);

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