sr-dev

sr-dev@lists.kamailio.org

17 participants
44126 discussions

git:janakj/bdb: - disable big integer (DB_BIGINT) support for non SQL DB modules for now

by Jan Janak

Module: sip-router Branch: janakj/bdb Commit: ea6985f7cf6c18d67618ae222d53fce4f162eb9c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ea6985f… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Sep 24 11:02:42 2008 +0000 - disable big integer (DB_BIGINT) support for non SQL DB modules for now - if such a value is used, an error will be returned and also logged git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4986 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_berkeley/km_bdb_res.c | 6 ++++++ modules/db_berkeley/km_bdb_val.c | 4 ++++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/modules/db_berkeley/km_bdb_res.c b/modules/db_berkeley/km_bdb_res.c index c165122..93a408b 100644 --- a/modules/db_berkeley/km_bdb_res.c +++ b/modules/db_berkeley/km_bdb_res.c @@ -424,6 +424,9 @@ int bdb_is_neq_type(db_type_t _t0, db_type_t _t1) case DB_INT: if(_t0==DB_DATETIME || _t0==DB_BITMAP) return 0; + case DB_BIGINT: + LM_ERR("BIGINT not supported"); + return 0; case DB_DATETIME: if(_t0==DB_INT) return 0; @@ -514,6 +517,9 @@ int bdb_cmp_val(db_val_t* _vp, db_val_t* _v) case DB_INT: return (_vp->val.int_val<_v->val.int_val)?-1: (_vp->val.int_val>_v->val.int_val)?1:0; + case DB_BIGINT: + LM_ERR("BIGINT not supported"); + return -1; case DB_DOUBLE: return (_vp->val.double_val<_v->val.double_val)?-1: (_vp->val.double_val>_v->val.double_val)?1:0; diff --git a/modules/db_berkeley/km_bdb_val.c b/modules/db_berkeley/km_bdb_val.c index 1e239ed..1f20c9c 100644 --- a/modules/db_berkeley/km_bdb_val.c +++ b/modules/db_berkeley/km_bdb_val.c @@ -112,6 +112,10 @@ int bdb_str2val(db_type_t _t, db_val_t* _v, char* _s, int _l) } break; + case DB_BIGINT: + LM_ERR("BIGINT not supported"); + return -1; + case DB_BITMAP: if (db_str2int(_s, &VAL_INT(_v)) < 0) { LM_ERR("Error while converting BITMAP value from string\n");

15 years, 10 months

git:janakj/bdb: - unify common rows and row allocation functionality in the DB API core

by Jan Janak

Module: sip-router Branch: janakj/bdb Commit: 2582b7a760241411a8eccff504be88c17c5ae737 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2582b7a… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Dec 15 16:33:22 2008 +0000 - unify common rows and row allocation functionality in the DB API core git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5362 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_berkeley/km_bdb_res.c | 31 ++++++------------------------- 1 files changed, 6 insertions(+), 25 deletions(-) diff --git a/modules/db_berkeley/km_bdb_res.c b/modules/db_berkeley/km_bdb_res.c index 93a408b..0049d7b 100644 --- a/modules/db_berkeley/km_bdb_res.c +++ b/modules/db_berkeley/km_bdb_res.c @@ -120,20 +120,10 @@ int bdb_convert_row(db_res_t* _res, char *bdb_result, int* _lres) /* Save the number of rows in the current fetch */ RES_ROW_N(_res) = 1; - /* Allocate storage to hold the bdb result values */ - len = sizeof(db_val_t) * RES_COL_N(_res); - ROW_VALUES(row) = (db_val_t*)pkg_malloc(len); - - if (!ROW_VALUES(row)) { - LM_ERR("no private memory left\n"); - return -1; + if (db_allocate_row(_res, row) != 0) { + LM_ERR("could not allocate row"); + return -2; } - LM_DBG("allocate %d bytes for row values at %p\n", len, ROW_VALUES(row)); - memset(ROW_VALUES(row), 0, len); - - /* Save the number of columns in the ROW structure */ - ROW_N(row) = RES_COL_N(_res); - /* * Allocate an array of pointers one per column. * It that will be used to hold the address of the string representation of each column. @@ -257,19 +247,10 @@ int bdb_append_row(db_res_t* _res, char *bdb_result, int* _lres, int _rx) row = &(RES_ROWS(_res)[_rx]); - /* Allocate storage to hold the bdb result values */ - len = sizeof(db_val_t) * RES_COL_N(_res); - ROW_VALUES(row) = (db_val_t*)pkg_malloc(len); - - if (!ROW_VALUES(row)) { - LM_ERR("no private memory left\n"); - return -1; + if (db_allocate_row(_res, row) != 0) { + LM_ERR("could not allocate row"); + return -2; } - LM_DBG("allocate %d bytes for row values at %p\n", len, ROW_VALUES(row)); - memset(ROW_VALUES(row), 0, len); - - /* Save the number of columns in the ROW structure */ - ROW_N(row) = RES_COL_N(_res); /* * Allocate an array of pointers one per column.

15 years, 10 months

git:janakj/bdb: - fix link entity names, patch from Carsten Gross

by Jan Janak

Module: sip-router Branch: janakj/bdb Commit: e08c9c4f52c191cf1e5ad29c5d832c5a15934b7d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e08c9c4… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Aug 7 09:15:08 2008 +0000 - fix link entity names, patch from Carsten Gross - regenerate READMEs git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4630 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_berkeley/km_README | 149 ++++++++++++++++++++--------------------- 1 files changed, 73 insertions(+), 76 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=e08…

15 years, 10 months

git:janakj/bdb: - fix compilation on OpenBSD, related to missing includes paths and wrong

by Jan Janak

Module: sip-router Branch: janakj/bdb Commit: 57949b77e47ddf33f41888edf6d5117658caa14b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=57949b7… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue Oct 21 09:23:07 2008 +0000 - fix compilation on OpenBSD, related to missing includes paths and wrong order of headers, patches from Jason Creighton, jcreigh at gmail dot com - seas: move stdio.h include before <netinet/in.h>, closes #2183510 - ldap: also include localbase to Makefile, closes #2183544 - h350: also include localbase to Makefile, closes #2183551 - db_berkeley: add OpenBSD include directory to Makefile, closes #2183577 git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@5099 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_berkeley/km_Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/db_berkeley/km_Makefile b/modules/db_berkeley/km_Makefile index 5671867..5f72c5a 100644 --- a/modules/db_berkeley/km_Makefile +++ b/modules/db_berkeley/km_Makefile @@ -8,7 +8,7 @@ # extra debug messages # -DBDB_EXTRA_DEBUG is optional DEFS +=-I$(LOCALBASE)/include -I$(LOCALBASE)/BerkeleyDB.4.6/include \ - -I$(SYSBASE)/include + -I$(LOCALBASE)/include/db4 -I$(SYSBASE)/include include ../../Makefile.defs

15 years, 10 months

git:janakj/bdb: - port from opensips r4526, credits goes to bogdan

by Jan Janak

Module: sip-router Branch: janakj/bdb Commit: df15c1c6c25ae68f395c342cf99e029be807cba7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=df15c1c… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Aug 6 15:32:44 2008 +0000 - port from opensips r4526, credits goes to bogdan - 64bits compile warnings fixed git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4618 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_berkeley/km_bdb_res.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/db_berkeley/km_bdb_res.c b/modules/db_berkeley/km_bdb_res.c index cc5e7c3..c165122 100644 --- a/modules/db_berkeley/km_bdb_res.c +++ b/modules/db_berkeley/km_bdb_res.c @@ -74,8 +74,8 @@ int bdb_get_columns(table_p _tp, db_res_t* _res, int* _lres, int _nc) db_free_columns(_res); return -3; } - LM_DBG("allocate %d bytes for RES_NAMES[%d] at %p\n", sizeof(str), col, - RES_NAMES(_res)[col]); + LM_DBG("allocate %lu bytes for RES_NAMES[%d] at %p\n", + (unsigned long)sizeof(str), col, RES_NAMES(_res)[col]); /* The pointer that is here returned is part of the result structure. */ RES_NAMES(_res)[col]->s = cp->name.s;

15 years, 10 months

git:janakj/bdb: - remove not reached return statement at the end of val2str functions

by Jan Janak

Module: sip-router Branch: janakj/bdb Commit: 1c761b015f6d3a9786c9b8bbf9e91db9c374bab7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1c761b0… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri Sep 19 11:56:49 2008 +0000 - remove not reached return statement at the end of val2str functions git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4965 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_berkeley/km_bdb_val.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/modules/db_berkeley/km_bdb_val.c b/modules/db_berkeley/km_bdb_val.c index 3d568da..1e239ed 100644 --- a/modules/db_berkeley/km_bdb_val.c +++ b/modules/db_berkeley/km_bdb_val.c @@ -279,5 +279,4 @@ int bdb_val2str(db_val_t* _v, char* _s, int* _len) LM_DBG("Unknown data type\n"); return -8; } - return -9; }

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: 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: - 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: 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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev