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

Fixed canonical query tests

Browse Source
This commit is contained in:
Markus Makela
2014-11-03 12:20:25 +02:00
parent ca816743e8
commit e7feba6964
2 changed files with 67 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
query_classifier/test/canonical_tests/canonizer.c
View File

@ -28,95 +28,51 @@ static char* server_groups[] = {
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
int fdin,fdout,i=0,fnamelen,fsz,lines = 0;
unsigned int psize; unsigned int psize;
GWBUF** qbuff; GWBUF* qbuff;
char *qin, *outnm, *buffer, *tok; char *tok;
char readbuff[4092];
FILE* infile;
FILE* outfile;
if(argc != 3){ if(argc != 3){
printf("Usage: canonizer <input file> <output file>\n"); printf("Usage: canonizer <input file> <output file>\n");
return 1; return 1;
} }
if(mysql_library_init(num_elements, server_options, server_groups)){
bool failed = mysql_library_init(num_elements, server_options, server_groups);
if(failed){
printf("Embedded server init failed.\n"); printf("Embedded server init failed.\n");
return 1; return 1;
} }
fnamelen = strlen(argv[1]) + 16; infile = fopen(argv[1],"rb");
fdin = open(argv[1],O_RDONLY); outfile = fopen(argv[2],"wb");
fsz = lseek(fdin,0,SEEK_END);
lseek(fdin,0,SEEK_SET);
if(!(buffer = malloc(sizeof(char)*fsz + 1))){ if(infile == NULL || outfile == NULL){
printf("Error: Failed to allocate memory."); printf("Opening files failed.\n");
return 1; return 1;
} }
read(fdin,buffer,fsz); while(!feof(infile))
buffer[fsz] = '\0'; {
fgets(readbuff,4092,infile);
psize = strlen(readbuff);
qbuff = gwbuf_alloc(psize + 7);
i = 0; *(qbuff->sbuf->data + 0) = (unsigned char)psize;
int bsz = 4,z=0; *(qbuff->sbuf->data + 1) = (unsigned char)(psize>>8);
qbuff = calloc(bsz,sizeof(GWBUF*)); *(qbuff->sbuf->data + 2) = (unsigned char)(psize>>16);
tok = strtok(buffer,"\n"); *(qbuff->sbuf->data + 4) = 0x03;
strcpy((char*)(qbuff->start + 5),readbuff);
while(tok){ parse_query(qbuff);
tok = skygw_get_canonical(qbuff);
if(i>=bsz){ fprintf(outfile,"%s\n",tok);
GWBUF** tmp = calloc(bsz*2,sizeof(GWBUF*)); free(tok);
if(!tmp){ gwbuf_free(qbuff);
printf("Error: Failed to allocate memory.");
return 1;
}
for(z=0;z<bsz;z++){
tmp[z] = qbuff[z];
}
free(qbuff);
qbuff = tmp;
bsz *= 2;
}
if(strlen(tok) > 0){
qin = strdup(tok);
psize = strlen(qin);
qbuff[i] = gwbuf_alloc(psize + 6);
*(qbuff[i]->sbuf->data + 0) = (unsigned char)psize;
*(qbuff[i]->sbuf->data + 1) = (unsigned char)(psize>>8);
*(qbuff[i]->sbuf->data + 2) = (unsigned char)(psize>>16);
*(qbuff[i]->sbuf->data + 4) = 0x03;
memcpy(qbuff[i]->sbuf->data + 5,qin,psize);
*(qbuff[i]->sbuf->data + 5 + psize) = 0x00;
tok = strtok(NULL,"\n\0");
free(qin);
i++;
}
}
fdout = open(argv[2],O_TRUNC|O_CREAT|O_WRONLY,S_IRWXU|S_IXGRP|S_IXOTH);
for(i = 0;i<bsz;i++){
if(qbuff[i]){
parse_query(qbuff[i]);
tok = skygw_get_canonical(qbuff[i]);
write(fdout,tok,strlen(tok));
write(fdout,"\n",1);
gwbuf_free(qbuff[i]);
}
} }
free(qbuff); fclose(infile);
free(buffer); fclose(outfile);
close(fdin); mysql_library_end();
close(fdout);
return 0; return 0;
} }

35
query_classifier/test/canonical_tests/expected.sql
View File

@ -1,17 +1,18 @@
select md5("?") =?, sleep(?), rand(?) select md5("?") =?, sleep(?), rand(?);
select * from my1 where md5("?") =? select * from my1 where md5("?") =?;
select md5("?") =? select md5("?") =?;
select * from my1 where md5("?") =? select * from my1 where md5("?") =?;
select sleep(?) select sleep(?);
select * from tst where lname='?' select * from tst where lname='?';
select ?,?,?,?,?,? from tst select ?,?,?,?,?,? from tst;
select * from tst where fname like '?' select * from tst where fname like '?';
select * from tst where lname like '?' order by fname select * from tst where lname like '?' order by fname;
insert into tst values ("?","?"),("?",?),("?","?") insert into tst values ("?","?"),("?",?),("?","?");
drop table if exists tst drop table if exists tst;
create table tst(fname varchar(30), lname varchar(30)) create table tst(fname varchar(30), lname varchar(30));
update tst set lname="?" where fname like '?' or lname like '?' update tst set lname="?" where fname like '?' or lname like '?';
delete from tst where lname like '?' and fname like '?' delete from tst where lname like '?' and fname like '?';
select ? from tst where fname='?' or lname like '?' select ? from tst where fname='?' or lname like '?';
select ?,?,?,? from tst where name='?' or name='?' or name='?' or name='?' select ?,?,?,? from tst where name='?' or name='?' or name='?' or name='?';
select count(?),count(?),count(?),count(?),count (?),count(?) from tst select count(?),count(?),count(?),count(?),count (?),count(?) from tst;
select count(?),count(?),count(?),count(?),count (?),count(?) from tst;