sr-dev

sr-dev@lists.kamailio.org

13 participants
43416 discussions

git:janakj/bdb: - renamed: bdb_recover -> kambdb_recover

by Jan Janak

Module: sip-router Branch: janakj/bdb Commit: 3dfbaaf8343291bec70a2ad40ce0a312dff8c344 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3dfbaaf… Author: Klaus Darilion <klaus.darilion(a)pernau.at> Committer: Klaus Darilion <klaus.darilion(a)pernau.at> Date: Wed Aug 6 11:44:43 2008 +0000 - renamed: bdb_recover -> kambdb_recover git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4602 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_berkeley/README | 26 ++++++++++++------------ modules/db_berkeley/doc/db_berkeley_admin.xml | 22 ++++++++++---------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/modules/db_berkeley/README b/modules/db_berkeley/README index 694489e..f2dd471 100644 --- a/modules/db_berkeley/README +++ b/modules/db_berkeley/README @@ -43,7 +43,7 @@ Will Quan 1.10. METADATA_READONLY (optional) 1.11. METADATA_LOGFLAGS (optional) 1.12. DB Maintaince Script : kamdbctl - 1.13. DB Recovery : bdb_recover + 1.13. DB Recovery : kambdb_recover 1.14. Known Limitations List of Examples @@ -57,7 +57,7 @@ Will Quan 1.7. METADATA_KEYS 1.8. METADATA_LOGFLAGS 1.9. kamdbctl - 1.10. bdb_recover usage + 1.10. kambdb_recover usage Chapter 1. Admin Guide @@ -101,7 +101,7 @@ modparam("db_berkeley", "auto_reload", 1) The following operations can be journaled: INSERT, UPDATE, DELETE. Other operations such as SELECT, do not. This journaling are required if you need to recover from a corrupt - DB file. That is, bdb_recover requires these to rebuild the db + DB file. That is, kambdb_recover requires these to rebuild the db file. If you find this log feature useful, you may also be interested in the METADATA_LOGFLAGS bitfield that each table has. It will allow you to control which operations to journal, @@ -203,7 +203,7 @@ modparam("db_berkeley", "journal_roll_interval", 3600) '/usr/local/share/kamailio/db_berkeley/openser' By default these tables are created Read/Write and without any journalling as shown. These settings can be modified on a per - table basis. Note: If you plan to use bdb_recover, you must + table basis. Note: If you plan to use kambdb_recover, you must change the LOGFLAGS. METADATA_READONLY 0 @@ -423,13 +423,13 @@ ce of db; output DB_PATH/db.new) kamdbctl bdb newappend db datafile (appends data to a new instan ce of db; output DB_PATH/db.new) -1.13. DB Recovery : bdb_recover +1.13. DB Recovery : kambdb_recover The db_berkeley module uses the Concurrent Data Store (CDS) architecture. As such, no transaction or journaling is - provided by the DB natively. The application bdb_recover is + provided by the DB natively. The application kambdb_recover is specifically written to recover data from journal files that - Kamailio creates. The bdb_recover application requires an + Kamailio creates. The kambdb_recover application requires an additional text file that contains the table schema. The schema is loaded with the '-s' option and is required for @@ -447,20 +447,20 @@ ce of db; output DB_PATH/db.new) The following illustrates the four operations available to the administrator. - Example 1.10. bdb_recover usage -usage: ./bdb_recover -s schemadir [-h home] [-c tablename] + Example 1.10. kambdb_recover usage +usage: ./kambdb_recover -s schemadir [-h home] [-c tablename] This will create a brand new DB file with metadata. -usage: ./bdb_recover -s schemadir [-h home] [-C all] +usage: ./kambdb_recover -s schemadir [-h home] [-C all] This will create all the core tables, each with metadata. -usage: ./bdb_recover -s schemadir [-h home] [-r journal-file] +usage: ./kambdb_recover -s schemadir [-h home] [-r journal-file] This will rebuild a DB and populate it with operation from jour nal-file. The table name is embedded in the journal-file name by conventi on. -usage: ./bdb_recover -s schemadir [-h home] [-R lastN] +usage: ./kambdb_recover -s schemadir [-h home] [-R lastN] This will iterate over all core tables enumerated. If journal f iles exist in 'home', a new DB file will be created and populated with the data found @@ -474,7 +474,7 @@ n the last hours data in table location. Important note- A corrupted DB file must be moved out of the - way before bdb_recover is executed. + way before kambdb_recover is executed. 1.14. Known Limitations diff --git a/modules/db_berkeley/doc/db_berkeley_admin.xml b/modules/db_berkeley/doc/db_berkeley_admin.xml index dd5acc3..410bfe8 100644 --- a/modules/db_berkeley/doc/db_berkeley_admin.xml +++ b/modules/db_berkeley/doc/db_berkeley_admin.xml @@ -74,7 +74,7 @@ modparam("db_berkeley", "auto_reload", 1) The following operations can be journaled: INSERT, UPDATE, DELETE. Other operations such as SELECT, do not. This journaling are required if you need to recover from a corrupt - DB file. That is, bdb_recover requires these to rebuild + DB file. That is, kambdb_recover requires these to rebuild the db file. If you find this log feature useful, you may also be interested in the METADATA_LOGFLAGS bitfield that each table has. It will allow you to control which operations to @@ -223,7 +223,7 @@ modparam("db_berkeley", "journal_roll_interval", 3600) By default, the files are installed in '/usr/local/share/kamailio/db_berkeley/openser' By default these tables are created Read/Write and without any journalling as shown. These settings can be modified on a per table basis. - Note: If you plan to use bdb_recover, you must change the LOGFLAGS. + Note: If you plan to use kambdb_recover, you must change the LOGFLAGS. </para> <programlisting format="linespecific"> METADATA_READONLY @@ -513,13 +513,13 @@ usage: kamdbctl create </section> <section> - <title>DB Recovery : bdb_recover</title> + <title>DB Recovery : kambdb_recover</title> <para> The db_berkeley module uses the Concurrent Data Store (CDS) architecture. As such, no transaction or journaling is provided by the DB natively. - The application bdb_recover is specifically written to recover data from + The application kambdb_recover is specifically written to recover data from journal files that Kamailio creates. - The bdb_recover application requires an additional text file that contains + The kambdb_recover application requires an additional text file that contains the table schema. </para> @@ -540,19 +540,19 @@ usage: kamdbctl create <para> The following illustrates the four operations available to the administrator. <example> - <title>bdb_recover usage</title> + <title>kambdb_recover usage</title> <programlisting> -usage: ./bdb_recover -s schemadir [-h home] [-c tablename] +usage: ./kambdb_recover -s schemadir [-h home] [-c tablename] This will create a brand new DB file with metadata. -usage: ./bdb_recover -s schemadir [-h home] [-C all] +usage: ./kambdb_recover -s schemadir [-h home] [-C all] This will create all the core tables, each with metadata. -usage: ./bdb_recover -s schemadir [-h home] [-r journal-file] +usage: ./kambdb_recover -s schemadir [-h home] [-r journal-file] This will rebuild a DB and populate it with operation from journal-file. The table name is embedded in the journal-file name by convention. -usage: ./bdb_recover -s schemadir [-h home] [-R lastN] +usage: ./kambdb_recover -s schemadir [-h home] [-R lastN] This will iterate over all core tables enumerated. If journal files exist in 'home', a new DB file will be created and populated with the data found in the last N files. The files are 'replayed' in chronological order (oldest to newest). This @@ -564,7 +564,7 @@ usage: ./bdb_recover -s schemadir [-h home] [-R lastN] </para> <para> - Important note- A corrupted DB file must be moved out of the way before bdb_recover is executed. + Important note- A corrupted DB file must be moved out of the way before kambdb_recover is executed. </para> </section>

15 years, 7 months

git:janakj/bdb: - regenerated all READMEs ( make modules-readme exclude_modules="")

by Jan Janak

Module: sip-router Branch: janakj/bdb Commit: 4ca582caef7aa1e485ae2320ae44d745433fa19c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4ca582c… Author: Klaus Darilion <klaus.darilion(a)pernau.at> Committer: Klaus Darilion <klaus.darilion(a)pernau.at> Date: Wed Aug 6 10:49:19 2008 +0000 - regenerated all READMEs (make modules-readme exclude_modules="") git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4596 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_berkeley/README | 157 ++++++++++++++++++++++--------------------- 1 files changed, 80 insertions(+), 77 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=4ca…

15 years, 7 months

git:janakj/bdb: - renaming: openser -> kamailio

by Jan Janak

Module: sip-router Branch: janakj/bdb Commit: 06bb60d69cea4eb10a65e47a6c5e381d004ebc6c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=06bb60d… Author: Klaus Darilion <klaus.darilion(a)pernau.at> Committer: Klaus Darilion <klaus.darilion(a)pernau.at> Date: Wed Aug 6 08:20:30 2008 +0000 - renaming: openser -> kamailio git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@4585 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_berkeley/README | 28 ++++++++++++------------ modules/db_berkeley/bdb_lib.c | 2 +- modules/db_berkeley/doc/db_berkeley_admin.xml | 28 ++++++++++++------------ 3 files changed, 29 insertions(+), 29 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=06b…

15 years, 7 months

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: e4a39affff2140f41c031c94610236718efb7e03 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e4a39af… 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/bdb_res.c | 6 ++++++ modules/db_berkeley/bdb_val.c | 4 ++++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/modules/db_berkeley/bdb_res.c b/modules/db_berkeley/bdb_res.c index c165122..93a408b 100644 --- a/modules/db_berkeley/bdb_res.c +++ b/modules/db_berkeley/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/bdb_val.c b/modules/db_berkeley/bdb_val.c index 1e239ed..1f20c9c 100644 --- a/modules/db_berkeley/bdb_val.c +++ b/modules/db_berkeley/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, 7 months

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

by Jan Janak

Module: sip-router Branch: janakj/bdb Commit: 49371467f5b3aaea20bcb1d4e18ac5a268812328 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4937146… 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/bdb_res.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/db_berkeley/bdb_res.c b/modules/db_berkeley/bdb_res.c index cc5e7c3..c165122 100644 --- a/modules/db_berkeley/bdb_res.c +++ b/modules/db_berkeley/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, 7 months

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

by Jan Janak

Module: sip-router Branch: janakj/bdb Commit: 3f9123af99a5ced4eff8d253dcaeffbc73ccd61e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3f9123a… 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/README | 149 +++++++++++++++++++++---------------------- 1 files changed, 73 insertions(+), 76 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=3f9…

15 years, 7 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: efadf6d6dabf6f6c5b11fd7603df545677a00129 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=efadf6d… 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/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/db_berkeley/Makefile b/modules/db_berkeley/Makefile index 5671867..5f72c5a 100644 --- a/modules/db_berkeley/Makefile +++ b/modules/db_berkeley/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, 7 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: a59602242641e2d4df4763409da5fa5a36a01a85 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a596022… 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/bdb_val.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/modules/db_berkeley/bdb_val.c b/modules/db_berkeley/bdb_val.c index 3d568da..1e239ed 100644 --- a/modules/db_berkeley/bdb_val.c +++ b/modules/db_berkeley/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, 7 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: 423e2078e1fb99c4f5bd2575ba0d739c96d159df URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=423e207… 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/bdb_res.c | 31 ++++++------------------------- 1 files changed, 6 insertions(+), 25 deletions(-) diff --git a/modules/db_berkeley/bdb_res.c b/modules/db_berkeley/bdb_res.c index 93a408b..0049d7b 100644 --- a/modules/db_berkeley/bdb_res.c +++ b/modules/db_berkeley/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, 7 months

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

by Jan Janak

Module: sip-router Branch: janakj/bdb Commit: 3904bb0de19f991292c69e61ebfe387d2d10809f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3904bb0… 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/db_berkeley.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/modules/db_berkeley/db_berkeley.c b/modules/db_berkeley/db_berkeley.c index b4ccc7c..8049baf 100644 --- a/modules/db_berkeley/db_berkeley.c +++ b/modules/db_berkeley/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, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev