sr-dev August 2011

sr-dev@lists.kamailio.org

33 participants
291 discussions

git:master: acc: new parameter to allow usage of insert delayed
by Daniel-Constantin Mierla 18 Aug '11

18 Aug '11

Module: sip-router Branch: master Commit: 9bd65819c8af6140f56f09fb891cc585dcb4badb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9bd6581… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Aug 18 10:32:37 2011 +0200 acc: new parameter to allow usage of insert delayed - db_insert_mode can be set to 1 in order to use INSERT DELAYED when adding the acc records to database --- modules_k/acc/README | 747 +++++++++++++++++++++++++-------------- modules_k/acc/acc.c | 27 ++- modules_k/acc/acc_mod.c | 2 + modules_k/acc/doc/acc_admin.xml | 17 + 4 files changed, 526 insertions(+), 267 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=9bd…

1 0

git:master: srdb1: fixed c&p error related to DB_CAP_INSERT_UPDATE
by Daniel-Constantin Mierla 18 Aug '11

18 Aug '11

Module: sip-router Branch: master Commit: c54925a1e06d1817e7cdc32a2c0f1d78a442a66e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c54925a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Aug 18 10:31:43 2011 +0200 srdb1: fixed c&p error related to DB_CAP_INSERT_UPDATE --- lib/srdb1/db.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/srdb1/db.c b/lib/srdb1/db.c index 443e03d..b50b156 100644 --- a/lib/srdb1/db.c +++ b/lib/srdb1/db.c @@ -137,7 +137,7 @@ int db_check_api(db_func_t* dbf, char *mname) } if (dbf->insert_delayed) { - dbf->cap |= DB_CAP_INSERT_UPDATE; + dbf->cap |= DB_CAP_INSERT_DELAYED; } if (dbf->affected_rows) {

1 0

git:master: lib/srdb1: Add support for affected rows.
by Alex Hermann 18 Aug '11

18 Aug '11

Module: sip-router Branch: master Commit: 26f2169a0aef931b17b35e64a2aca580d82b6b1a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=26f2169… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: Tue Aug 9 11:56:21 2011 +0200 lib/srdb1: Add support for affected rows. affected_rows is the number of rows affected by a query. Primarily used after UPDATE, INSERT and DELETE queries, to know how many rows were affected. --- lib/srdb1/db.c | 7 +++++++ lib/srdb1/db.h | 11 +++++++++++ lib/srdb1/db_cap.h | 4 ++-- 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/lib/srdb1/db.c b/lib/srdb1/db.c index 0c4cb58..443e03d 100644 --- a/lib/srdb1/db.c +++ b/lib/srdb1/db.c @@ -139,6 +139,11 @@ int db_check_api(db_func_t* dbf, char *mname) if (dbf->insert_delayed) { dbf->cap |= DB_CAP_INSERT_UPDATE; } + + if (dbf->affected_rows) { + dbf->cap |= DB_CAP_AFFECTED_ROWS; + } + return 0; error: return -1; @@ -229,6 +234,8 @@ int db_bind_mod(const str* mod, db_func_t* mydbf) dbf.replace = (db_replace_f)find_mod_export(tmp, "db_replace", 2, 0); dbf.last_inserted_id= (db_last_inserted_id_f)find_mod_export(tmp, "db_last_inserted_id", 1, 0); + dbf.affected_rows = (db_affected_rows_f)find_mod_export(tmp, + "db_affected_rows", 1, 0); dbf.insert_update = (db_insert_update_f)find_mod_export(tmp, "db_insert_update", 2, 0); dbf.insert_delayed = (db_insert_delayed_f)find_mod_export(tmp, diff --git a/lib/srdb1/db.h b/lib/srdb1/db.h index 21b9110..294488c 100644 --- a/lib/srdb1/db.h +++ b/lib/srdb1/db.h @@ -296,6 +296,16 @@ typedef int (*db_insert_delayed_f) (const db1_con_t* _h, const db_key_t* _k, const db_val_t* _v, const int _n); +/** + * \brief Retrieve the number of affected rows for the last query. + * + * The function returns the rows affected by the last query. + * If any other type of query was the last, it returns null. + * \param _h structure representing database connection + * \return returns the number of rows as integer or returns -1 on error + */ +typedef int (*db_affected_rows_f) (const db1_con_t* _h); + /** * \brief Database module callbacks @@ -321,6 +331,7 @@ typedef struct db_func { in a table */ db_insert_update_f insert_update; /* Insert into table, update on duplicate key */ db_insert_delayed_f insert_delayed; /* Insert delayed into table */ + db_affected_rows_f affected_rows; /* Numer of affected rows for last query */ } db_func_t; diff --git a/lib/srdb1/db_cap.h b/lib/srdb1/db_cap.h index 1bc4704..968f6f7 100644 --- a/lib/srdb1/db_cap.h +++ b/lib/srdb1/db_cap.h @@ -48,8 +48,8 @@ typedef enum db_cap { DB_CAP_FETCH = 1 << 6, /*!< driver supports fetch result queries */ DB_CAP_LAST_INSERTED_ID = 1 << 7, /*!< driver can return the ID of the last insert operation */ DB_CAP_INSERT_UPDATE = 1 << 8, /*!< driver can insert data into database & update on duplicate */ - DB_CAP_INSERT_DELAYED = 1 << 9 /*!< driver can do insert delayed */ - + DB_CAP_INSERT_DELAYED = 1 << 9, /*!< driver can do insert delayed */ + DB_CAP_AFFECTED_ROWS = 1 << 10 /*!< driver can return number of rows affected by the last query */ } db_cap_t;

1 0

git:master: modules/textops: allow pseudovariables in re.subst parameter
by Alex Hermann 18 Aug '11

18 Aug '11

Module: sip-router Branch: master Commit: 33c5fc98db553ae28385608890df1a883aaa51d4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=33c5fc9… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: Thu Aug 11 13:19:21 2011 +0200 modules/textops: allow pseudovariables in re.subst parameter --- modules_k/textops/txt_var.c | 142 +++++++++++++++++++++++++++++------------- 1 files changed, 98 insertions(+), 44 deletions(-) diff --git a/modules_k/textops/txt_var.c b/modules_k/textops/txt_var.c index a13e5e1..adcb860 100644 --- a/modules_k/textops/txt_var.c +++ b/modules_k/textops/txt_var.c @@ -42,6 +42,7 @@ int tr_txt_eval_re(struct sip_msg *msg, tr_param_t *tp, int subtype, str* result; #define TR_TXT_BUF_SIZE 2048 static char tr_txt_buf[TR_TXT_BUF_SIZE]; + pv_value_t v; if(val==NULL || (!(val->flags&PV_VAL_STR)) || val->rs.len<=0) return -1; @@ -49,14 +50,31 @@ int tr_txt_eval_re(struct sip_msg *msg, tr_param_t *tp, int subtype, switch(subtype) { case TR_TXT_RE_SUBST: - se = (struct subst_expr*)tp->v.data; - if(se==NULL) - return 0; + if (tp->type == TR_PARAM_SUBST) { + se = (struct subst_expr*)tp->v.data; + if (se==NULL) + return 0; + } else if (tp->type == TR_PARAM_SPEC) { + if (pv_get_spec_value(msg, (pv_spec_p)tp->v.data, &v)!=0 + || (!(v.flags&PV_VAL_STR)) || v.rs.len<=0) + { + LM_ERR("Can't evaluate regexp\n"); + return -1; + } + se=subst_parser(&v.rs); + if (se==0) { + LM_ERR("Can't compile regexp\n"); + return -1; + } + } else { + LM_ERR("Unknown parameter type\n"); + return -1; + } if(val->rs.len>=TR_TXT_BUF_SIZE-1) { LM_ERR("PV value too big %d, increase buffer size\n", val->rs.len); - return -1; + goto error; } memcpy(tr_txt_buf, val->rs.s, val->rs.len); tr_txt_buf[val->rs.len] = '\0'; @@ -67,17 +85,17 @@ int tr_txt_eval_re(struct sip_msg *msg, tr_param_t *tp, int subtype, if (nmatches==0) { LM_DBG("no match for subst expression\n"); - return 0; + break; } if (nmatches<0) LM_ERR("subst failed\n"); - return -1; + goto error; } if(result->len>=TR_TXT_BUF_SIZE-1) { LM_ERR("subst result too big %d, increase buffer size\n", result->len); - return -1; + goto error; } memcpy(tr_txt_buf, result->s, result->len); tr_txt_buf[result->len] = '\0'; @@ -90,20 +108,80 @@ int tr_txt_eval_re(struct sip_msg *msg, tr_param_t *tp, int subtype, break; default: LM_ERR("unknown subtype %d\n", subtype); - return -1; + goto error; + } + + if (tp->type == TR_PARAM_SPEC) { + subst_expr_free(se); } return 0; +error: + if (tp->type == TR_PARAM_SPEC) { + subst_expr_free(se); + } + return -1; } +#define _tr_parse_sparam(_p, _p0, _tp, _spec, _ps, _in, _s) \ + while(is_in_str(_p, _in) && (*_p==' ' || *_p=='\t' || *_p=='\n')) _p++; \ + if(*_p==PV_MARKER) \ + { /* pseudo-variable */ \ + _spec = (pv_spec_t*)pkg_malloc(sizeof(pv_spec_t)); \ + if(_spec==NULL) \ + { \ + LM_ERR("no more private memory!\n"); \ + goto error; \ + } \ + _s.s = _p; _s.len = _in->s + _in->len - _p; \ + _p0 = pv_parse_spec(&_s, _spec); \ + if(_p0==NULL) \ + { \ + LM_ERR("invalid spec in substr transformation: %.*s!\n", \ + _in->len, _in->s); \ + goto error; \ + } \ + _p = _p0; \ + _tp = (tr_param_t*)pkg_malloc(sizeof(tr_param_t)); \ + if(_tp==NULL) \ + { \ + LM_ERR("no more private memory!\n"); \ + goto error; \ + } \ + memset(_tp, 0, sizeof(tr_param_t)); \ + _tp->type = TR_PARAM_SPEC; \ + _tp->v.data = (void*)_spec; \ + } else { /* string */ \ + _ps = _p; \ + while(is_in_str(_p, _in) && *_p!='\t' && *_p!='\n' \ + && *_p!=TR_PARAM_MARKER && *_p!=TR_RBRACKET) \ + _p++; \ + if(*_p=='\0') \ + { \ + LM_ERR("invalid param in transformation: %.*s!!\n", \ + _in->len, _in->s); \ + goto error; \ + } \ + _tp = (tr_param_t*)pkg_malloc(sizeof(tr_param_t)); \ + if(_tp==NULL) \ + { \ + LM_ERR("no more private memory!\n"); \ + goto error; \ + } \ + memset(_tp, 0, sizeof(tr_param_t)); \ + _tp->type = TR_PARAM_STRING; \ + _tp->v.s.s = _ps; \ + _tp->v.s.len = _p - _ps; \ + } + char* tr_txt_parse_re(str *in, trans_t *t) { - char *p; + char *p, *p0, *ps; str name; - str tok; + str s; struct subst_expr *se = NULL; tr_param_t *tp = NULL; - int n; + pv_spec_t *spec = NULL; if(in==NULL || t==NULL) @@ -127,39 +205,16 @@ char* tr_txt_parse_re(str *in, trans_t *t) if(*p!=TR_PARAM_MARKER) goto error; p++; - /* get trans here */ - n = 0; - tok.s = p; - while(is_in_str(p, in)) - { - if(*p==TR_RBRACKET) - { - if(n==0) - break; - n--; - } - if(*p == TR_LBRACKET) - n++; - p++; - } - if(!is_in_str(p, in)) - goto error; - if(p==tok.s) - goto error; - tok.len = p - tok.s; - tp = (tr_param_t*)pkg_malloc(sizeof(tr_param_t)); - if(tp==NULL) - { - LM_ERR("no more private memory!\n"); - goto error; + /* get parameter */ + _tr_parse_sparam(p, p0, tp, spec, ps, in, s); + if (tp->type == TR_PARAM_STRING) { + /* precompile static regexp */ + se=subst_parser(&tp->v.s); + if (se==0) + goto error; + tp->type = TR_PARAM_SUBST; + tp->v.data = (void*)se; } - - se=subst_parser(&tok); - - if (se==0) - goto error; - tp->type = TR_PARAM_SUBST; - tp->v.data = (void*)se; t->params = tp; while(*p && (*p==' ' || *p=='\t' || *p=='\n')) p++; @@ -181,6 +236,5 @@ error: done: t->name = name; return p; - }

1 0

git:master: modules/db_mysql: Don't call mysql_next_results if there aren' t any results left
by Alex Hermann 18 Aug '11

18 Aug '11

Module: sip-router Branch: master Commit: dfc2834223b7c6b2e799da5a0876b8096cfdae5e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dfc2834… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: Tue Aug 9 11:54:05 2011 +0200 modules/db_mysql: Don't call mysql_next_results if there aren't any results left Calling mysql_next_results looses connection state for the previous result, making it impossible to use mysql_last_insert_id and mysql_affected_rows afterwards. --- modules/db_mysql/km_dbase.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/db_mysql/km_dbase.c b/modules/db_mysql/km_dbase.c index 6f344f2..68481f7 100644 --- a/modules/db_mysql/km_dbase.c +++ b/modules/db_mysql/km_dbase.c @@ -197,7 +197,7 @@ static int db_mysql_store_result(const db1_con_t* _h, db1_res_t** _r) * to free the mem from the mysql lib side */ mysql_free_result(CON_RESULT(_h)); #if (MYSQL_VERSION_ID >= 40100) - while( mysql_next_result( CON_CONNECTION(_h) ) > 0 ) { + while( mysql_more_results(CON_CONNECTION(_h)) && mysql_next_result(CON_CONNECTION(_h)) > 0 ) { MYSQL_RES *res = mysql_store_result( CON_CONNECTION(_h) ); mysql_free_result(res); } @@ -208,7 +208,7 @@ static int db_mysql_store_result(const db1_con_t* _h, db1_res_t** _r) done: #if (MYSQL_VERSION_ID >= 40100) - while( mysql_next_result( CON_CONNECTION(_h) ) > 0 ) { + while( mysql_more_results(CON_CONNECTION(_h)) && mysql_next_result(CON_CONNECTION(_h)) > 0 ) { MYSQL_RES *res = mysql_store_result( CON_CONNECTION(_h) ); mysql_free_result(res); }

1 0

git:master: modules_k/sqlops: new PV $sqlrows return affected rows of previous query
by Alex Hermann 18 Aug '11

18 Aug '11

Module: sip-router Branch: master Commit: d947e7528ff1fc2693d04657592f37f6b2f97b4e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d947e75… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: Tue Aug 9 12:31:48 2011 +0200 modules_k/sqlops: new PV $sqlrows return affected rows of previous query The PV $sqlrows(<con>) returns the number of affected rows of the previous UPDATE, INSERT or DELETE query on the specified connection. --- modules_k/sqlops/README | 20 +++++++++++++++ modules_k/sqlops/doc/sqlops_admin.xml | 25 ++++++++++++++++++- modules_k/sqlops/sql_api.c | 43 +++++++++++++++++++++++++++++++++ modules_k/sqlops/sql_api.h | 4 +++ modules_k/sqlops/sqlops.c | 2 + 5 files changed, 93 insertions(+), 1 deletions(-) diff --git a/modules_k/sqlops/README b/modules_k/sqlops/README index 75379b9..d0de106 100644 --- a/modules_k/sqlops/README +++ b/modules_k/sqlops/README @@ -38,6 +38,7 @@ Daniel-Constantin Mierla 5. Exported pseudo-variables 5.1. $dbr(result=>key) + 5.2. $sqlrows(con) List of Examples @@ -47,6 +48,7 @@ Daniel-Constantin Mierla 1.4. sql_xquery() usage 1.5. sql_result_free() usage 1.6. $dbr(result=>key) usage + 1.7. $sqlrows(con) usage Chapter 1. Admin Guide @@ -72,6 +74,7 @@ Chapter 1. Admin Guide 5. Exported pseudo-variables 5.1. $dbr(result=>key) + 5.2. $sqlrows(con) 1. Overview @@ -224,6 +227,7 @@ sql_result_free("ra"); 5. Exported pseudo-variables 5.1. $dbr(result=>key) + 5.2. $sqlrows(con) 5.1. $dbr(result=>key) @@ -290,3 +294,19 @@ if (sql_xquery("ca", "select * from domain", "ra") == 1) } } ... + +5.2. $sqlrows(con) + + Number of affected rows of the previous query on the specified + connection. Its primary use is to get the number of rows affected by + UPDATE, INSERT and DELETE queries. + + “con” must be the name identifying an SQL connection. + + Example 1.7. $sqlrows(con) usage +... +modparam("sqlops","sqlcon","ca=>dbdriver://username:password@dbhost/dbname") +... +sql_query("ca", "update domain set domain='mydomain' where id=5"); +xlog("Affected rows: $sqlrows(ca)\n"); +... diff --git a/modules_k/sqlops/doc/sqlops_admin.xml b/modules_k/sqlops/doc/sqlops_admin.xml index a0a8512..f8bd3e6 100644 --- a/modules_k/sqlops/doc/sqlops_admin.xml +++ b/modules_k/sqlops/doc/sqlops_admin.xml @@ -379,7 +379,30 @@ if (sql_xquery("ca", "select * from domain", "ra") == 1) ... </programlisting> </example> - </section> + </section> + <section> + <title><varname>$sqlrows(con)</varname></title> + <para> + Number of affected rows of the previous query on the + specified connection. Its primary use is to get the number + of rows affected by UPDATE, INSERT and DELETE queries. + </para> + <para> + <quote>con</quote> must be the name identifying an SQL + connection. + </para> + <example> + <title><function moreinfo="none">$sqlrows(con)</function> usage</title> + <programlisting format="linespecific"> +... +modparam("sqlops","sqlcon","ca=>&exampledb;") +... +sql_query("ca", "update domain set domain='mydomain' where id=5"); +xlog("Affected rows: $sqlrows(ca)\n"); +... + </programlisting> + </example> + </section> </section> </chapter> diff --git a/modules_k/sqlops/sql_api.c b/modules_k/sqlops/sql_api.c index ef69071..a61b00a 100644 --- a/modules_k/sqlops/sql_api.c +++ b/modules_k/sqlops/sql_api.c @@ -96,6 +96,49 @@ int sql_init_con(str *name, str *url) return 0; } +int pv_parse_con_name(pv_spec_p sp, str *in) +{ + sql_con_t *con; + + if(sp==NULL || in==NULL || in->len<=0) + return -1; + + con = sql_get_connection(in); + if (con==NULL) { + LM_ERR("invalid connection [%.*s]\n", in->len, in->s); + return -1; + } + + sp->pvp.pvn.type = PV_NAME_INTSTR; + sp->pvp.pvn.u.isname.type = AVP_VAL_STR; + sp->pvp.pvn.u.isname.name.s = *in; + return 0; +} + +int pv_get_sqlrows(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res) +{ + sql_con_t *con; + str* sc; + + sc = &param->pvn.u.isname.name.s; + con = sql_get_connection(sc); + if(con==NULL) + { + LM_ERR("invalid connection [%.*s]\n", sc->len, sc->s); + return -1; + } + + if (!DB_CAPABILITY(con->dbf, DB_CAP_AFFECTED_ROWS)) + { + LM_ERR("con: %p database module does not have DB_CAP_AFFECTED_ROWS [%.*s]\n", + con, sc->len, sc->s); + return -1; + } + + return pv_get_sintval(msg, param, res, con->dbf.affected_rows(con->dbh)); +} + int sql_connect(void) { sql_con_t *sc; diff --git a/modules_k/sqlops/sql_api.h b/modules_k/sqlops/sql_api.h index ce00672..c198eee 100644 --- a/modules_k/sqlops/sql_api.h +++ b/modules_k/sqlops/sql_api.h @@ -77,6 +77,10 @@ int sql_do_query(sql_con_t *con, str *query, sql_result_t *res); int sql_do_xquery(struct sip_msg *msg, sql_con_t *con, pv_elem_t *query, pv_elem_t *res); #endif +int pv_get_sqlrows(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res); +int pv_parse_con_name(pv_spec_p sp, str *in); + sql_con_t* sql_get_connection(str *name); sql_result_t* sql_get_result(str *name); diff --git a/modules_k/sqlops/sqlops.c b/modules_k/sqlops/sqlops.c index a34a7d9..5bb4b2f 100644 --- a/modules_k/sqlops/sqlops.c +++ b/modules_k/sqlops/sqlops.c @@ -80,6 +80,8 @@ static int sql_res_param(modparam_t type, void* val); static pv_export_t mod_pvs[] = { { {"dbr", sizeof("dbr")-1}, PVT_OTHER, pv_get_dbr, 0, pv_parse_dbr_name, 0, 0, 0 }, + { {"sqlrows", sizeof("sqlrows")-1}, PVT_OTHER, pv_get_sqlrows, 0, + pv_parse_con_name, 0, 0, 0 }, { {0, 0}, 0, 0, 0, 0, 0, 0, 0 } };

1 0

git:master: modules/db_mysql: Implement affected_rows for mysql
by Alex Hermann 18 Aug '11

18 Aug '11

Module: sip-router Branch: master Commit: 588d1ffbb7b6e5074e3dbb6950b2149544ea1521 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=588d1ff… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: Tue Aug 9 11:58:01 2011 +0200 modules/db_mysql: Implement affected_rows for mysql --- modules/db_mysql/km_db_mysql.c | 2 +- modules/db_mysql/km_dbase.c | 17 ++++++++++++++++- modules/db_mysql/km_dbase.h | 7 +++++++ 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/modules/db_mysql/km_db_mysql.c b/modules/db_mysql/km_db_mysql.c index a94cf77..1f758ba 100644 --- a/modules/db_mysql/km_db_mysql.c +++ b/modules/db_mysql/km_db_mysql.c @@ -114,7 +114,7 @@ int db_mysql_bind_api(db_func_t *dbb) dbb->last_inserted_id = db_mysql_last_inserted_id; dbb->insert_update = db_mysql_insert_update; dbb->insert_delayed = db_mysql_insert_delayed; + dbb->affected_rows = db_mysql_affected_rows; return 0; } - diff --git a/modules/db_mysql/km_dbase.c b/modules/db_mysql/km_dbase.c index 68481f7..d85fe5f 100644 --- a/modules/db_mysql/km_dbase.c +++ b/modules/db_mysql/km_dbase.c @@ -480,7 +480,22 @@ int db_mysql_last_inserted_id(const db1_con_t* _h) } - /** +/** + * Returns the affected rows of the last query. + * \param _h database handle + * \return returns the affected rows as integer or -1 on error. + */ +int db_mysql_affected_rows(const db1_con_t* _h) +{ + if (!_h) { + LM_ERR("invalid parameter value\n"); + return -1; + } + return (int)mysql_affected_rows(CON_CONNECTION(_h)); +} + + +/** * Insert a row into a specified table, update on duplicate key. * \param _h structure representing database connection * \param _k key names diff --git a/modules/db_mysql/km_dbase.h b/modules/db_mysql/km_dbase.h index f7c2d0c..68e4e8e 100644 --- a/modules/db_mysql/km_dbase.h +++ b/modules/db_mysql/km_dbase.h @@ -111,6 +111,13 @@ int db_mysql_replace(const db1_con_t* handle, const db_key_t* keys, const db_val */ int db_mysql_last_inserted_id(const db1_con_t* _h); + +/*! \brief + * Returns number of affected rows for last query + */ +int db_mysql_affected_rows(const db1_con_t* _h); + + /*! \brief * Insert a row into table, update on duplicate key */

1 0

git:master: db_mysql: insert delayed implemented for DB API v1
by Daniel-Constantin Mierla 17 Aug '11

17 Aug '11

Module: sip-router Branch: master Commit: 4c7c1b819699484f4694d7775b94ad72f98cab28 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4c7c1b8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Aug 18 00:33:51 2011 +0200 db_mysql: insert delayed implemented for DB API v1 --- modules/db_mysql/km_db_mysql.c | 1 + modules/db_mysql/km_dbase.c | 17 ++++++++++++++++- modules/db_mysql/km_dbase.h | 7 +++++++ 3 files changed, 24 insertions(+), 1 deletions(-) diff --git a/modules/db_mysql/km_db_mysql.c b/modules/db_mysql/km_db_mysql.c index bc2833a..2c1c777 100644 --- a/modules/db_mysql/km_db_mysql.c +++ b/modules/db_mysql/km_db_mysql.c @@ -113,6 +113,7 @@ int db_mysql_bind_api(db_func_t *dbb) dbb->replace = db_mysql_replace; dbb->last_inserted_id = db_last_inserted_id; dbb->insert_update = db_insert_update; + dbb->insert_delayed = db_mysql_insert_delayed; return 0; } diff --git a/modules/db_mysql/km_dbase.c b/modules/db_mysql/km_dbase.c index a7bae5d..8118d9a 100644 --- a/modules/db_mysql/km_dbase.c +++ b/modules/db_mysql/km_dbase.c @@ -539,6 +539,21 @@ error: /** + * Insert delayed a row into a specified table. + * \param _h structure representing database connection + * \param _k key names + * \param _v values of the keys + * \param _n number of key=value pairs + * \return zero on success, negative value on failure + */ +int db_mysql_insert_delayed(const db1_con_t* _h, const db_key_t* _k, const db_val_t* _v, const int _n) +{ + return db_do_insert_delayed(_h, _k, _v, _n, db_mysql_val2str, + db_mysql_submit_query); +} + + +/** * Store the name of table that will be used by subsequent database functions * \param _h database handle * \param _t table name @@ -568,4 +583,4 @@ int db_mysql_alloc_buffer(void) return -1; else return 0; -} \ No newline at end of file +} diff --git a/modules/db_mysql/km_dbase.h b/modules/db_mysql/km_dbase.h index a4e7b26..8d687ea 100644 --- a/modules/db_mysql/km_dbase.h +++ b/modules/db_mysql/km_dbase.h @@ -119,6 +119,13 @@ int db_insert_update(const db1_con_t* _h, const db_key_t* _k, const db_val_t* _v /*! \brief + * Insert a row into table + */ +int db_mysql_insert_delayed(const db1_con_t* _h, const db_key_t* _k, + const db_val_t* _v, const int _n); + + +/*! \brief * Store name of table that will be used by * subsequent database functions */

1 0

git:master: srdb1: insert delayed support in DB API v1
by Daniel-Constantin Mierla 17 Aug '11

17 Aug '11

Module: sip-router Branch: master Commit: 13e07c7875d6f62aa46068a4daaf01ecdf8fa216 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=13e07c7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Aug 18 00:30:59 2011 +0200 srdb1: insert delayed support in DB API v1 - new field in DB API struct for insert delayed implementations - sql insert command wrapped to allow 'delayed' flag - DB_CAP_INSERT_DELAYED flag added to show db insert delayed capability --- lib/srdb1/db.c | 6 ++++++ lib/srdb1/db.h | 17 +++++++++++++++++ lib/srdb1/db_cap.h | 3 ++- lib/srdb1/db_query.c | 25 ++++++++++++++++++++++--- lib/srdb1/db_query.h | 21 +++++++++++++++++++++ 5 files changed, 68 insertions(+), 4 deletions(-) diff --git a/lib/srdb1/db.c b/lib/srdb1/db.c index 6f85b22..0c4cb58 100644 --- a/lib/srdb1/db.c +++ b/lib/srdb1/db.c @@ -135,6 +135,10 @@ int db_check_api(db_func_t* dbf, char *mname) if (dbf->insert_update) { dbf->cap |= DB_CAP_INSERT_UPDATE; } + + if (dbf->insert_delayed) { + dbf->cap |= DB_CAP_INSERT_UPDATE; + } return 0; error: return -1; @@ -227,6 +231,8 @@ int db_bind_mod(const str* mod, db_func_t* mydbf) "db_last_inserted_id", 1, 0); dbf.insert_update = (db_insert_update_f)find_mod_export(tmp, "db_insert_update", 2, 0); + dbf.insert_delayed = (db_insert_delayed_f)find_mod_export(tmp, + "db_insert_delayed", 2, 0); } if(db_check_api(&dbf, tmp)!=0) goto error; diff --git a/lib/srdb1/db.h b/lib/srdb1/db.h index 7da401b..21b9110 100644 --- a/lib/srdb1/db.h +++ b/lib/srdb1/db.h @@ -282,6 +282,22 @@ typedef int (*db_insert_update_f) (const db1_con_t* _h, const db_key_t* _k, /** + * \brief Insert delayed a row into the specified table. + * + * This function implements INSERT DELAYED SQL directive. It is possible to + * insert one or more rows in a table with delay using this function. + * \param _h database connection handle + * \param _k array of keys (column names) + * \param _v array of values for keys specified in _k parameter + * \param _n number of keys-value pairs int _k and _v parameters + * \return returns 0 if everything is OK, otherwise returns value < 0 + */ +typedef int (*db_insert_delayed_f) (const db1_con_t* _h, const db_key_t* _k, + const db_val_t* _v, const int _n); + + + +/** * \brief Database module callbacks * * This structure holds function pointer to all database functions. Before this @@ -304,6 +320,7 @@ typedef struct db_func { db_last_inserted_id_f last_inserted_id; /* Retrieve the last inserted ID in a table */ db_insert_update_f insert_update; /* Insert into table, update on duplicate key */ + db_insert_delayed_f insert_delayed; /* Insert delayed into table */ } db_func_t; diff --git a/lib/srdb1/db_cap.h b/lib/srdb1/db_cap.h index e87ef66..1bc4704 100644 --- a/lib/srdb1/db_cap.h +++ b/lib/srdb1/db_cap.h @@ -47,7 +47,8 @@ typedef enum db_cap { DB_CAP_REPLACE = 1 << 5, /*!< driver can replace (also known as INSERT OR UPDATE) data */ DB_CAP_FETCH = 1 << 6, /*!< driver supports fetch result queries */ DB_CAP_LAST_INSERTED_ID = 1 << 7, /*!< driver can return the ID of the last insert operation */ - DB_CAP_INSERT_UPDATE = 1 << 8 /*!< driver can insert data into database and update on duplicate */ + DB_CAP_INSERT_UPDATE = 1 << 8, /*!< driver can insert data into database & update on duplicate */ + DB_CAP_INSERT_DELAYED = 1 << 9 /*!< driver can do insert delayed */ } db_cap_t; diff --git a/lib/srdb1/db_query.c b/lib/srdb1/db_query.c index d2869f9..dbde735 100644 --- a/lib/srdb1/db_query.c +++ b/lib/srdb1/db_query.c @@ -33,6 +33,7 @@ */ #include <stdio.h> +#include <stdlib.h> #include "../../dprint.h" #include "db_ut.h" #include "db_query.h" @@ -143,9 +144,9 @@ int db_do_raw_query(const db1_con_t* _h, const str* _s, db1_res_t** _r, } -int db_do_insert(const db1_con_t* _h, const db_key_t* _k, const db_val_t* _v, +int db_do_insert_cmd(const db1_con_t* _h, const db_key_t* _k, const db_val_t* _v, const int _n, int (*val2str) (const db1_con_t*, const db_val_t*, char*, int*), - int (*submit_query)(const db1_con_t* _h, const str* _c)) + int (*submit_query)(const db1_con_t* _h, const str* _c), int mode) { int off, ret; @@ -154,7 +155,12 @@ int db_do_insert(const db1_con_t* _h, const db_key_t* _k, const db_val_t* _v, return -1; } - ret = snprintf(sql_buf, sql_buffer_size, "insert into %.*s (", CON_TABLE(_h)->len, CON_TABLE(_h)->s); + if(mode==1) + ret = snprintf(sql_buf, sql_buffer_size, "insert delayed into %.*s (", + CON_TABLE(_h)->len, CON_TABLE(_h)->s); + else + ret = snprintf(sql_buf, sql_buffer_size, "insert into %.*s (", + CON_TABLE(_h)->len, CON_TABLE(_h)->s); if (ret < 0 || ret >= sql_buffer_size) goto error; off = ret; @@ -187,6 +193,19 @@ error: return -1; } +int db_do_insert(const db1_con_t* _h, const db_key_t* _k, const db_val_t* _v, + const int _n, int (*val2str) (const db1_con_t*, const db_val_t*, char*, int*), + int (*submit_query)(const db1_con_t* _h, const str* _c)) +{ + return db_do_insert_cmd(_h, _k, _v, _n, val2str, submit_query, 0); +} + +int db_do_insert_delayed(const db1_con_t* _h, const db_key_t* _k, const db_val_t* _v, + const int _n, int (*val2str) (const db1_con_t*, const db_val_t*, char*, int*), + int (*submit_query)(const db1_con_t* _h, const str* _c)) +{ + return db_do_insert_cmd(_h, _k, _v, _n, val2str, submit_query, 1); +} int db_do_delete(const db1_con_t* _h, const db_key_t* _k, const db_op_t* _o, const db_val_t* _v, const int _n, int (*val2str) (const db1_con_t*, diff --git a/lib/srdb1/db_query.h b/lib/srdb1/db_query.h index 13645d8..416de3f 100644 --- a/lib/srdb1/db_query.h +++ b/lib/srdb1/db_query.h @@ -185,6 +185,27 @@ int db_do_replace(const db1_con_t* _h, const db_key_t* _k, const db_val_t* _v, /** + * \brief Helper function for db insert delayed operations + * + * This method evaluates the actual arguments for the database operation + * and setups the string that is used for the insert delayed operation in the db + * module. Then its submit the query for the operation. It uses for its work + * the implementation in the concrete database module. + * + * \param _h structure representing database connection + * \param _k key names + * \param _v values of the keys + * \param _n number of key/value pairs + * \param (*val2str) function pointer to the db specific val conversion function + * \param (*submit_query) function pointer to the db specific query submit function + * \return zero on success, negative on errors + */ +int db_do_insert_delayed(const db1_con_t* _h, const db_key_t* _k, const db_val_t* _v, + const int _n, int (*val2str) (const db1_con_t*, const db_val_t*, char*, int*), + int (*submit_query)(const db1_con_t* _h, const str* _c)); + + +/** * \brief Initialisation function - should be called from db.c at start-up * * This initialises the db_query module, and should be called before any functions in db_query are called.

1 0

git:master: db_mysql: renamed some internal functions
by Daniel-Constantin Mierla 17 Aug '11

17 Aug '11

Module: sip-router Branch: master Commit: a001f2f26d0b9746aa5e9f83e493ab30da965b9e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a001f2f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Aug 18 00:35:48 2011 +0200 db_mysql: renamed some internal functions - 'mysql' added in the name of some functions from DB APIv1 to be consistent with the rest of them --- modules/db_mysql/km_db_mysql.c | 4 ++-- modules/db_mysql/km_dbase.c | 4 ++-- modules/db_mysql/km_dbase.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/db_mysql/km_db_mysql.c b/modules/db_mysql/km_db_mysql.c index 2c1c777..a94cf77 100644 --- a/modules/db_mysql/km_db_mysql.c +++ b/modules/db_mysql/km_db_mysql.c @@ -111,8 +111,8 @@ int db_mysql_bind_api(db_func_t *dbb) dbb->delete = db_mysql_delete; dbb->update = db_mysql_update; dbb->replace = db_mysql_replace; - dbb->last_inserted_id = db_last_inserted_id; - dbb->insert_update = db_insert_update; + dbb->last_inserted_id = db_mysql_last_inserted_id; + dbb->insert_update = db_mysql_insert_update; dbb->insert_delayed = db_mysql_insert_delayed; return 0; diff --git a/modules/db_mysql/km_dbase.c b/modules/db_mysql/km_dbase.c index 8118d9a..6f344f2 100644 --- a/modules/db_mysql/km_dbase.c +++ b/modules/db_mysql/km_dbase.c @@ -470,7 +470,7 @@ int db_mysql_replace(const db1_con_t* _h, const db_key_t* _k, const db_val_t* _v * \return returns the ID as integer or returns 0 if the previous statement * does not use an AUTO_INCREMENT value. */ -int db_last_inserted_id(const db1_con_t* _h) +int db_mysql_last_inserted_id(const db1_con_t* _h) { if (!_h) { LM_ERR("invalid parameter value\n"); @@ -487,7 +487,7 @@ int db_last_inserted_id(const db1_con_t* _h) * \param _v values of the keys * \param _n number of key=value pairs */ - int db_insert_update(const db1_con_t* _h, const db_key_t* _k, const db_val_t* _v, + int db_mysql_insert_update(const db1_con_t* _h, const db_key_t* _k, const db_val_t* _v, const int _n) { int off, ret; diff --git a/modules/db_mysql/km_dbase.h b/modules/db_mysql/km_dbase.h index 8d687ea..f7c2d0c 100644 --- a/modules/db_mysql/km_dbase.h +++ b/modules/db_mysql/km_dbase.h @@ -109,12 +109,12 @@ int db_mysql_replace(const db1_con_t* handle, const db_key_t* keys, const db_val /*! \brief * Returns the last inserted ID */ -int db_last_inserted_id(const db1_con_t* _h); +int db_mysql_last_inserted_id(const db1_con_t* _h); /*! \brief * Insert a row into table, update on duplicate key */ -int db_insert_update(const db1_con_t* _h, const db_key_t* _k, const db_val_t* _v, +int db_mysql_insert_update(const db1_con_t* _h, const db_key_t* _k, const db_val_t* _v, const int _n);

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
30
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2011