<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[Freeswitch-trunk][15636] </title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<div id="header">FreeSWITCH Subversion</div>
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://fisheye.freeswitch.org/changelog/FreeSWITCH?cs=15636">15636</a></dd>
<dt>Author</dt> <dd>mikej</dd>
<dt>Date</dt> <dd>2009-11-23 16:46:34 -0600 (Mon, 23 Nov 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>mod_voicemail: decrease sql queries for message counts (<a href="http://jira.freeswitch.org/browse/MODAPP-359">MODAPP-359</a>)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodapplicationsmod_voicemailmod_voicemailc">freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcmodapplicationsmod_voicemailmod_voicemailc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c (15635 => 15636)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c 2009-11-23 22:22:15 UTC (rev 15635)
+++ freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c 2009-11-23 22:46:34 UTC (rev 15636)
</span><span class="lines">@@ -1058,6 +1058,38 @@
</span><span class="cx"> };
</span><span class="cx"> typedef struct callback callback_t;
</span><span class="cx">
</span><ins>+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;
+}
+
</ins><span class="cx"> static int sql2str_callback(void *pArg, int argc, char **argv, char **columnNames)
</span><span class="cx"> {
</span><span class="cx"> callback_t *cbt = (callback_t *) pArg;
</span><span class="lines">@@ -1290,42 +1322,35 @@
</span><span class="cx"> return ret;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-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_saved_messages, int *total_new_urgent_messages, int *total_saved_urgent_messages)
</del><ins>+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_saved_messages, int *total_new_urgent_messages, int *total_saved_urgent_messages)
</ins><span class="cx"> {
</span><span class="cx"> char msg_count[80] = "";
</span><del>- callback_t cbt = { 0 };
</del><ins>+ msg_cnt_callback_t cbt = { 0 };
</ins><span class="cx"> char sql[256];
</span><span class="cx"> char *myid = NULL;
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> cbt.buf = msg_count;
</span><span class="cx"> cbt.len = sizeof(msg_count);
</span><del>-
</del><ins>+
+ cbt.total_new_messages = 0;
+ cbt.total_new_urgent_messages = 0;
+ cbt.total_saved_messages = 0;
+ cbt.total_saved_urgent_messages = 0;
+
</ins><span class="cx"> myid = resolve_id(id_in, domain_name, "message-count");
</span><del>-
- 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);
</del><span class="cx">
</span><span class="cx"> switch_snprintf(sql, sizeof(sql),
</span><del>- "select count(*) from voicemail_msgs where username='%s' and domain='%s' and in_folder='%s' and read_epoch=0 and read_flags='%s'",
- myid, domain_name, myfolder, URGENT_FLAG_STRING);
- vm_execute_sql_callback(profile, profile->mutex, sql, sql2str_callback, &cbt);
- *total_new_urgent_messages = atoi(msg_count);
</del><ins>+ "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);
</ins><span class="cx">
</span><del>- 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_saved_messages = atoi(msg_count);
</del><ins>+ vm_execute_sql_callback(profile, profile->mutex, sql, message_count_callback, &cbt);
</ins><span class="cx">
</span><del>- 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'",
- myid, domain_name, myfolder, URGENT_FLAG_STRING);
- vm_execute_sql_callback(profile, profile->mutex, sql, sql2str_callback, &cbt);
- *total_saved_urgent_messages = atoi(msg_count);
</del><ins>+ *total_new_messages = cbt.total_new_messages;
+ *total_new_urgent_messages = cbt.total_new_urgent_messages;
+ *total_saved_messages = cbt.total_saved_messages;
+ *total_saved_urgent_messages = cbt.total_saved_urgent_messages;
</ins><span class="cx">
</span><span class="cx"> if (myid != id_in) {
</span><span class="cx"> free(myid);
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>