kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

mod_voicemail: decrease sql queries for message counts (MODAPP-359) 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@15636 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris 2009-11-23 22:46:34 +00:00
parent 67464ea79e
commit d0810cd4de
1 changed files with 49 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
src/mod/applications/mod_voicemail/mod_voicemail.c
View File

@ -1058,6 +1058,38 @@ struct callback {
}; };
typedef struct callback callback_t; typedef struct callback callback_t;
struct msg_cnt_callback {
char *buf;
size_t len;
int matches;
int total_new_messages;
int total_new_urgent_messages;
int total_saved_messages;
int total_saved_urgent_messages;
};
typedef struct msg_cnt_callback msg_cnt_callback_t;
static int message_count_callback(void *pArg, int argc, char **argv, char **columnNames)
{
msg_cnt_callback_t *cbt = (msg_cnt_callback_t *) pArg;
if (atoi(argv[0]) == 0) { /* UnRead */
if (!strcasecmp(argv[1], "A_URGENT")) { /* Urgent */
cbt->total_new_urgent_messages = atoi(argv[2]);
} else { /* Normal */
cbt->total_new_messages = atoi(argv[2]);
}
} else { /* Already Read */
if (!strcasecmp(argv[1], "A_URGENT")) { /* Urgent */
cbt->total_saved_urgent_messages = atoi(argv[2]);
} else { /* Normal */
cbt->total_saved_messages = atoi(argv[2]);
}
}
return 0;
}
static int sql2str_callback(void *pArg, int argc, char **argv, char **columnNames) static int sql2str_callback(void *pArg, int argc, char **argv, char **columnNames)
{ {
callback_t *cbt = (callback_t *) pArg; callback_t *cbt = (callback_t *) pArg;
@ -1290,42 +1322,35 @@ static char *resolve_id(const char *myid, const char *domain_name, const char *a
return ret; return ret;
} }
static void message_count(vm_profile_t *profile, const char *id_in, const char *domain_name, const char *myfolder, static void message_count(vm_profile_t *profile, const char *id_in, const char *domain_name, const char *myfolder, int *total_new_messages,
int *total_new_messages, int *total_saved_messages, int *total_new_urgent_messages, int *total_saved_urgent_messages) int *total_saved_messages, int *total_new_urgent_messages, int *total_saved_urgent_messages)
{ {
char msg_count[80] = ""; char msg_count[80] = "";
callback_t cbt = { 0 }; msg_cnt_callback_t cbt = { 0 };
char sql[256]; char sql[256];
char *myid = NULL; char *myid = NULL;
cbt.buf = msg_count; cbt.buf = msg_count;
cbt.len = sizeof(msg_count); cbt.len = sizeof(msg_count);
cbt.total_new_messages = 0;
cbt.total_new_urgent_messages = 0;
cbt.total_saved_messages = 0;
cbt.total_saved_urgent_messages = 0;
myid = resolve_id(id_in, domain_name, "message-count"); myid = resolve_id(id_in, domain_name, "message-count");
switch_snprintf(sql, sizeof(sql),
"select count(*) from voicemail_msgs where username='%s' and domain='%s' and in_folder='%s' and read_epoch=0",
myid, domain_name, myfolder);
vm_execute_sql_callback(profile, profile->mutex, sql, sql2str_callback, &cbt);
*total_new_messages = atoi(msg_count);
switch_snprintf(sql, sizeof(sql), switch_snprintf(sql, sizeof(sql),
"select count(*) from voicemail_msgs where username='%s' and domain='%s' and in_folder='%s' and read_epoch=0 and read_flags='%s'", "select read_epoch=0, read_flags, count(read_epoch) from voicemail_msgs where username='%s' and domain='%s' and in_folder='%s' group by read_epoch=0,read_flags;",
myid, domain_name, myfolder, URGENT_FLAG_STRING); myid, domain_name, myfolder);
vm_execute_sql_callback(profile, profile->mutex, sql, sql2str_callback, &cbt);
*total_new_urgent_messages = atoi(msg_count);
switch_snprintf(sql, sizeof(sql), vm_execute_sql_callback(profile, profile->mutex, sql, message_count_callback, &cbt);
"select count(*) from voicemail_msgs where username='%s' and domain='%s' and in_folder='%s' and read_epoch!=0",
myid, domain_name, myfolder);
vm_execute_sql_callback(profile, profile->mutex, sql, sql2str_callback, &cbt);
*total_saved_messages = atoi(msg_count);
switch_snprintf(sql, sizeof(sql), *total_new_messages = cbt.total_new_messages;
"select count(*) from voicemail_msgs where username='%s' and domain='%s' and in_folder='%s' and read_epoch!=0 and read_flags='%s'", *total_new_urgent_messages = cbt.total_new_urgent_messages;
myid, domain_name, myfolder, URGENT_FLAG_STRING); *total_saved_messages = cbt.total_saved_messages;
vm_execute_sql_callback(profile, profile->mutex, sql, sql2str_callback, &cbt); *total_saved_urgent_messages = cbt.total_saved_urgent_messages;
*total_saved_urgent_messages = atoi(msg_count);
if (myid != id_in) { if (myid != id_in) {
free(myid); free(myid);