mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 20:42:30 +01:00
f094eff1d9
pointed data. I ran gcc -Wcast-qual on storage/maria, this identified un-needed casts, a couple of functions which said they had a const parameter though they changed the pointed content! This is fixed here. Some suspicious places receive a comment. The original intention of running -Wcast-qual was to find what code changes R-tree keys: I added const words, but hidden casts like those of int2store (casts target to (uint16*)) removed const checking; -Wcast-qual helped find those hidden casts. Log handler does not change the content pointed by LEX_STRING::str it receives, so we now use a struct which has a const inside, to emphasize this and be able to pass "const uchar*" buffers to log handler without fear of their content being changed by it. One-line fix for a merge glitch (when merging from MyISAM). include/m_string.h: As Maria's log handler uses LEX_STRING but never changes the content pointed by LEX_STRING::str, and assigns uchar* into this member most of the time, we introduce a new struct LEX_CUSTRING (C const U unsigned) for the log handler. include/my_global.h: In macros which read pointed content: use const pointers so that gcc -Wcast-qual does not warn about casting a const pointer to non-const. include/my_handler.h: In macros which read pointed content: use const pointers so that gcc -Wcast-qual does not warn about casting a const pointer to non-const. ha_find_null() does not change *a. include/my_sys.h: insert_dynamic() does not change *element. include/myisampack.h: In macros which read pointed content: use const pointers so that gcc -Wcast-qual does not warn about casting a const pointer to non-const. mysys/array.c: insert_dynamic() does not change *element mysys/my_handler.c: ha_find_null() does not change *a storage/maria/ma_bitmap.c: Log handler receives const strings now storage/maria/ma_blockrec.c: Log handler receives const strings now. _ma_apply_undo_row_delete/update() do change *header. storage/maria/ma_blockrec.h: correct prototype storage/maria/ma_check.c: Log handler receives const strings now. Un-needed casts storage/maria/ma_checkpoint.c: Log handler receives const strings now storage/maria/ma_checksum.c: unneeded cast storage/maria/ma_commit.c: Log handler receives const strings now storage/maria/ma_create.c: Log handler receives const strings now storage/maria/ma_dbug.c: fixing warning of gcc -Wcast-qual storage/maria/ma_delete.c: Log handler receives const strings now storage/maria/ma_delete_all.c: Log handler receives const strings now storage/maria/ma_delete_table.c: Log handler receives const strings now storage/maria/ma_dynrec.c: fixing some warnings of gcc -Wcast-qual. Unneeded casts removed. Comment about function which lies. storage/maria/ma_ft_parser.c: fix for warnings of gcc -Wcast-qual, removing unneeded casts storage/maria/ma_ft_update.c: less casts, comment storage/maria/ma_key.c: less casts, stay const (warnings of gcc -Wcast-qual) storage/maria/ma_key_recover.c: Log handler receives const strings now storage/maria/ma_loghandler.c: Log handler receives const strings now storage/maria/ma_loghandler.h: Log handler receives const strings now storage/maria/ma_loghandler_lsn.h: In macros which read pointed content: use const pointers so that gcc -Wcast-qual does not warn about casting a const pointer to non-const. storage/maria/ma_page.c: Log handler receives const strings now; more const storage/maria/ma_recovery.c: Log handler receives const strings now storage/maria/ma_rename.c: Log handler receives const strings now storage/maria/ma_rt_index.c: more const, to emphasize that functions don't change pointed content. best_key= NULL was forgotten during merge from MyISAM a few days ago, was causing a Valgrind warning storage/maria/ma_rt_index.h: new proto storage/maria/ma_rt_key.c: more const storage/maria/ma_rt_key.h: new proto storage/maria/ma_rt_mbr.c: more const for functions which deserve it storage/maria/ma_rt_mbr.h: new prototype storage/maria/ma_rt_split.c: make const what is not changed. storage/maria/ma_search.c: un-needed casts, more const storage/maria/ma_sp_key.c: more const storage/maria/ma_unique.c: un-needed casts. storage/maria/ma_write.c: Log handler receives const strings now storage/maria/maria_def.h: some more const storage/maria/unittest/ma_test_loghandler-t.c: Log handler receives const strings now storage/maria/unittest/ma_test_loghandler_first_lsn-t.c: Log handler receives const strings now storage/maria/unittest/ma_test_loghandler_max_lsn-t.c: Log handler receives const strings now storage/maria/unittest/ma_test_loghandler_multigroup-t.c: Log handler receives const strings now storage/maria/unittest/ma_test_loghandler_multithread-t.c: Log handler receives const strings now storage/maria/unittest/ma_test_loghandler_noflush-t.c: Log handler receives const strings now storage/maria/unittest/ma_test_loghandler_nologs-t.c: Log handler receives const strings now storage/maria/unittest/ma_test_loghandler_pagecache-t.c: Log handler receives const strings now storage/maria/unittest/ma_test_loghandler_purge-t.c: Log handler receives const strings now
193 lines
5 KiB
C
193 lines
5 KiB
C
/* Copyright (C) 2006 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; version 2 of the License.
|
|
|
|
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 */
|
|
|
|
/* Support rutiner with are using with dbug */
|
|
|
|
#include "maria_def.h"
|
|
|
|
/* Print a key in user understandable format */
|
|
|
|
void _ma_print_key(FILE *stream, register HA_KEYSEG *keyseg,
|
|
const uchar *key, uint length)
|
|
{
|
|
int flag;
|
|
short int s_1;
|
|
long int l_1;
|
|
float f_1;
|
|
double d_1;
|
|
const uchar *end;
|
|
const uchar *key_end= key + length;
|
|
|
|
VOID(fputs("Key: \"",stream));
|
|
flag=0;
|
|
for (; keyseg->type && key < key_end ;keyseg++)
|
|
{
|
|
if (flag++)
|
|
VOID(putc('-',stream));
|
|
end= key+ keyseg->length;
|
|
if (keyseg->flag & HA_NULL_PART)
|
|
{
|
|
/* A NULL value is encoded by a 1-byte flag. Zero means NULL. */
|
|
if (! *(key++))
|
|
{
|
|
fprintf(stream,"NULL");
|
|
continue;
|
|
}
|
|
end++;
|
|
}
|
|
|
|
switch (keyseg->type) {
|
|
case HA_KEYTYPE_BINARY:
|
|
if (!(keyseg->flag & HA_SPACE_PACK) && keyseg->length == 1)
|
|
{ /* packed binary digit */
|
|
VOID(fprintf(stream,"%d",(uint) *key++));
|
|
break;
|
|
}
|
|
/* fall through */
|
|
case HA_KEYTYPE_TEXT:
|
|
case HA_KEYTYPE_NUM:
|
|
if (keyseg->flag & HA_SPACE_PACK)
|
|
{
|
|
VOID(fprintf(stream,"%.*s",(int) *key,key+1));
|
|
key+= (int) *key+1;
|
|
}
|
|
else
|
|
{
|
|
VOID(fprintf(stream,"%.*s",(int) keyseg->length,key));
|
|
key=end;
|
|
}
|
|
break;
|
|
case HA_KEYTYPE_INT8:
|
|
VOID(fprintf(stream,"%d",(int) *((const signed char*) key)));
|
|
key=end;
|
|
break;
|
|
case HA_KEYTYPE_SHORT_INT:
|
|
s_1= mi_sint2korr(key);
|
|
VOID(fprintf(stream,"%d",(int) s_1));
|
|
key=end;
|
|
break;
|
|
case HA_KEYTYPE_USHORT_INT:
|
|
{
|
|
ushort u_1;
|
|
u_1= mi_uint2korr(key);
|
|
VOID(fprintf(stream,"%u",(uint) u_1));
|
|
key=end;
|
|
break;
|
|
}
|
|
case HA_KEYTYPE_LONG_INT:
|
|
l_1=mi_sint4korr(key);
|
|
VOID(fprintf(stream,"%ld",l_1));
|
|
key=end;
|
|
break;
|
|
case HA_KEYTYPE_ULONG_INT:
|
|
l_1=mi_uint4korr(key);
|
|
VOID(fprintf(stream,"%lu",(ulong) l_1));
|
|
key=end;
|
|
break;
|
|
case HA_KEYTYPE_INT24:
|
|
VOID(fprintf(stream,"%ld",(long) mi_sint3korr(key)));
|
|
key=end;
|
|
break;
|
|
case HA_KEYTYPE_UINT24:
|
|
VOID(fprintf(stream,"%lu",(ulong) mi_uint3korr(key)));
|
|
key=end;
|
|
break;
|
|
case HA_KEYTYPE_FLOAT:
|
|
mi_float4get(f_1,key);
|
|
VOID(fprintf(stream,"%g",(double) f_1));
|
|
key=end;
|
|
break;
|
|
case HA_KEYTYPE_DOUBLE:
|
|
mi_float8get(d_1,key);
|
|
VOID(fprintf(stream,"%g",d_1));
|
|
key=end;
|
|
break;
|
|
#ifdef HAVE_LONG_LONG
|
|
case HA_KEYTYPE_LONGLONG:
|
|
{
|
|
char buff[21];
|
|
longlong2str(mi_sint8korr(key),buff,-10);
|
|
VOID(fprintf(stream,"%s",buff));
|
|
key=end;
|
|
break;
|
|
}
|
|
case HA_KEYTYPE_ULONGLONG:
|
|
{
|
|
char buff[21];
|
|
longlong2str(mi_sint8korr(key),buff,10);
|
|
VOID(fprintf(stream,"%s",buff));
|
|
key=end;
|
|
break;
|
|
}
|
|
case HA_KEYTYPE_BIT:
|
|
{
|
|
uint i;
|
|
fputs("0x",stream);
|
|
for (i=0 ; i < keyseg->length ; i++)
|
|
fprintf(stream, "%02x", (uint) *key++);
|
|
key= end;
|
|
break;
|
|
}
|
|
|
|
#endif
|
|
case HA_KEYTYPE_VARTEXT1: /* VARCHAR and TEXT */
|
|
case HA_KEYTYPE_VARTEXT2: /* VARCHAR and TEXT */
|
|
case HA_KEYTYPE_VARBINARY1: /* VARBINARY and BLOB */
|
|
case HA_KEYTYPE_VARBINARY2: /* VARBINARY and BLOB */
|
|
{
|
|
uint tmp_length;
|
|
get_key_length(tmp_length,key);
|
|
/*
|
|
The following command sometimes gives a warning from valgrind.
|
|
Not yet sure if the bug is in valgrind, glibc or mysqld
|
|
*/
|
|
VOID(fprintf(stream,"%.*s",(int) tmp_length,key));
|
|
key+=tmp_length;
|
|
break;
|
|
}
|
|
default: break; /* This never happens */
|
|
}
|
|
}
|
|
VOID(fputs("\"\n",stream));
|
|
return;
|
|
} /* print_key */
|
|
|
|
|
|
#ifdef EXTRA_DEBUG
|
|
|
|
my_bool _ma_check_table_is_closed(const char *name, const char *where)
|
|
{
|
|
char filename[FN_REFLEN];
|
|
LIST *pos;
|
|
DBUG_ENTER("_ma_check_table_is_closed");
|
|
|
|
(void) fn_format(filename,name,"",MARIA_NAME_IEXT,4+16+32);
|
|
for (pos=maria_open_list ; pos ; pos=pos->next)
|
|
{
|
|
MARIA_HA *info=(MARIA_HA*) pos->data;
|
|
MARIA_SHARE *share= info->s;
|
|
if (!strcmp(share->unique_file_name,filename))
|
|
{
|
|
if (share->last_version)
|
|
{
|
|
fprintf(stderr,"Warning: Table: %s is open on %s\n", name,where);
|
|
DBUG_PRINT("warning",("Table: %s is open on %s", name,where));
|
|
DBUG_RETURN(1);
|
|
}
|
|
}
|
|
}
|
|
DBUG_RETURN(0);
|
|
}
|
|
#endif /* EXTRA_DEBUG */
|