sr-dev February 2009

sr-dev@lists.kamailio.org

13 participants
478 discussions

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

git:janakj/bdb: - updated the cmd_export_t according to latest structure

by Jan Janak

Module: sip-router Branch: janakj/bdb Commit: 0b499efd8edbc7324079097f71a2e9c1ccc7ac8c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0b499ef… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Oct 4 11:23:12 2007 +0000 - updated the cmd_export_t according to latest structure git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2846 689a6050-402a-0410-94f2-e92a70836424 --- modules/db_berkeley/km_db_berkeley.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/modules/db_berkeley/km_db_berkeley.c b/modules/db_berkeley/km_db_berkeley.c index 4f5e2ca..a5b0b01 100644 --- a/modules/db_berkeley/km_db_berkeley.c +++ b/modules/db_berkeley/km_db_berkeley.c @@ -65,16 +65,16 @@ static void destroy(void); * Exported functions */ static cmd_export_t cmds[] = { - {"db_use_table", (cmd_function)sc_use_table, 2, 0, 0}, - {"db_init", (cmd_function)sc_init, 1, 0, 0}, - {"db_close", (cmd_function)sc_close, 2, 0, 0}, - {"db_query", (cmd_function)sc_query, 2, 0, 0}, - {"db_raw_query", (cmd_function)sc_raw_query, 2, 0, 0}, - {"db_free_result", (cmd_function)sc_free_query, 2, 0, 0}, - {"db_insert", (cmd_function)sc_insert, 2, 0, 0}, - {"db_delete", (cmd_function)sc_delete, 2, 0, 0}, - {"db_update", (cmd_function)sc_update, 2, 0, 0}, - {0, 0, 0, 0, 0} + {"db_use_table", (cmd_function)sc_use_table, 2, 0, 0, 0}, + {"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}, + {"db_update", (cmd_function)sc_update, 2, 0, 0, 0}, + {0, 0, 0, 0, 0, 0} };

15 years, 2 months

git:janakj/bdb: - import berkeley database module into trunk

by Jan Janak

Module: sip-router Branch: janakj/bdb Commit: 749259efdfd2bfec4baa3829c615a74843217a62 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=749259e… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Oct 4 11:15:01 2007 +0000 - import berkeley database module into trunk - Many thanks to William Quan from Cisco Systems for the contribution - based on patch #1803180, renamed from berkely_db to db_berkeley - Some work still remains: - build berkley_db as own debian package - add berkley_db to the xml database creation process to generate the content in scripts/db_berkley/openser like the dbtext stuff - evaluate if its possible to use the db_free_row and db_free_rows functions for this module - port to new logging system git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@2844 689a6050-402a-0410-94f2-e92a70836424 ---

15 years, 2 months

git:master: Merge branch janakj/flatstore into branch master

by Jan Janak

Module: sip-router Branch: master Commit: 8be42318025c413d0aecf01f84d32b5e1a0af2f6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8be4231… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Thu Feb 19 00:02:32 2009 +0100 Merge branch janakj/flatstore into branch master * commit 'origin/janakj/flatstore': (57 commits) Make km_sources compile, part two. Link with libkmi, sources from kamailio use the management interface. Make km_ sources compile: Link also with libsrdb1 Added prefix km_ to locally included header files. Align defines protecting header files with filenames. Remove km_Makefile and km_README. Renamed to db_flatstore. Make the module compile in the sip-router source tree. - disable big integer (DB_BIGINT) support for non SQL DB modules for now - don't link with unnecessary libs, related to bug #1855859 - fix link entity names, patch from Carsten Gross - rebuilt default READMEs - renaming: changed entities in documentation - renaming scripts part 1 - fix some FAQ entries, change missing entity, regenerate READMEs - change name in copyright headers - a set of minimalistic config files for testing purposes - adding missing end of doxygen group - missing READMEs added ... ---

15 years, 2 months

How to import modules with full history

by Jan Janak

Here is how you can import a kamailio module with full history (that means all previous commits done on the svn will also be visible in git) into the sip-router git repository. First off, make sure you have a local copy of the sip-router git repository with kamailio history merged into it. You can find a step-by-step guide in the previous email with subject "Annotated git configuration file". I suppose that the module you want to import into the git repository will be based on the sources present in the kamailio svn trunk, so as the next step create a new branch based on the kamailio trunk: git co -b sqlops_filtered km/trunk The name of the new branch is sqlops_filtered because I am importing kamailio sqlops module, "_filtered" because this branch will be used to filter commits. Like revision numbers in svn (and unlike versions in cvs), git commits, identified by those cryptic sha1 hashes, record the state of _all_ files in the source tree at the time when the commit was made. But this is a problem because we only one to import the files in modules/sqlops directory and ignore all other files outside this directory. Even if you try to checkout an older commit which changed only files within modules/sqlops, you always get a full source tree, including files of all other modules. There is no way you can get a particular revision of selected files only--like you can do it with cvs. But there is a solution: git-filter-branch. This is a handy git command which (among other things) can walk through all commits in the history of the current branch and tranform the commits into new commits with selected files only. To include only files in modules/sqlops we can do the following: git-filter-branch --subdirectory-filter modules/sqlops The command rewrite the history of the current branch, your current branch should be sqlops_filtered if you followed this guide from the beginning. If you investigate the history of the branch with git log, you should see only commits that are related to files in modules/sqlops. (The module contained only one commit at the time of writing of this memo so don't be surprised if you only see one commit in the history). If you examine your current working directory now, you'll notice that the directory contains files from modules/sqlops in the top level directory. We need to put them back into modules/sqlopts before we can merge the branch into sip-router tree, this can be done with git-filter-branch again. But before we can run the command second time, we need to remove some residual files from the previous run: rm -rf .git/refs/original And the following command will move all the files back to modules/sqlops subdirectory: git-filter-branch --index-filter 'git ls-files -s | sed "s-\t-&modules/sqlopt/-" | GIT_INDEX_FILE=$GIT_INDEX_FILE.new git update-index --index-info && mv $GIT_INDEX_FILE.new $GIT_INDEX_FILE' HEAD The previous command might look a little scary, but it is documented in man git-filter-branch if you are interested in details. If you examine your current working directory now, it should contain modules directory with sqlops subdirectory and all the module files there. This branch is now ready to be merged into the sip-router tree, so create a new branch, for example sqlops, based on the sip-router master branch: git co -b sqlops sr/master And now you can merge branch sqlops_filtered into the newly created branch: git merge sqlops_filtered And if everything went well, congratulations, you successfully imported your first kamailio module into the sip-router git repository. Branch sqlops_filtered is no more needed so you can safely delete it. Jan.

15 years, 2 months

← Newer
1
...
7
8
9
10
11
12
13
...
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