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

Compiling optimization

Browse Source 
* converted MySQL_Authentication to use unsorted_map instead of btree_map
* Query_Cache now uses pointers to KV_BtreeArray
* removed some unnecesary headers
pull/739/head
René Cannaò 10 years ago
parent 60c35d8f67
commit dd00c3f8d0
8 changed files with 89 additions and 35 deletions
Show Stats Download Patch File Download Diff File

8
include/MySQL_Authentication.hpp
Unescape View File

@ -1,7 +1,7 @@
#ifndef __CLASS_MYSQL_AUTHENTICATION_H
#define __CLASS_MYSQL_AUTHENTICATION_H
#include "btree_map.h"
//#include "btree_map.h"
#include "proxysql.h"
#include "cpp.h"
@ -36,13 +36,15 @@ typedef struct _account_details_t {
*/
typedef btree::btree_map<uint64_t, account_details_t *> BtMap_auth;
//typedef btree::btree_map<uint64_t, account_details_t *> BtMap_auth;
typedef std::unordered_map<uint64_t, account_details_t *> umap_auth;
class PtrArray;
typedef struct _creds_group_t {
rwlock_t lock;
BtMap_auth bt_map;
//BtMap_auth bt_map;
umap_auth bt_map;
PtrArray *cred_array;
} creds_group_t;

20
include/cpp.h
Unescape View File

@ -22,17 +22,17 @@
#undef swap
#undef min
#undef max
#include <memory>
//#include <memory>
#include <stdio.h>
#include <algorithm>
#include <functional>
#include <type_traits>
#include <iosfwd>
//#include <algorithm>
//#include <functional>
//#include <type_traits>
//#include <iosfwd>
#include <map>
#include <unordered_map>
#include <set>
#include <sstream>
#include <string>
#include <utility>
#include <vector>
//#include <set>
//#include <sstream>
//#include <string>
//#include <utility>
//#include <vector>
//#endif /* __cplusplus */

18
include/proxysql.h
Unescape View File

@ -1,7 +1,15 @@
#ifdef __cplusplus
#include <string>
#include <stack>
#include "btree_map.h"
#include <algorithm>
//#include <functional>
//#include <memory>
//#include <string>
//#include <utility>
//#include "btree_map.h"
#ifndef EZOPTION
//#include "ezOptionParser.hpp"
#define EZOPTION
@ -70,8 +78,14 @@
#include "jemalloc.h"
#ifdef DEBUG
//#define VALGRIND_ENABLE_ERROR_REPORTING
//#define VALGRIND_DISABLE_ERROR_REPORTING
#include "valgrind.h"
#else
#define VALGRIND_ENABLE_ERROR_REPORTING
#define VALGRIND_DISABLE_ERROR_REPORTING
#endif /* DEBUG */
#include "sqlite3.h"

4
include/proxysql_structs.h
Unescape View File

@ -282,8 +282,8 @@ class SQLite3DB;
class SimpleKV;
class AdvancedKV;
class ProxySQL_Poll;
//class Query_Cache;
class Shared_Query_Cache;
class Query_Cache;
//class Shared_Query_Cache;
class MySQL_Authentication;
class MySQL_Connection;
class MySQL_Protocol;

8
include/query_cache.hpp
Unescape View File

@ -28,7 +28,7 @@ struct __QC_entry_t {
unsigned long long access_ms; // when the entry was read last , monotonic , millisecond granularity
uint32_t ref_count; // reference counter
};
/*
typedef btree::btree_map<uint64_t, QC_entry_t *> BtMap_cache;
@ -52,10 +52,12 @@ class KV_BtreeArray {
QC_entry_t *lookup(uint64_t key);
void empty();
};
*/
class KV_BtreeArray;
class Query_Cache {
private:
KV_BtreeArray KVs[SHARED_QUERY_CACHE_HASH_TABLES];
//KV_BtreeArray KVs[SHARED_QUERY_CACHE_HASH_TABLES];
KV_BtreeArray * KVs[SHARED_QUERY_CACHE_HASH_TABLES];
uint64_t get_data_size_total();
unsigned int current_used_memory_pct();
public:

21
lib/MySQL_Authentication.cpp
Unescape View File

@ -136,7 +136,8 @@ bool MySQL_Authentication::add(char * username, char * password, enum cred_usern
void *sha1_pass=NULL;
char *oldpass=NULL;
spin_wrlock(&cg.lock);
btree::btree_map<uint64_t, account_details_t *>::iterator lookup;
//btree::btree_map<uint64_t, account_details_t *>::iterator lookup;
std::unordered_map<uint64_t, account_details_t *>::iterator lookup;
lookup = cg.bt_map.find(hash1);
if (lookup != cg.bt_map.end()) {
account_details_t *ad=lookup->second;
@ -264,7 +265,8 @@ int MySQL_Authentication::increase_frontend_user_connections(char *username) {
creds_group_t &cg=creds_frontends;
int ret=0;
spin_wrlock(&cg.lock);
btree::btree_map<uint64_t, account_details_t *>::iterator it;
//btree::btree_map<uint64_t, account_details_t *>::iterator it;
std::unordered_map<uint64_t, account_details_t *>::iterator it;
it = cg.bt_map.find(hash1);
if (it != cg.bt_map.end()) {
account_details_t *ad=it->second;
@ -284,7 +286,8 @@ void MySQL_Authentication::decrease_frontend_user_connections(char *username) {
delete myhash;
creds_group_t &cg=creds_frontends;
spin_wrlock(&cg.lock);
btree::btree_map<uint64_t, account_details_t *>::iterator it;
//btree::btree_map<uint64_t, account_details_t *>::iterator it;
std::unordered_map<uint64_t, account_details_t *>::iterator it;
it = cg.bt_map.find(hash1);
if (it != cg.bt_map.end()) {
account_details_t *ad=it->second;
@ -308,7 +311,8 @@ bool MySQL_Authentication::del(char * username, enum cred_username_type usertype
if (set_lock)
spin_wrlock(&cg.lock);
btree::btree_map<uint64_t, account_details_t *>::iterator lookup;
//btree::btree_map<uint64_t, account_details_t *>::iterator lookup;
std::unordered_map<uint64_t, account_details_t *>::iterator lookup;
lookup = cg.bt_map.find(hash1);
if (lookup != cg.bt_map.end()) {
account_details_t *ad=lookup->second;
@ -339,7 +343,8 @@ bool MySQL_Authentication::set_SHA1(char * username, enum cred_username_type use
creds_group_t &cg=(usertype==USERNAME_BACKEND ? creds_backends : creds_frontends);
spin_wrlock(&cg.lock);
btree::btree_map<uint64_t, account_details_t *>::iterator lookup;
//btree::btree_map<uint64_t, account_details_t *>::iterator lookup;
std::unordered_map<uint64_t, account_details_t *>::iterator lookup;
lookup = cg.bt_map.find(hash1);
if (lookup != cg.bt_map.end()) {
account_details_t *ad=lookup->second;
@ -368,7 +373,8 @@ char * MySQL_Authentication::lookup(char * username, enum cred_username_type use
creds_group_t &cg=(usertype==USERNAME_BACKEND ? creds_backends : creds_frontends);
spin_rdlock(&cg.lock);
btree::btree_map<uint64_t, account_details_t *>::iterator lookup;
//btree::btree_map<uint64_t, account_details_t *>::iterator lookup;
std::unordered_map<uint64_t, account_details_t *>::iterator lookup;
lookup = cg.bt_map.find(hash1);
if (lookup != cg.bt_map.end()) {
account_details_t *ad=lookup->second;
@ -396,7 +402,8 @@ bool MySQL_Authentication::_reset(enum cred_username_type usertype) {
creds_group_t &cg=(usertype==USERNAME_BACKEND ? creds_backends : creds_frontends);
spin_wrlock(&cg.lock);
btree::btree_map<uint64_t, account_details_t *>::iterator lookup;
//btree::btree_map<uint64_t, account_details_t *>::iterator lookup;
std::unordered_map<uint64_t, account_details_t *>::iterator lookup;
while (cg.bt_map.size()) {
lookup = cg.bt_map.begin();

42
lib/Query_Cache.cpp
Unescape View File

@ -1,6 +1,7 @@
#include "btree_map.h"
#include "proxysql.h"
#include "cpp.h"
#include "query_cache.hpp"
#include "proxysql_atomic.h"
#include "SpookyV2.h"
@ -28,6 +29,30 @@
#endif /* DEBUG */
#define QUERY_CACHE_VERSION "0.2.0902" DEB
typedef btree::btree_map<uint64_t, QC_entry_t *> BtMap_cache;
class KV_BtreeArray {
private:
rwlock_t lock;
BtMap_cache bt_map;
PtrArray *ptrArray;
uint64_t purgeChunkSize;
uint64_t purgeIdx;
bool __insert(uint64_t, void *);
uint64_t freeable_memory;
public:
uint64_t tottopurge;
KV_BtreeArray();
~KV_BtreeArray();
uint64_t get_data_size();
void purge_some(unsigned long long);
int cnt();
bool replace(uint64_t key, QC_entry_t *entry);
QC_entry_t *lookup(uint64_t key);
void empty();
};
__thread uint64_t __thr_cntSet=0;
__thread uint64_t __thr_cntGet=0;
__thread uint64_t __thr_cntGetOK=0;
@ -210,7 +235,7 @@ uint64_t Query_Cache::get_data_size_total() {
int r=0;
int i;
for (i=0; i<SHARED_QUERY_CACHE_HASH_TABLES; i++) {
r+=KVs[i].get_data_size();
r+=KVs[i]->get_data_size();
}
return r;
};
@ -236,6 +261,9 @@ Query_Cache::Query_Cache() {
perror("Incompatible debagging version");
exit(EXIT_FAILURE);
}
for (int i=0; i<SHARED_QUERY_CACHE_HASH_TABLES; i++) {
KVs[i]=new KV_BtreeArray();
}
QCnow_ms=monotonic_time()/1000;
size=SHARED_QUERY_CACHE_HASH_TABLES;
shutdown=0;
@ -253,7 +281,7 @@ void Query_Cache::print_version() {
Query_Cache::~Query_Cache() {
unsigned int i;
for (i=0; i<SHARED_QUERY_CACHE_HASH_TABLES; i++) {
// FIXME: what here? I think KV_BtreeArray are automatically destroyed
delete KVs[i];
}
};
@ -265,7 +293,7 @@ unsigned char * Query_Cache::get(uint64_t user_hash, const unsigned char *kp, co
uint64_t hk=SpookyHash::Hash64(kp, kl, user_hash);
unsigned char i=hk%SHARED_QUERY_CACHE_HASH_TABLES;
QC_entry_t *entry=KVs[i].lookup(hk);
QC_entry_t *entry=KVs[i]->lookup(hk);
if (entry!=NULL) {
unsigned long long t=curtime_ms;
@ -294,7 +322,7 @@ bool Query_Cache::set(uint64_t user_hash, const unsigned char *kp, uint32_t kl,
uint64_t hk=SpookyHash::Hash64(kp, kl, user_hash);
unsigned char i=hk%SHARED_QUERY_CACHE_HASH_TABLES;
entry->key=hk;
KVs[i].replace(hk, entry);
KVs[i]->replace(hk, entry);
return true;
}
@ -303,8 +331,8 @@ uint64_t Query_Cache::flush() {
int i;
uint64_t total_count=0;
for (i=0; i<SHARED_QUERY_CACHE_HASH_TABLES; i++) {
total_count+=KVs[i].cnt();
KVs[i].empty();
total_count+=KVs[i]->cnt();
KVs[i]->empty();
}
return total_count;
};
@ -319,7 +347,7 @@ void * Query_Cache::purgeHash_thread(void *) {
if (current_used_memory_pct() < purge_threshold_pct_min ) continue;
for (i=0; i<SHARED_QUERY_CACHE_HASH_TABLES; i++) {
KVs[i].purge_some(QCnow_ms);
KVs[i]->purge_some(QCnow_ms);
}
}
return NULL;

3
lib/configfile.cpp
Unescape View File

@ -1,7 +1,8 @@
#include "proxysql.h"
#include "cpp.h"
#include <iostream>
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>

Write Preview
Loading…
Cancel
Save