mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 20:12:31 +01:00
9421f1dae9
Some simple optimzations, more comments and indentation changes. Add ` around database in 'use database' in binary log. Moved max_error_count and max_warning_count to variables struct. Removed SHOW_WARNS_COUNT and SHOW_ERRORS_COUNT calls. Changed string functions to use character set of first string argument as default return characterset (Each string function can change the above assumption if needed) BitKeeper/etc/ignore: auto-union BitKeeper/etc/logging_ok: auto-union BUILD/SETUP.sh: Auto merged BitKeeper/deleted/.del-getopt.h~a9ae679fa84f395: Auto merged BitKeeper/deleted/.del-getvar.c~2a29ff383970fd31: Auto merged Docs/manual.texi: Auto merged SSL/cacert.pem: Auto merged SSL/client-cert.pem: Auto merged SSL/client-key.pem: Auto merged SSL/server-cert.pem: Auto merged SSL/server-key.pem: Auto merged client/mysqldump.c: Auto merged include/my_base.h: Auto merged include/my_sys.h: Auto merged include/mysql_com.h: Auto merged isam/isamlog.c: Auto merged isam/pack_isam.c: Auto merged libmysqld/lib_sql.cc: Auto merged myisam/ft_dump.c: Auto merged myisam/ft_parser.c: Auto merged myisam/ft_static.c: Auto merged myisam/ft_test1.c: Auto merged myisam/ft_update.c: Auto merged myisam/mi_create.c: Auto merged myisam/mi_key.c: Auto merged myisam/mi_open.c: Auto merged myisam/mi_static.c: Auto merged myisam/mi_test1.c: Auto merged myisam/mi_test2.c: Auto merged myisam/mi_test3.c: Auto merged myisam/mi_update.c: Auto merged myisam/mi_write.c: Auto merged myisam/myisamchk.c: Auto merged myisam/myisamdef.h: Auto merged myisam/myisamlog.c: Auto merged myisam/myisampack.c: Auto merged mysql-test/mysql-test-run.sh: Auto merged mysql-test/r/create.result: Auto merged mysql-test/r/fulltext.result: Auto merged mysql-test/r/func_math.result: Auto merged mysql-test/r/innodb.result: Auto merged mysql-test/r/merge.result: Auto merged mysql-test/r/myisam.result: Auto merged mysql-test/r/select.result: Auto merged mysql-test/r/select_found.result: Auto merged mysql-test/r/union.result: Auto merged mysql-test/t/create.test: Auto merged mysql-test/t/myisam.test: Auto merged mysql-test/t/select_found.test: Auto merged mysql-test/t/union.test: Auto merged mysys/default.c: Auto merged mysys/mf_iocache2.c: Auto merged mysys/my_error.c: Auto merged mysys/my_init.c: Auto merged scripts/mysql_config.sh: Auto merged sql/convert.cc: Auto merged sql/filesort.cc: Auto merged sql/gen_lex_hash.cc: Auto merged sql/ha_berkeley.cc: Auto merged sql/ha_innodb.cc: Auto merged sql/ha_myisam.cc: Auto merged sql/handler.cc: Auto merged sql/handler.h: Auto merged sql/hostname.cc: Auto merged sql/item.cc: Auto merged sql/item_sum.cc: Auto merged sql/item_sum.h: Auto merged sql/item_timefunc.cc: Auto merged sql/item_timefunc.h: Auto merged sql/key.cc: Auto merged sql/log.cc: Auto merged sql/net_pkg.cc: Auto merged sql/opt_range.cc: Auto merged sql/opt_range.h: Auto merged sql/opt_sum.cc: Auto merged sql/repl_failsafe.cc: Auto merged sql/slave.cc: Auto merged sql/sql_cache.cc: Auto merged sql/sql_db.cc: Auto merged sql/sql_handler.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_lex.cc: Auto merged sql/sql_load.cc: Auto merged sql/sql_string.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_test.cc: Auto merged sql/time.cc: Auto merged sql/unireg.cc: Auto merged strings/Makefile.am: Auto merged strings/ctype-latin1_de.c: Auto merged strings/ctype-tis620.c: Auto merged tools/mysqlmanager.c: Auto merged BitKeeper/deleted/.del-sslopt-case.h~224c80e75dad4997: merge with 4.0.3 BitKeeper/triggers/post-commit: merge with 4.0.3 client/mysql.cc: merge with 4.0.3 + simple optimsation client/mysqltest.c: merge with 4.0.3 (Indentation change) configure.in: merge with 4.0.3 extra/resolve_stack_dump.c: merge with 4.0.3 (Indentation change) include/Makefile.am: merge with 4.0.3 include/myisam.h: merge with 4.0.3 (Indentation change) include/mysql.h: merge with 4.0.3 (removed not used structure) include/mysqld_error.h: merge with 4.0.3 libmysql/Makefile.shared: merge with 4.0.3 libmysql/libmysql.c: merge with 4.0.3 (Indentation change) libmysqld/Makefile.am: merge with 4.0.3 myisam/ft_boolean_search.c: merge with 4.0.3 (Indentation change) myisam/ft_nlq_search.c: merge with 4.0.3 (Indentation change) myisam/mi_check.c: merge with 4.0.3 myisam/mi_search.c: merge with 4.0.3 myisam/mi_unique.c: merge with 4.0.3 mysys/Makefile.am: merge with 4.0.3 mysys/mf_casecnv.c: merge with 4.0.3 sql-bench/server-cfg.sh: Removed 8000 max row limit for Innodb sql/Makefile.am: merge with 4.0.3 sql/field.cc: Indentation cleanup Changed sprintf -> my_sprintf sql/field.h: merge with 4.0.3 sql/ha_heap.cc: merge with 4.0.3 (Indentation change) sql/item.h: merge with 4.0.3 (Indentation change) sql/item_cmpfunc.cc: merge with 4.0.3 sql/item_cmpfunc.h: Removed size_of() from items Indentation cleanup sql/item_create.cc: merge sql/item_create.h: merge sql/item_func.cc: Added comments Changed string functions to use character set of first string argument as default return characterset Simple optimizations. Removed return of uninitalized variable. sql/item_func.h: merge sql/item_strfunc.cc: merge with 4.0.3 (Indentation change) sql/item_strfunc.h: removed size_of() sql/item_uniq.h: removed size_of() sql/lex.h: merge with 4.0.3 (Indentation change) sql/log_event.cc: Add ` around database in 'use database' in binary log. sql/mysql_priv.h: merge with 4.0.3 sql/mysqld.cc: merge with 4.0.3 (Indentation change) sql/share/czech/errmsg.txt: merge sql/share/danish/errmsg.txt: merge sql/share/dutch/errmsg.txt: merge sql/share/english/errmsg.txt: merge sql/share/estonian/errmsg.txt: merge sql/share/french/errmsg.txt: merge sql/share/german/errmsg.txt: merge sql/share/greek/errmsg.txt: merge sql/share/hungarian/errmsg.txt: merge sql/share/italian/errmsg.txt: merge sql/share/japanese/errmsg.txt: merge sql/share/korean/errmsg.txt: merge sql/share/norwegian-ny/errmsg.txt: merge sql/share/norwegian/errmsg.txt: merge sql/share/polish/errmsg.txt: merge sql/share/portuguese/errmsg.txt: merge sql/share/romanian/errmsg.txt: merge sql/share/russian/errmsg.txt: merge sql/share/slovak/errmsg.txt: merge sql/share/spanish/errmsg.txt: merge sql/share/swedish/errmsg.txt: merge sql/share/ukrainian/errmsg.txt: merge sql/sql_acl.cc: merge with 4.0.3 sql/sql_base.cc: More comments Fixed bug in send_fields() when using convert sql/sql_class.cc: merge sql/sql_class.h: Merge with 4.0.3 Moved max_error_count and max_warning_count to variables struct. sql/sql_delete.cc: merge with 4.0.3 (Indentation change) sql/sql_lex.h: merge with 4.0.3 sql/sql_parse.cc: Removed SHOW_WARNS_COUNT and SHOW_ERRORS_COUNT. (Should be retrived from variables) sql/sql_select.cc: merge with 4.0.3 sql/sql_show.cc: merge with 4.0.3 sql/sql_union.cc: merge with 4.0.3 sql/sql_update.cc: merge with 4.0.3 sql/sql_yacc.yy: merge with 4.0.3 Indentation cleanup sql/structs.h: merge with 4.0.3 sql/table.cc: merge with 4.0.3 sql/table.h: merge with 4.0.3
297 lines
8.2 KiB
C
297 lines
8.2 KiB
C
/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
/* Written by Sergei A. Golubchik, who has a shared copyright to this code
|
|
added support for long options (my_getopt) 22.5.2002 by Jani Tolonen */
|
|
|
|
#include "ftdefs.h"
|
|
#include "ft_test1.h"
|
|
#include <my_getopt.h>
|
|
|
|
static int key_field=FIELD_VARCHAR,extra_field=FIELD_SKIP_ENDSPACE;
|
|
static uint key_length=200,extra_length=50;
|
|
static int key_type=HA_KEYTYPE_TEXT;
|
|
static int verbose=0,silent=0,skip_update=0,
|
|
no_keys=0,no_stopwords=0,no_search=0,no_fulltext=0;
|
|
static int create_flag=0,error=0;
|
|
|
|
#define MAX_REC_LENGTH 300
|
|
static char record[MAX_REC_LENGTH],read_record[MAX_REC_LENGTH];
|
|
|
|
static int run_test(const char *filename);
|
|
static void get_options(int argc, char *argv[]);
|
|
static void create_record(char *, int);
|
|
static void usage();
|
|
|
|
static struct my_option my_long_options[] =
|
|
{
|
|
{"", 'v', "", 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
|
|
{"", '?', "", 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
|
|
{"", 'h', "", 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
|
|
{"", 'V', "", 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
|
|
{"", 'v', "", 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
|
|
{"", 's', "", 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
|
|
{"", 'N', "", 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
|
|
{"", 'S', "", 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
|
|
{"", 'K', "", 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
|
|
{"", 'F', "", 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
|
|
{"", 'U', "", 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
|
|
{"", '#', "", 0, 0, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},
|
|
{ 0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
|
|
};
|
|
|
|
int main(int argc, char *argv[])
|
|
{
|
|
MY_INIT(argv[0]);
|
|
|
|
get_options(argc,argv);
|
|
|
|
exit(run_test("FT1"));
|
|
}
|
|
|
|
static MI_COLUMNDEF recinfo[3];
|
|
static MI_KEYDEF keyinfo[2];
|
|
static HA_KEYSEG keyseg[10];
|
|
|
|
static int run_test(const char *filename)
|
|
{
|
|
MI_INFO *file;
|
|
int i,j;
|
|
my_off_t pos;
|
|
|
|
bzero((char*) recinfo,sizeof(recinfo));
|
|
|
|
/* First define 2 columns */
|
|
recinfo[0].type=extra_field;
|
|
recinfo[0].length= (extra_field == FIELD_BLOB ? 4 + mi_portable_sizeof_char_ptr :
|
|
extra_length);
|
|
if (extra_field == FIELD_VARCHAR)
|
|
recinfo[0].length+=2;
|
|
recinfo[1].type=key_field;
|
|
recinfo[1].length= (key_field == FIELD_BLOB ? 4+mi_portable_sizeof_char_ptr :
|
|
key_length);
|
|
if (key_field == FIELD_VARCHAR)
|
|
recinfo[1].length+=2;
|
|
|
|
/* Define a key over the first column */
|
|
keyinfo[0].seg=keyseg;
|
|
keyinfo[0].keysegs=1;
|
|
keyinfo[0].seg[0].type= key_type;
|
|
keyinfo[0].seg[0].flag= (key_field == FIELD_BLOB)?HA_BLOB_PART:
|
|
(key_field == FIELD_VARCHAR)?HA_VAR_LENGTH:0;
|
|
keyinfo[0].seg[0].start=recinfo[0].length;
|
|
keyinfo[0].seg[0].length=key_length;
|
|
keyinfo[0].seg[0].null_bit= 0;
|
|
keyinfo[0].seg[0].null_pos=0;
|
|
keyinfo[0].seg[0].language=MY_CHARSET_CURRENT;
|
|
keyinfo[0].flag = (no_fulltext?HA_PACK_KEY:HA_FULLTEXT);
|
|
|
|
if (!silent)
|
|
printf("- Creating isam-file\n");
|
|
if (mi_create(filename,(no_keys?0:1),keyinfo,2,recinfo,0,NULL,
|
|
(MI_CREATE_INFO*) 0, create_flag))
|
|
goto err;
|
|
if (!(file=mi_open(filename,2,0)))
|
|
goto err;
|
|
|
|
if (!silent)
|
|
printf("- %s stopwords\n",no_stopwords?"Skipping":"Initializing");
|
|
ft_init_stopwords(no_stopwords?NULL:ft_precompiled_stopwords);
|
|
|
|
if (!silent)
|
|
printf("- Writing key:s\n");
|
|
|
|
my_errno=0;
|
|
for (i=NUPD ; i<NDATAS; i++ )
|
|
{
|
|
create_record(record,i);
|
|
error=mi_write(file,record);
|
|
if (verbose || error)
|
|
printf("I= %2d mi_write: %d errno: %d, record: %s\n",
|
|
i,error,my_errno,data[i].f0);
|
|
}
|
|
|
|
if (!skip_update)
|
|
{
|
|
if (!silent)
|
|
printf("- Updating rows\n");
|
|
|
|
/* Read through all rows and update them */
|
|
pos=(ha_rows) 0;
|
|
i=0;
|
|
while ((error=mi_rrnd(file,read_record,pos)) == 0)
|
|
{
|
|
create_record(record,NUPD-i-1);
|
|
if (mi_update(file,read_record,record))
|
|
{
|
|
printf("Can't update row: %.*s, error: %d\n",
|
|
keyinfo[0].seg[0].length,record,my_errno);
|
|
}
|
|
if(++i == NUPD) break;
|
|
pos=HA_OFFSET_ERROR;
|
|
}
|
|
if (i != NUPD)
|
|
printf("Found %d of %d rows\n", i,NUPD);
|
|
}
|
|
|
|
if (mi_close(file)) goto err;
|
|
if(no_search) return 0;
|
|
if (!silent)
|
|
printf("- Reopening file\n");
|
|
if (!(file=mi_open(filename,2,0))) goto err;
|
|
if (!silent)
|
|
printf("- Reading rows with key\n");
|
|
for (i=0 ; i < NQUERIES ; i++)
|
|
{ FT_DOCLIST *result;
|
|
result=ft_nlq_init_search(file,0,(char*) query[i],strlen(query[i]),1);
|
|
if(!result) {
|
|
printf("Query %d: `%s' failed with errno %3d\n",i,query[i],my_errno);
|
|
continue;
|
|
}
|
|
printf("Query %d: `%s'. Found: %d. Top five documents:\n",
|
|
i,query[i],result->ndocs);
|
|
for(j=0;j<5;j++) { double w; int err;
|
|
err=ft_nlq_read_next(result, read_record);
|
|
if(err==HA_ERR_END_OF_FILE) {
|
|
printf("No more matches!\n");
|
|
break;
|
|
} else if (err) {
|
|
printf("ft_read_next %d failed with errno %3d\n",j,my_errno);
|
|
break;
|
|
}
|
|
w=ft_nlq_get_relevance(result);
|
|
if(key_field == FIELD_VARCHAR) {
|
|
uint l;
|
|
char *p;
|
|
p=recinfo[0].length+read_record;
|
|
l=uint2korr(p);
|
|
printf("%10.7f: %.*s\n",w,(int) l,p+2);
|
|
} else
|
|
printf("%10.7f: %.*s\n",w,recinfo[1].length,
|
|
recinfo[0].length+read_record);
|
|
}
|
|
ft_nlq_close_search(result);
|
|
}
|
|
|
|
if (mi_close(file)) goto err;
|
|
my_end(MY_CHECK_ERROR);
|
|
|
|
return (0);
|
|
err:
|
|
printf("got error: %3d when using myisam-database\n",my_errno);
|
|
return 1; /* skip warning */
|
|
}
|
|
|
|
static char blob_key[MAX_REC_LENGTH];
|
|
/* static char blob_record[MAX_REC_LENGTH+20*20]; */
|
|
|
|
void create_record(char *pos, int n)
|
|
{
|
|
bzero((char*) pos,MAX_REC_LENGTH);
|
|
if (recinfo[0].type == FIELD_BLOB)
|
|
{
|
|
uint tmp;
|
|
char *ptr;
|
|
strnmov(blob_key,data[n].f0,keyinfo[0].seg[0].length);
|
|
tmp=strlen(blob_key);
|
|
int4store(pos,tmp);
|
|
ptr=blob_key;
|
|
memcpy_fixed(pos+4,&ptr,sizeof(char*));
|
|
pos+=recinfo[0].length;
|
|
}
|
|
else if (recinfo[0].type == FIELD_VARCHAR)
|
|
{
|
|
uint tmp;
|
|
strnmov(pos+2,data[n].f0,keyinfo[0].seg[0].length);
|
|
tmp=strlen(pos+2);
|
|
int2store(pos,tmp);
|
|
pos+=recinfo[0].length;
|
|
}
|
|
else
|
|
{
|
|
strnmov(pos,data[n].f0,keyinfo[0].seg[0].length);
|
|
pos+=recinfo[0].length;
|
|
}
|
|
if (recinfo[1].type == FIELD_BLOB)
|
|
{
|
|
uint tmp;
|
|
char *ptr;
|
|
strnmov(blob_key,data[n].f2,keyinfo[0].seg[0].length);
|
|
tmp=strlen(blob_key);
|
|
int4store(pos,tmp);
|
|
ptr=blob_key;
|
|
memcpy_fixed(pos+4,&ptr,sizeof(char*));
|
|
pos+=recinfo[1].length;
|
|
}
|
|
else if (recinfo[1].type == FIELD_VARCHAR)
|
|
{
|
|
uint tmp;
|
|
strnmov(pos+2,data[n].f2,keyinfo[0].seg[0].length);
|
|
tmp=strlen(pos+2);
|
|
int2store(pos,tmp);
|
|
pos+=recinfo[1].length;
|
|
}
|
|
else
|
|
{
|
|
strnmov(pos,data[n].f2,keyinfo[0].seg[0].length);
|
|
pos+=recinfo[1].length;
|
|
}
|
|
}
|
|
|
|
|
|
static my_bool
|
|
get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
|
|
char *argument)
|
|
{
|
|
switch(optid) {
|
|
case 'v': verbose=1; break;
|
|
case 's': silent=1; break;
|
|
case 'F': no_fulltext=1; no_search=1;
|
|
case 'U': skip_update=1; break;
|
|
case 'K': no_keys=no_search=1; break;
|
|
case 'N': no_search=1; break;
|
|
case 'S': no_stopwords=1; break;
|
|
case '#':
|
|
DEBUGGER_ON;
|
|
DBUG_PUSH (argument);
|
|
break;
|
|
case 'V':
|
|
case '?':
|
|
case 'h':
|
|
usage();
|
|
exit(1);
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
/* Read options */
|
|
|
|
static void get_options(int argc,char *argv[])
|
|
{
|
|
int ho_error;
|
|
|
|
if ((ho_error=handle_options(&argc, &argv, my_long_options, get_one_option)))
|
|
exit(ho_error);
|
|
return;
|
|
} /* get options */
|
|
|
|
|
|
static void usage()
|
|
{
|
|
printf("%s [options]\n", my_progname);
|
|
my_print_help(my_long_options);
|
|
my_print_variables(my_long_options);
|
|
}
|