hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into firewall

Browse Source 
Conflicts:
	server/modules/filter/test/harness_common.c
This commit is contained in:
Markus Makela
2014-11-25 17:56:26 +02:00
parent 7aa7474b77 75e9c30d49
commit 0900b5dbce
127 changed files with 3648 additions and 981 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
server/modules/filter/hint/hintparser.c
View File

@ -25,7 +25,10 @@
#include <modutil.h>
#include <mysqlhint.h>
extern int lm_enabled_logfiles_bitmask;
/** Defined in log_manager.cc */
extern int lm_enabled_logfiles_bitmask;
extern size_t log_ses_count[];
extern __thread log_info_t tls_log_info;
/**
* hintparser.c - Find any comment in the SQL packet and look for MAXSCALE

5
server/modules/filter/qlafilter.c
View File

@ -51,7 +51,10 @@
#include <regex.h>
#include <string.h>
extern int lm_enabled_logfiles_bitmask;
/** Defined in log_manager.cc */
extern int lm_enabled_logfiles_bitmask;
extern size_t log_ses_count[];
extern __thread log_info_t tls_log_info;
MODULE_INFO info = {
MODULE_API_FILTER,

5
server/modules/filter/regexfilter.c
View File

@ -24,7 +24,10 @@
#include <string.h>
#include <regex.h>
extern int lm_enabled_logfiles_bitmask;
/** Defined in log_manager.cc */
extern int lm_enabled_logfiles_bitmask;
extern size_t log_ses_count[];
extern __thread log_info_t tls_log_info;
/**
* @file regexfilter.c - a very simple regular expression rewrite filter.

7
server/modules/filter/tee.c
View File

@ -58,7 +58,10 @@
#include <router.h>
#include <dcb.h>
extern int lm_enabled_logfiles_bitmask;
/** Defined in log_manager.cc */
extern int lm_enabled_logfiles_bitmask;
extern size_t log_ses_count[];
extern __thread log_info_t tls_log_info;
MODULE_INFO info = {
MODULE_API_FILTER,
@ -403,7 +406,7 @@ GWBUF *clone = NULL;
if (my_session->residual < 0)
my_session->residual = 0;
}
else if (my_session->active && (ptr = modutil_get_SQL(queue) != NULL))
else if ( my_session->active && (ptr = modutil_get_SQL(queue)) != NULL)
{
if ((my_instance->match == NULL ||
regexec(&my_instance->re, ptr, 0, NULL, 0) == 0) &&

47
server/modules/filter/test/harness_common.c
View File

@ -318,16 +318,16 @@ int clientReply(void* ins, void* session, GWBUF* queue)
int fdgets(int fd, char* buff, int size)
{
int i = 0;
if(fd > 0){
while(i < size - 1 && read(fd,&buff[i],1))
{
if(buff[i] == '\n' || buff[i] == '\0')
{
break;
}
i++;
}
}
while(i < size - 1 && read(fd,&buff[i],1))
{
if(buff[i] == '\n' || buff[i] == '\0')
{
break;
}
i++;
}
buff[i] = '\0';
return i;
}
@ -1053,11 +1053,7 @@ int process_opts(int argc, char** argv)
case 'e':
instance.expected = open_file(optarg,0);
if(instance.expected > 0){
printf("Expected output is read from: %s\n",optarg);
}else{
printf("Error: Failed to open file: %s\n",optarg);
}
printf("Expected output is read from: %s\n",optarg);
break;
case 'o':
@ -1083,12 +1079,12 @@ int process_opts(int argc, char** argv)
case 's':
instance.session_count = atoi(optarg);
printf("Sessions: %i\n",instance.session_count);
printf("Sessions: %i ",instance.session_count);
break;
case 't':
instance.thrcount = atoi(optarg);
printf("Threads: %i\n",instance.thrcount);
printf("Threads: %i ",instance.thrcount);
break;
case 'd':
@ -1140,29 +1136,22 @@ int compare_files(int a,int b)
{
char in[4098];
char exp[4098];
int line = 1,ard, brd,running = 1;
int line = 1;
if(a < 1 || b < 1){
printf("Invalid file descriptors: %d %d\n",a,b);
return 1;
}
if(lseek(a,0,SEEK_SET) < 0 ||
lseek(b,0,SEEK_SET) < 0){
printf("Failed lseek() call on file descriptors: %d %d\n",a,b);
return 1;
}
while(running){
memset(in,0,4098);
memset(exp,0,4098);
ard = fdgets(a,in,4098);
brd = fdgets(b,exp,4098);
if(ard == 0 && brd == 0){
break;
}
if(ard == 0 || brd == 0 || strcmp(in,exp)){
while(fdgets(a,in,4098) && fdgets(b,exp,4098)){
if(strcmp(in,exp)){
printf("The files differ at line %d:\n%s\n-------------------------------------\n%s\n",line,in,exp);
return 1;
}

5
server/modules/filter/topfilter.c
View File

@ -48,7 +48,10 @@
#include <sys/time.h>
#include <regex.h>
extern int lm_enabled_logfiles_bitmask;
/** Defined in log_manager.cc */
extern int lm_enabled_logfiles_bitmask;
extern size_t log_ses_count[];
extern __thread log_info_t tls_log_info;
MODULE_INFO info = {
MODULE_API_FILTER,