aherman
/
proxysql
mirror of https://github.com/sysown/proxysql
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Code cleanup

Browse Source
pull/1269/head
René Cannaò 9 years ago
parent 2dce7013df
commit 58c7cd632a
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File

14
lib/MySQL_Session.cpp
Unescape View File

@ -721,7 +721,7 @@ bool MySQL_Session::handler_special_queries(PtrSize_t *pkt) {
char *unstripped=strndup((char *)pkt->ptr+15,pkt->size-15);
char *csname=trim_spaces_and_quotes_in_place(unstripped);
bool collation_specified = false;
unsigned int charsetnr = 0;
//unsigned int charsetnr = 0;
const CHARSET_INFO * c;
char * collation_name = NULL;
if (strcasestr(csname," COLLATE ")) {
@ -780,7 +780,7 @@ bool MySQL_Session::handler_special_queries(PtrSize_t *pkt) {
void MySQL_Session::handler___status_WAITING_CLIENT_DATA___STATE_SLEEP___MYSQL_COM_QUERY___create_mirror_session() {
if (pktH->size < 15*1024*1024 && (qpo->mirror_hostgroup >= 0 || qpo->mirror_flagOUT >= 0)) {
// check if there are too many mirror sessions in queue
if (thread->mirror_queue_mysql_sessions->len >= mysql_thread___mirror_max_queue_length) {
if (thread->mirror_queue_mysql_sessions->len >= (unsigned int)mysql_thread___mirror_max_queue_length) {
return;
}
// at this point, we will create the new session
@ -834,7 +834,7 @@ void MySQL_Session::handler___status_WAITING_CLIENT_DATA___STATE_SLEEP___MYSQL_C
if (thread->mirror_queue_mysql_sessions->len==0) {
// there are no sessions in the queue, we try to execute immediately
// Only mysql_thread___mirror_max_concurrency mirror session can run in parallel
if (__sync_add_and_fetch(&GloMTH->status_variables.mirror_sessions_current,1) > mysql_thread___mirror_max_concurrency ) {
if (__sync_add_and_fetch(&GloMTH->status_variables.mirror_sessions_current,1) > (unsigned int)mysql_thread___mirror_max_concurrency ) {
// if the limit is reached, we queue it instead
__sync_sub_and_fetch(&GloMTH->status_variables.mirror_sessions_current,1);
thread->mirror_queue_mysql_sessions->add(newsess);
@ -844,7 +844,7 @@ void MySQL_Session::handler___status_WAITING_CLIENT_DATA___STATE_SLEEP___MYSQL_C
//newsess->to_process=0;
if (newsess->status==WAITING_CLIENT_DATA) { // the mirror session has completed
thread->unregister_session(thread->mysql_sessions->len-1);
int l=mysql_thread___mirror_max_concurrency;
unsigned int l = (unsigned int)mysql_thread___mirror_max_concurrency;
if (thread->mirror_queue_mysql_sessions->len*0.3 > l) l=thread->mirror_queue_mysql_sessions->len*0.3;
if (thread->mirror_queue_mysql_sessions_cache->len <= l) {
bool to_cache=true;
@ -2642,7 +2642,7 @@ handler_again:
uint32_t client_stmtid;
uint64_t global_stmtid;
#endif
bool is_new;
//bool is_new;
MySQL_STMT_Global_info *stmt_info=NULL;
#ifndef PROXYSQL_STMT_V14
stmt_info=GloMyStmt->add_prepared_statement(&is_new, current_hostgroup,
@ -3800,9 +3800,9 @@ void MySQL_Session::handler___status_WAITING_CLIENT_DATA___STATE_SLEEP___MYSQL_C
status=WAITING_CLIENT_DATA;
*wrong_pass=false;
client_authenticated=true;
int free_users=0;
//int free_users=0;
int used_users=0;
free_users=GloMyAuth->increase_frontend_user_connections(client_myds->myconn->userinfo->username, &used_users);
/*free_users */GloMyAuth->increase_frontend_user_connections(client_myds->myconn->userinfo->username, &used_users);
// FIXME: max_connections is not handled for CHANGE_USER
} else {
l_free(pkt->size,pkt->ptr);

16
lib/ProxySQL_HTTP_Server.cpp
Unescape View File

@ -62,7 +62,7 @@ static char *style2 = (char *)" style=\"color: #2969a5 ; background-color: white
static char *generate_home() {
char *s = NULL;
string html = "";
char *link = (char *)"<a href=stats?metric=\"%s\" %s>30m</a>";
//3char *link = (char *)"<a href=stats?metric=\"%s\" %s>30m</a>";
html.append("<div class=\"menu\" style=\"height: auto;\">\n");
//<span style=\"float: right; width: 20%;\">\n<div style=\"border-bottom-style: solid; border-bottom-color: #1a3854; border-bottom-width: 1px; margin-bottom: 3px; color: #1a3854 ; background-color: white; font-size: 13px; font-family: Verdana, sans-serif; font-weight: bold; text-decoration: none; padding-left: 5px; padding-right: 5px;\">&nbsp</div>\n");
// html.append(div1); html.append(base); html.append("&interval=1800"); html.append(style1); html.append("Last 1/2 hour</a></div>\n");
@ -132,7 +132,7 @@ static char *generate_home() {
html.append("<br>\n");
html.append("<b>Monitor = </b>");
{
char *en = GloMTH->get_variable("monitor_enabled");
char *en = GloMTH->get_variable((char *)"monitor_enabled");
if (en && strcmp(en,"true")==0) {
html.append("<span style=\"color: green;\">enabled</span>");
} else {
@ -146,7 +146,7 @@ static char *generate_home() {
html.append("</td>\n");
html.append("<td width=\"33%\">\n");
{
char *en = GloAdmin->get_variable("mysql_ifaces");
char *en = GloAdmin->get_variable((char *)"mysql_ifaces");
if (en) {
html.append("<b>Admin interface(s)</b> = ");
html.append(en);
@ -158,7 +158,7 @@ static char *generate_home() {
if (GloVars.global.clickhouse_server==false) {
html.append("<b>ClickHouse = </b><span style=\"background-color: yellow;\"> Disabled </span><br>\n");
} else {
char *en = GloClickHouseServer->get_variable("mysql_ifaces");
char *en = GloClickHouseServer->get_variable((char *)"mysql_ifaces");
if (en) {
html.append("<b>ClickHouse interface</b> = ");
html.append(en);
@ -170,7 +170,7 @@ static char *generate_home() {
html.append("<b>ClickHouse = </b><span style=\"background-color: red;\"> Not compiled </span><br>\n");
#endif
if (GloMTH) {
char *en = GloMTH->get_variable("interfaces");
char *en = GloMTH->get_variable((char *)"interfaces");
if (en) {
html.append("<b>MySQL interface(s)</b> = ");
html.append(en);
@ -183,7 +183,7 @@ static char *generate_home() {
if (GloVars.global.sqlite3_server==false) {
html.append("<b>SQLite3 = </b><span style=\"background-color: yellow;\"> Disabled </span><br>\n");
} else {
char *en = GloSQLite3Server->get_variable("mysql_ifaces");
char *en = GloSQLite3Server->get_variable((char *)"mysql_ifaces");
if (en) {
html.append("<b>SQLite3 interface(s)</b> = ");
html.append(en);
@ -341,8 +341,8 @@ int ProxySQL_HTTP_Server::handler(void *cls, struct MHD_Connection *connection,
char *valmetric = NULL;
char *valinterval = NULL;
char *valunit = NULL;
//char *valinterval = NULL;
//char *valunit = NULL;
char *interval_s = NULL;
int interval_i = 1800;

Write Preview
Loading…
Cancel
Save