Skip to content

Commit

Permalink
Merge pull request #941 from kamailio/lazedo/dbtext_master
Browse files Browse the repository at this point in the history 
db_text: implement fetch and memory constraints
  • Loading branch information
@lazedo
lazedo committed Jan 18, 2017
2 parents c0c8bfe + 3c3296d commit 55c941c
Show file tree
Hide file tree
Showing 10 changed files with 497 additions and 102 deletions.
9 changes: 6 additions & 3 deletions src/modules/db_text/db_text.c
View file
Expand Up @@ -38,13 +38,15 @@ static int mod_init(void);
static void destroy(void);

#define DEFAULT_DB_TEXT_READ_BUFFER_SIZE 16384
#define DEFAULT_MAX_RESULT_ROWS 100000;

/*
* Module parameter variables
*/
int db_mode = 0; /* Database usage mode: 0 = cache, 1 = no cache */
int empty_string = 0; /* Treat empty string as "" = 0, 1 = NULL */
int _db_text_read_buffer_size = DEFAULT_DB_TEXT_READ_BUFFER_SIZE;
int _db_text_max_result_rows = DEFAULT_MAX_RESULT_ROWS;

int dbt_bind_api(db_func_t *dbb);

Expand All @@ -64,6 +66,7 @@ static param_export_t params[] = {
{"db_mode", INT_PARAM, &db_mode},
{"emptystring", INT_PARAM, &empty_string},
{"file_buffer_size", INT_PARAM, &_db_text_read_buffer_size},
{"max_result_rows", INT_PARAM, &_db_text_max_result_rows},
{0, 0, 0}
};

Expand Down Expand Up @@ -108,7 +111,7 @@ static int mod_init(void)
static void destroy(void)
{
LM_DBG("destroy ...\n");
dbt_cache_print(0);
dbt_cache_print2(0, 0);
dbt_cache_destroy();
}

Expand All @@ -125,15 +128,15 @@ int dbt_bind_api(db_func_t *dbb)
dbb->init = dbt_init;
dbb->close = dbt_close;
dbb->query = (db_query_f)dbt_query;
dbb->fetch_result = (db_fetch_result_f) dbt_fetch_result;
dbb->free_result = dbt_free_result;
dbb->insert = (db_insert_f)dbt_insert;
dbb->delete = (db_delete_f)dbt_delete;
dbb->update = (db_update_f)dbt_update;
dbb->replace = (db_replace_f)dbt_replace;
dbb->affected_rows = (db_affected_rows_f) dbt_affected_rows;
dbb->raw_query = (db_raw_query_f) dbt_raw_query;
dbb->cap = DB_CAP_ALL | DB_CAP_AFFECTED_ROWS | DB_CAP_RAW_QUERY
| DB_CAP_REPLACE;
dbb->cap = DB_CAP_ALL | DB_CAP_AFFECTED_ROWS | DB_CAP_RAW_QUERY | DB_CAP_REPLACE | DB_CAP_FETCH;

return 0;
}
Expand Down
4 changes: 4 additions & 0 deletions src/modules/db_text/db_text.h
View file
Expand Up @@ -56,6 +56,10 @@ int dbt_free_result(db1_con_t* _h, db1_res_t* _r);
int dbt_query(db1_con_t* _h, db_key_t* _k, db_op_t* _op, db_val_t* _v,
db_key_t* _c, int _n, int _nc, db_key_t _o, db1_res_t** _r);

/*
* fetch result
*/
int dbt_fetch_result(db1_con_t* _h, db1_res_t** _r, const int nrows);

/*
* Raw SQL query
Expand Down
107 changes: 76 additions & 31 deletions src/modules/db_text/dbt_api.c
View file
Expand Up @@ -39,7 +39,7 @@ int dbt_use_table(db1_con_t* _h, const str* _t)
/*
* Get and convert columns from a result
*/
static int dbt_get_columns(db1_res_t* _r, dbt_result_p _dres)
static int dbt_get_columns(db1_res_t* _r, dbt_table_p _dres)
{
int col;

Expand Down Expand Up @@ -73,23 +73,23 @@ static int dbt_get_columns(db1_res_t* _r, dbt_result_p _dres)
LM_DBG("allocate %d bytes for RES_NAMES[%d] at %p\n",
(int)sizeof(str), col,
RES_NAMES(_r)[col]);
RES_NAMES(_r)[col]->s = _dres->colv[col].name.s;
RES_NAMES(_r)[col]->len = _dres->colv[col].name.len;
RES_NAMES(_r)[col]->s = _dres->colv[col]->name.s;
RES_NAMES(_r)[col]->len = _dres->colv[col]->name.len;

switch(_dres->colv[col].type)
switch(_dres->colv[col]->type)
{
case DB1_STR:
case DB1_STRING:
case DB1_BLOB:
case DB1_INT:
case DB1_DATETIME:
case DB1_DOUBLE:
RES_TYPES(_r)[col] = _dres->colv[col].type;
RES_TYPES(_r)[col] = _dres->colv[col]->type;
break;
default:
LM_WARN("unhandled data type column (%.*s) type id (%d), "
"use STR as default\n", RES_NAMES(_r)[col]->len,
RES_NAMES(_r)[col]->s, _dres->colv[col].type);
RES_NAMES(_r)[col]->s, _dres->colv[col]->type);
RES_TYPES(_r)[col] = DB1_STR;
break;
}
Expand Down Expand Up @@ -173,7 +173,7 @@ static int dbt_convert_row(db1_res_t* _res, db_row_t* _r, dbt_row_p _r1)
break;

default:
LM_ERR("val type [%d] not supported\n", RES_TYPES(_res)[i]);
LM_ERR("val type [%d] for column %i not supported\n", RES_TYPES(_res)[i], i);
return -1;
}
}
Expand All @@ -184,25 +184,31 @@ static int dbt_convert_row(db1_res_t* _res, db_row_t* _r, dbt_row_p _r1)
/*
* Convert rows from internal to db API representation
*/
static int dbt_convert_rows(db1_res_t* _r, dbt_result_p _dres)
static int dbt_convert_rows(db1_res_t* _r, dbt_table_p _dres, int offset, int nrows)
{
int row;
int row = 0, c = 0;
dbt_row_p _rp = NULL;
if (!_r || !_dres) {
LM_ERR("invalid parameter\n");
return -1;
}
RES_ROW_N(_r) = _dres->nrrows;
if (!RES_ROW_N(_r)) {

if (nrows == 0) {
return 0;
}

if (db_allocate_rows(_r) < 0) {
LM_ERR("could not allocate rows\n");
return -2;
}
row = 0;

_rp = _dres->rows;
while(_rp) {
while(_rp && c < offset) {
c++;
_rp = _rp->next;
}

while(_rp && row < nrows) {
if (dbt_convert_row(_r, &(RES_ROWS(_r)[row]), _rp) < 0) {
LM_ERR("failed to convert row #%d\n", row);
RES_ROW_N(_r) = row;
Expand All @@ -212,36 +218,76 @@ static int dbt_convert_rows(db1_res_t* _r, dbt_result_p _dres)
row++;
_rp = _rp->next;
}
RES_ROW_N(_r) = row;
RES_LAST_ROW(_r) = c + row;
return 0;
}

static int dbt_convert_all_rows(db1_res_t* _r, dbt_table_p _dres)
{
if (!_r || !_dres) {
LM_ERR("invalid parameter\n");
return -1;
}
RES_ROW_N(_r) = _dres->nrrows;
return dbt_convert_rows(_r, _dres, 0, _dres->nrrows);
}



/*
* Fill the structure with data from database
*/
static int dbt_convert_result(db1_res_t* _r, dbt_result_p _dres)
//static int dbt_convert_result(db1_res_t* _r, dbt_table_p _dres)
//{
// if (!_r || !_dres) {
// LM_ERR("invalid parameter\n");
// return -1;
// }
// if (dbt_get_columns(_r, _dres) < 0) {
// LM_ERR("failed to get column names\n");
// return -2;
// }
//
// if (dbt_convert_all_rows(_r, _dres) < 0) {
// LM_ERR("failed to convert rows\n");
// db_free_columns(_r);
// return -3;
// }
// return 0;
//}

/*
* Retrieve result set
*/
int dbt_get_result(db1_res_t** _r, dbt_table_p _dres)
{
if (!_r || !_dres) {
LM_ERR("invalid parameter\n");
return -1;
int res = dbt_init_result(_r, _dres);
if ( res != 0) {
return res;
}
if (dbt_get_columns(_r, _dres) < 0) {
LM_ERR("failed to get column names\n");
return -2;

if (dbt_convert_all_rows(*_r, _dres) < 0) {
LM_ERR("failed to convert rows\n");
db_free_columns(*_r);
return -3;
}

if (dbt_convert_rows(_r, _dres) < 0) {
return 0;
}

int dbt_get_next_result(db1_res_t** _r, int offset, int rows)
{
dbt_table_p _dres = (dbt_table_p)(*_r)->ptr;
if (dbt_convert_rows(*_r, _dres, offset, rows) < 0) {
LM_ERR("failed to convert rows\n");
db_free_columns(_r);
db_free_columns(*_r);
return -3;
}
return 0;
}

/*
* Retrieve result set
*/
int dbt_get_result(db1_res_t** _r, dbt_result_p _dres)
int dbt_init_result(db1_res_t** _r, dbt_table_p _dres)
{
if ( !_r) {
LM_ERR("invalid parameter value\n");
Expand All @@ -262,13 +308,12 @@ int dbt_get_result(db1_res_t** _r, dbt_result_p _dres)
return -2;
}

if (dbt_convert_result(*_r, _dres) < 0)
{
LM_ERR("failed to convert result\n");
pkg_free(*_r);
return -4;
if (dbt_get_columns(*_r, _dres) < 0) {
LM_ERR("failed to get column names\n");
return -2;
}

RES_NUM_ROWS(*_r) = _dres->nrrows;
(*_r)->ptr = _dres;
return 0;
}
6 changes: 5 additions & 1 deletion src/modules/db_text/dbt_api.h
View file
Expand Up @@ -34,7 +34,11 @@
/*
* Retrieve result set
*/
int dbt_get_result(db1_res_t** _r, dbt_result_p _dres);
//int dbt_get_result(db1_res_t** _r, dbt_result_p _dres);
int dbt_get_result(db1_res_t** _r, dbt_table_p _dres);
int dbt_init_result(db1_res_t** _r, dbt_table_p _dres);
int dbt_get_next_result(db1_res_t** _r, int offset, int rows);


int dbt_use_table(db1_con_t* _h, const str* _t);

Expand Down

0 comments on commit 55c941c

Please sign in to comment.