mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +01:00
70aa7424c4
(All commit emails since 4.0.1 checked) This had to be done now, before the 4.1 tree changes to much, to make it easy to propagate bug fixes to the 4.1 tree. BUILD/SETUP.sh: Added -DPEDANTIC_SAFEMALLOC as standard debug option Docs/manual.texi: Changes for new version. client/mysql.cc: Fixed default value for rehash cleanup client/mysqladmin.c: Cleanup client/mysqlbinlog.cc: cleanup client/mysqldump.c: Cleanup client/mysqlmanager-pwgen.c: Cleanup client/mysqlmanagerc.c: Cleanup client/mysqltest.c: Cleanup dbug/dbug.c: Cleanup extra/resolve_stack_dump.c: Cleanup & Simple optimizations include/ft_global.h: Cleanup include/my_alloc.h: Cleanup include/my_global.h: Cleanup include/my_sys.h: Cleanup include/myisam.h: Cleanup libmysql/libmysql.c: Cleanup libmysql/manager.c: Cleanup myisam/ft_boolean_search.c: Cleanup myisam/ft_dump.c: Change strcpy -> strmov myisam/ft_eval.c: Cleanup myisam/ft_nlq_search.c: Cleanup myisam/ft_test1.c: strncpy -> strnmov myisam/ft_update.c: Cleanup myisam/mi_static.c: Cleanup myisam/mi_test2.c: Cleanup myisam/mi_write.c: Cleanup mysys/mf_fn_ext.c: Cleanup mysys/mf_iocache.c: Cleanup mysys/mf_iocache2.c: Cleanup mysys/my_getopt.c: Cleanup mysys/my_read.c: Cleanup mysys/my_thr_init.c: Cleanup mysys/queues.c: Cleanup mysys/safemalloc.c: Cleanup sql/field.cc: Indentation cleanups sql/ha_berkeley.cc: Indentation cleanups sql/ha_myisam.cc: Cleanup sql/item.h: Indentation cleanups sql/item_cmpfunc.cc: Indentation cleanups sql/item_create.cc: cleanup sql/item_func.cc: Cleanup sql/item_func.h: Indentation cleanups sql/item_strfunc.cc: Indentation cleanups sql/item_sum.cc: Indentation cleanups sql/item_timefunc.cc: Indentation cleanups sql/lock.cc: Indentation cleanups sql/log.cc: Cleanup strnmov -> strmake sql/log_event.cc: Cleanup + optimizations Fixed memory leak Added missing pthread_mutex_unlock() (On error condition) sql/log_event.h: Indentation and comment cleanup Merged #ifdef's into common blocks for better readability sql/mini_client.cc: Indentation cleanup sql/mysql_priv.h: Cleanup Changed int function to bool sql/mysqld.cc: Indentation and comment cleanup sql/net_pkg.cc: Indentation cleanup sql/net_serv.cc: Changed int function -> bool sql/nt_servc.cc: Cleanup sql/opt_range.cc: Indentation cleanup sql/repl_failsafe.cc: Cleanup + simple optimization strnmov -> strmake sql/slave.cc: strnmov -> strmake Cleanups sql/slave.h: Cleanup sql/sql_acl.cc: Indentation and DBUG_PRINT cleanup Changed WITH MAX... to not use = sql/sql_base.cc: Indentation cleanup sql/sql_cache.cc: Indentation cleanup sql/sql_class.cc: Indentation cleanup sql/sql_class.h: Renamed some struct slots sql/sql_delete.cc: Indentation cleanup sql/sql_handler.cc: Indentation cleanup sql/sql_insert.cc: Use new slot names. sql/sql_lex.cc: Indentation cleanup sql/sql_lex.h: Indentation cleanup sql/sql_load.cc: Indentation cleanup sql/sql_parse.cc: Indentation cleanup Removed not used check from LOCK TABLES sql/sql_repl.cc: strnmov -> strmake sql/sql_repl.h: Removed test if file is included (We want to know if it's included twice to avoid this) sql/sql_select.cc: Indentation cleanup sql/sql_show.cc: Indentation cleanup sql/sql_string.cc: Indentation cleanup sql/sql_table.cc: Indentation cleanup sql/sql_union.cc: Use renamed struct slot sql/sql_update.cc: Indentation cleanup sql/sql_yacc.yy: Removed = after GRANT ... MAX_ to make the syntax uniform sql/table.cc: Indentation cleanup sql/table.h: Indentation cleanup sql/time.cc: Indentation cleanup sql/udf_example.cc: Indentation cleanup sql/unireg.cc: strnmov -> strmake tests/grant.pl: Added test for LOCK TABLES tools/mysqlmanager.c: Cleanup fopen() -> my_fopen() vio/viosocket.c: DBUG_PRINT cleanups vio/viosslfactories.c: Indentation cleanup Checking of results from malloc() Fixed possible memory leak BitKeeper/etc/ignore: Added scripts/mysql_secure_installation to the ignore list BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
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 MI_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);
|
|
}
|