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

Further fixes on bug #94

Browse Source
pull/190/head
René Cannaò 12 years ago
parent 6e0eaab56e
commit 67d8eb6c3b
1 changed files with 35 additions and 25 deletions
Show Stats Download Patch File Download Diff File

60
lib/mysql_backend.cpp
Unescape View File

@ -36,32 +36,37 @@ MySQL_Server * MySQL_HostGroups_Handler::server_find(char *add, uint16_t p) {
};
size_t MySQL_HostGroups_Handler::servers_in_hostgroup(int hid) {
if (MyHostGroups->len > (unsigned int)hid) {
MySQL_Hostgroup *myhg=(MySQL_Hostgroup *)MyHostGroups->index(hid);
return myhg->servers_in_hostgroup();
}
return 0;
MySQL_Hostgroup *myhg=MyHostGroups_idx(hid);
return myhg->servers_in_hostgroup();
// if (MyHostGroups->len > (unsigned int)hid) {
// MySQL_Hostgroup *myhg=(MySQL_Hostgroup *)MyHostGroups->index(hid);
// return myhg->servers_in_hostgroup();
// }
// return 0;
};
MySQL_Hostgroup_Entry * MySQL_HostGroups_Handler::set_HG_entry_status(unsigned int hid, MySQL_Server *msptr, enum proxysql_server_status _status) {
if (MyHostGroups->len > hid) {
MySQL_Hostgroup *myhg=(MySQL_Hostgroup *)MyHostGroups->index(hid);
return myhg->set_HG_entry_status(msptr,_status);
}
return 0;
MySQL_Hostgroup *myhg=MyHostGroups_idx(hid);
return myhg->set_HG_entry_status(msptr,_status);
// if (MyHostGroups->len > hid) {
// MySQL_Hostgroup *myhg=(MySQL_Hostgroup *)MyHostGroups->index(hid);
// return myhg->set_HG_entry_status(msptr,_status);
// }
// return 0;
};
MySQL_Hostgroup_Entry * MySQL_HostGroups_Handler::set_HG_entry_status(unsigned int hid, char *add, uint16_t p, enum proxysql_server_status _status) {
MySQL_Server *msptr=server_find(add,p);
if (msptr==NULL) return NULL; // server not found
if (MyHostGroups->len > hid) {
MySQL_Hostgroup *myhg=(MySQL_Hostgroup *)MyHostGroups->index(hid);
MySQL_Hostgroup_Entry *myhge=myhg->set_HG_entry_status(msptr,_status);
return myhge;
}
return NULL;
// if (MyHostGroups->len > hid) {
// MySQL_Hostgroup *myhg=(MySQL_Hostgroup *)MyHostGroups->index(hid);
MySQL_Hostgroup *myhg=MyHostGroups_idx(hid);
MySQL_Hostgroup_Entry *myhge=myhg->set_HG_entry_status(msptr,_status);
return myhge;
// }
//return NULL;
}
//MySQL_Hostgroup_Entry * MySQL_HostGroups_Handler::server_add_hg(unsigned int hid, char *add=NULL, uint16_t p=3306, unsigned int _weight=1) {
@ -86,11 +91,14 @@ MySQL_Hostgroup * MySQL_HostGroups_Handler::MyHostGroups_idx(unsigned int hid) {
MySQL_Hostgroup_Entry * MySQL_HostGroups_Handler::MSHGE_find(unsigned int hid, MySQL_Server *srv) {
proxy_debug(PROXY_DEBUG_MYSQL_CONNPOOL, 4, "Searching MSHGE for MySQL_Server %p into HID %d\n", srv, hid);
if (MyHostGroups->len > hid) {
MySQL_Hostgroup *myhg=(MySQL_Hostgroup *)MyHostGroups->index(hid);
return myhg->MSHGE_find(srv);
}
return NULL;
MySQL_Hostgroup *myhg=MyHostGroups_idx(hid);
return myhg->MSHGE_find(srv);
// return myhg->MSHGE_find(srv);
// if (MyHostGroups->len > hid) {
// MySQL_Hostgroup *myhg=(MySQL_Hostgroup *)MyHostGroups->index(hid);
// return myhg->MSHGE_find(srv);
// }
// return NULL;
}
MySQL_Hostgroup_Entry * MySQL_HostGroups_Handler::MSHGE_find(unsigned int hid, char *add, uint16_t p) {
@ -115,10 +123,12 @@ void MySQL_HostGroups_Handler::insert_hostgroup(MySQL_Hostgroup *myhg) {
MySQL_Hostgroup_Entry * MySQL_HostGroups_Handler::get_random_hostgroup_entry(unsigned int hid) {
MySQL_Hostgroup_Entry *mshge=NULL;
rdlock();
if (MyHostGroups->len > hid) {
MySQL_Hostgroup *mshg=(MySQL_Hostgroup *)MyHostGroups->index(hid);
mshge=mshg->get_random_hostgroup_entry();
}
MySQL_Hostgroup *myhg=MyHostGroups_idx(hid);
mshge=myhg->get_random_hostgroup_entry();
// if (MyHostGroups->len > hid) {
// MySQL_Hostgroup *mshg=(MySQL_Hostgroup *)MyHostGroups->index(hid);
// mshge=mshg->get_random_hostgroup_entry();
// }
rdunlock();
return mshge;
}

Write Preview
Loading…
Cancel
Save