mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 12:32:27 +01:00
16115af97c
Fixed problem with LIKE with latin1_de Added parsing support of UNSIGNED LONG LONG Docs/manual.texi: Changelog client/client_priv.h: Changed to use my_global.h client/completion_hash.cc: Changed to use my_global.h client/errmsg.c: Changed to use my_global.h client/get_password.c: Changed to use my_global.h client/mysqldump.c: Changed to use my_global.h client/mysqlshow.c: Changed to use my_global.h client/mysqltest.c: Changed to use my_global.h client/password.c: Changed to use my_global.h client/readline.cc: Changed to use my_global.h client/sql_string.cc: Changed to use my_global.h client/thimble.cc: Changed to use my_global.h client/thread_test.c: Changed to use my_global.h dbug/dbug.c: Changed to use my_global.h dbug/dbug_analyze.c: Changed to use my_global.h dbug/example1.c: Changed to use my_global.h dbug/example2.c: Changed to use my_global.h dbug/example3.c: Changed to use my_global.h dbug/factorial.c: Changed to use my_global.h dbug/main.c: Changed to use my_global.h dbug/sanity.c: Changed to use my_global.h extra/comp_err.c: Changed to use my_global.h extra/my_print_defaults.c: Changed to use my_global.h extra/perror.c: Changed to use my_global.h extra/replace.c: Changed to use my_global.h extra/resolve_stack_dump.c: Changed to use my_global.h extra/resolveip.c: Changed to use my_global.h fs/libmysqlfs.h: Changed to use my_global.h fs/mysqlcorbafs.h: Changed to use my_global.h heap/hp_test1.c: Changed to use my_global.h include/Makefile.am: Changed to use my_global.h include/m_ctype.h: Changed to use my_global.h include/my_base.h: Changed to use my_global.h innobase/include/univ.i: Changed to use my_global.h libmysql/dll.c: Changed to use my_global.h libmysql/errmsg.c: Changed to use my_global.h libmysql/get_password.c: Changed to use my_global.h libmysql/libmysql.c: Changed to use my_global.h libmysql/net.c: Changed to use my_global.h libmysql/password.c: Changed to use my_global.h libmysqld/lib_sql.cc: Changed to use my_global.h libmysqld/lib_vio.c: Changed to use my_global.h libmysqld/libmysqld.c: Changed to use my_global.h mysql-test/mysql-test-run.sh: Changed to use latin1 as default character set mysql-test/r/ctype_latin1_de.result: Changed to use my_global.h mysql-test/r/func_like.result: New test mysql-test/t/ctype_latin1_de.test: Added test of part keys mysql-test/t/func_like.test: New test mysys/checksum.c: Changed to use my_global.h mysys/getopt.c: Changed to use my_global.h mysys/getopt1.c: Changed to use my_global.h mysys/make-conf.c: Changed to use my_global.h mysys/my_alloc.c: Changed to use my_global.h mysys/my_clock.c: Changed to use my_global.h mysys/my_compress.c: Changed to use my_global.h mysys/mysys_priv.h: Changed to use my_global.h mysys/test_charset.c: Changed to use my_global.h mysys/testhash.c: Changed to use my_global.h mysys/thr_alarm.c: Changed to use my_global.h mysys/thr_mutex.c: Changed to use my_global.h regex/debug.c: Changed to use my_global.h regex/main.c: Changed to use my_global.h regex/regcomp.c: Changed to use my_global.h regex/regerror.c: Changed to use my_global.h regex/regexec.c: Changed to use my_global.h regex/regexp.c: Changed to use my_global.h regex/regfree.c: Changed to use my_global.h regex/reginit.c: Changed to use my_global.h sql/cache_manager.cc: Changed to use my_global.h sql/gen_lex_hash.cc: Changed to use my_global.h sql/ha_berkeley.cc: Fixed problem with UNIQUE keys that could contain NULL sql/ha_gemini.h: Changed to use my_global.h sql/handler.cc: Fixed problem after merge sql/item.cc: Added Item_unit sql/item.h: Added Item_uint sql/matherr.c: Changed to use my_global.h sql/md5.c: Changed to use my_global.h sql/mini_client.cc: Changed to use my_global.h sql/my_lock.c: Changed to use my_global.h sql/mysql_priv.h: Changed to use my_global.h sql/net_serv.cc: Changed to use my_global.h sql/password.c: Changed to use my_global.h sql/sql_lex.cc: Added parsing support of UNSIGNED LONG LONG sql/sql_show.cc: Changed to use my_global.h sql/sql_string.cc: Changed to use my_global.h sql/sql_yacc.yy: Added usage of Int_uint sql/stacktrace.c: Changed to use my_global.h sql/udf_example.cc: Changed to use my_global.h strings/atof.c: Changed to use my_global.h strings/bchange.c: Changed to use my_global.h strings/bcmp.c: Changed to use my_global.h strings/bfill.c: Changed to use my_global.h strings/bmove.c: Changed to use my_global.h strings/bmove512.c: Changed to use my_global.h strings/bmove_upp.c: Changed to use my_global.h strings/ctype-big5.c: Changed to use my_global.h strings/ctype-czech.c: Changed to use my_global.h strings/ctype-euc_kr.c: Changed to use my_global.h strings/ctype-gb2312.c: Changed to use my_global.h strings/ctype-gbk.c: Changed to use my_global.h strings/ctype-latin1_de.c: Fixed problem with LIKE strings/ctype-sjis.c: Changed to use my_global.h strings/ctype-tis620.c: Changed to use my_global.h strings/ctype-ujis.c: Changed to use my_global.h strings/ctype.c: Changed to use my_global.h strings/do_ctype.c: Changed to use my_global.h strings/int2str.c: Changed to use my_global.h strings/is_prefix.c: Changed to use my_global.h strings/llstr.c: Changed to use my_global.h strings/longlong2str.c: Changed to use my_global.h strings/r_strinstr.c: Changed to use my_global.h strings/str2int.c: Changed to use my_global.h strings/str_test.c: Changed to use my_global.h strings/strappend.c: Changed to use my_global.h strings/strcend.c: Changed to use my_global.h strings/strcont.c: Changed to use my_global.h strings/strend.c: Changed to use my_global.h strings/strfill.c: Changed to use my_global.h strings/strings-not-used.h: Changed to use my_global.h strings/strinstr.c: Changed to use my_global.h strings/strmake.c: Changed to use my_global.h strings/strmov.c: Changed to use my_global.h strings/strnlen.c: Changed to use my_global.h strings/strnmov.c: Changed to use my_global.h strings/strstr.c: Changed to use my_global.h strings/strto.c: Changed to use my_global.h strings/strtol.c: Changed to use my_global.h strings/strtoll.c: Changed to use my_global.h strings/strtoul.c: Changed to use my_global.h strings/strtoull.c: Changed to use my_global.h strings/strxmov.c: Changed to use my_global.h strings/strxnmov.c: Changed to use my_global.h strings/udiv.c: Changed to use my_global.h tools/mysqlmanager.c: Changed to use my_global.h vio/test-ssl.c: Changed to use my_global.h vio/test-sslclient.c: Changed to use my_global.h vio/test-sslserver.c: Changed to use my_global.h vio/test-ssl: Changed to use my_global.h vio/vio.c: Changed to use my_global.h vio/viosocket.c: Changed to use my_global.h vio/viossl.c: Changed to use my_global.h vio/viosslfactories.c: Changed to use my_global.h vio/viotest-ssl.c: Changed to use my_global.h
249 lines
5 KiB
C++
249 lines
5 KiB
C++
/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
|
|
|
|
This library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Library General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2 of the License, or (at your option) any later version.
|
|
|
|
This library 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
|
|
Library General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Library General Public
|
|
License along with this library; if not, write to the Free
|
|
Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
|
|
MA 02111-1307, USA */
|
|
|
|
/* Quick & light hash implementation for tab completion purposes
|
|
*
|
|
* by Andi Gutmans <andi@zend.com>
|
|
* and Zeev Suraski <zeev@zend.com>
|
|
* Small portability changes by Monty. Changed also to use my_malloc/my_free
|
|
*/
|
|
|
|
#include <my_global.h>
|
|
#include <m_string.h>
|
|
#undef SAFEMALLOC // Speed things up
|
|
#include <my_sys.h>
|
|
#include "completion_hash.h"
|
|
|
|
uint hashpjw(char *arKey, uint nKeyLength)
|
|
{
|
|
uint h = 0, g, i;
|
|
|
|
for (i = 0; i < nKeyLength; i++) {
|
|
h = (h << 4) + arKey[i];
|
|
if ((g = (h & 0xF0000000))) {
|
|
h = h ^ (g >> 24);
|
|
h = h ^ g;
|
|
}
|
|
}
|
|
return h;
|
|
}
|
|
|
|
int completion_hash_init(HashTable *ht, uint nSize)
|
|
{
|
|
ht->arBuckets = (Bucket **) my_malloc(nSize* sizeof(Bucket *),
|
|
MYF(MY_ZEROFILL | MY_WME));
|
|
|
|
if (!ht->arBuckets) {
|
|
ht->initialized = 0;
|
|
return FAILURE;
|
|
}
|
|
ht->pHashFunction = hashpjw;
|
|
ht->nTableSize = nSize;
|
|
ht->initialized = 1;
|
|
return SUCCESS;
|
|
}
|
|
|
|
|
|
int completion_hash_update(HashTable *ht, char *arKey, uint nKeyLength,
|
|
char *str)
|
|
{
|
|
uint h, nIndex;
|
|
|
|
Bucket *p;
|
|
|
|
h = ht->pHashFunction(arKey, nKeyLength);
|
|
nIndex = h % ht->nTableSize;
|
|
|
|
if (nKeyLength <= 0) {
|
|
return FAILURE;
|
|
}
|
|
p = ht->arBuckets[nIndex];
|
|
while (p)
|
|
{
|
|
if ((p->h == h) && (p->nKeyLength == nKeyLength)) {
|
|
if (!memcmp(p->arKey, arKey, nKeyLength)) {
|
|
entry *n;
|
|
|
|
n = (entry *) my_malloc(sizeof(entry),
|
|
MYF(MY_WME));
|
|
n->pNext = p->pData;
|
|
n->str = str;
|
|
p->pData = n;
|
|
p->count++;
|
|
|
|
return SUCCESS;
|
|
}
|
|
}
|
|
p = p->pNext;
|
|
}
|
|
|
|
p = (Bucket *) my_malloc(sizeof(Bucket),MYF(MY_WME));
|
|
|
|
if (!p) {
|
|
return FAILURE;
|
|
}
|
|
p->arKey = arKey;
|
|
p->nKeyLength = nKeyLength;
|
|
p->h = h;
|
|
|
|
p->pData = (entry*) my_malloc(sizeof(entry),MYF(MY_WME));
|
|
if (!p->pData) {
|
|
my_free((gptr) p,MYF(0));
|
|
return FAILURE;
|
|
}
|
|
p->pData->str = str;
|
|
p->pData->pNext = 0;
|
|
p->count = 1;
|
|
|
|
p->pNext = ht->arBuckets[nIndex];
|
|
ht->arBuckets[nIndex] = p;
|
|
|
|
return SUCCESS;
|
|
}
|
|
|
|
static Bucket *completion_hash_find(HashTable *ht, char *arKey,
|
|
uint nKeyLength)
|
|
{
|
|
uint h, nIndex;
|
|
Bucket *p;
|
|
|
|
h = ht->pHashFunction(arKey, nKeyLength);
|
|
nIndex = h % ht->nTableSize;
|
|
|
|
p = ht->arBuckets[nIndex];
|
|
while (p)
|
|
{
|
|
if ((p->h == h) && (p->nKeyLength == nKeyLength)) {
|
|
if (!memcmp(p->arKey, arKey, nKeyLength)) {
|
|
return p;
|
|
}
|
|
}
|
|
p = p->pNext;
|
|
}
|
|
return (Bucket*) 0;
|
|
}
|
|
|
|
|
|
int completion_hash_exists(HashTable *ht, char *arKey, uint nKeyLength)
|
|
{
|
|
uint h, nIndex;
|
|
Bucket *p;
|
|
|
|
h = ht->pHashFunction(arKey, nKeyLength);
|
|
nIndex = h % ht->nTableSize;
|
|
|
|
p = ht->arBuckets[nIndex];
|
|
while (p)
|
|
{
|
|
if ((p->h == h) && (p->nKeyLength == nKeyLength))
|
|
{
|
|
if (!strcmp(p->arKey, arKey)) {
|
|
return 1;
|
|
}
|
|
}
|
|
p = p->pNext;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
Bucket *find_all_matches(HashTable *ht, char *str, uint length,
|
|
uint *res_length)
|
|
{
|
|
Bucket *b;
|
|
|
|
b = completion_hash_find(ht,str,length);
|
|
if (!b) {
|
|
*res_length = 0;
|
|
return (Bucket*) 0;
|
|
} else {
|
|
*res_length = length;
|
|
return b;
|
|
}
|
|
}
|
|
|
|
Bucket *find_longest_match(HashTable *ht, char *str, uint length,
|
|
uint *res_length)
|
|
{
|
|
Bucket *b,*return_b;
|
|
char *s;
|
|
uint count;
|
|
uint lm;
|
|
|
|
b = completion_hash_find(ht,str,length);
|
|
if (!b) {
|
|
*res_length = 0;
|
|
return (Bucket*) 0;
|
|
}
|
|
|
|
count = b->count;
|
|
lm = length;
|
|
s = b->pData->str;
|
|
|
|
return_b = b;
|
|
while (s[lm]!=0 && (b=completion_hash_find(ht,s,lm+1))) {
|
|
if (b->count<count) {
|
|
*res_length=lm;
|
|
return return_b;
|
|
}
|
|
return_b=b;
|
|
lm++;
|
|
}
|
|
*res_length=lm;
|
|
return return_b;
|
|
}
|
|
|
|
|
|
void completion_hash_clean(HashTable *ht)
|
|
{
|
|
uint i;
|
|
entry *e, *t;
|
|
Bucket *b, *tmp;
|
|
|
|
for (i=0; i<ht->nTableSize; i++) {
|
|
b = ht->arBuckets[i];
|
|
while (b) {
|
|
e = b->pData;
|
|
while (e) {
|
|
t = e;
|
|
e = e->pNext;
|
|
my_free((gptr) t,MYF(0));
|
|
}
|
|
tmp = b;
|
|
b = b->pNext;
|
|
my_free((gptr) tmp,MYF(0));
|
|
}
|
|
}
|
|
bzero((char*) ht->arBuckets,ht->nTableSize*sizeof(Bucket *));
|
|
}
|
|
|
|
|
|
void completion_hash_free(HashTable *ht)
|
|
{
|
|
completion_hash_clean(ht);
|
|
my_free((gptr) ht->arBuckets,MYF(0));
|
|
}
|
|
|
|
|
|
void add_word(HashTable *ht,char *str)
|
|
{
|
|
int i;
|
|
int length= (int) strlen(str);
|
|
|
|
for (i=1; i<=length; i++) {
|
|
completion_hash_update(ht, str, i, str);
|
|
}
|
|
}
|