mirror of
https://github.com/MariaDB/server.git
synced 2025-01-29 18:20:07 +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
116 lines
3.4 KiB
C
116 lines
3.4 KiB
C
/* Copyright (C) 2006 MySQL AB & Ramil Kalimullin
|
|
|
|
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 */
|
|
|
|
#include "maria_def.h"
|
|
|
|
#ifdef HAVE_RTREE_KEYS
|
|
#include "ma_rt_index.h"
|
|
#include "ma_rt_key.h"
|
|
#include "ma_rt_mbr.h"
|
|
|
|
/*
|
|
Add key to the page
|
|
|
|
RESULT VALUES
|
|
-1 Error
|
|
0 Not split
|
|
1 Split
|
|
*/
|
|
|
|
int maria_rtree_add_key(MARIA_HA *info, const MARIA_KEYDEF *keyinfo,
|
|
const uchar *key,
|
|
uint key_length, uchar *page_buf,
|
|
my_off_t *new_page)
|
|
{
|
|
MARIA_SHARE *share= info->s;
|
|
uint page_size= _ma_get_page_used(share, page_buf);
|
|
uint nod_flag= _ma_test_if_nod(share, page_buf);
|
|
DBUG_ENTER("maria_rtree_add_key");
|
|
|
|
if (page_size + key_length + share->base.rec_reflength <=
|
|
keyinfo->block_length)
|
|
{
|
|
/* split won't be necessary */
|
|
if (nod_flag)
|
|
{
|
|
/* save key */
|
|
DBUG_ASSERT(_ma_kpos(nod_flag, key) < info->state->key_file_length);
|
|
memcpy(rt_PAGE_END(share, page_buf), key - nod_flag,
|
|
key_length + nod_flag);
|
|
page_size+= key_length + nod_flag;
|
|
}
|
|
else
|
|
{
|
|
/* save key */
|
|
DBUG_ASSERT(_ma_dpos(info, nod_flag, key + key_length +
|
|
share->base.rec_reflength) <
|
|
info->state->data_file_length +
|
|
share->base.pack_reclength);
|
|
memcpy(rt_PAGE_END(share, page_buf), key, key_length +
|
|
share->base.rec_reflength);
|
|
page_size+= key_length + share->base.rec_reflength;
|
|
}
|
|
_ma_store_page_used(share, page_buf, page_size);
|
|
DBUG_RETURN(0);
|
|
}
|
|
|
|
DBUG_RETURN(maria_rtree_split_page(info, keyinfo, page_buf, key, key_length,
|
|
new_page) ? -1 : 1);
|
|
}
|
|
|
|
|
|
/*
|
|
Delete key from the page
|
|
*/
|
|
|
|
int maria_rtree_delete_key(MARIA_HA *info, uchar *page_buf, uchar *key,
|
|
uint key_length, uint nod_flag)
|
|
{
|
|
MARIA_SHARE *share= info->s;
|
|
uint16 page_size= _ma_get_page_used(share, page_buf);
|
|
uchar *key_start;
|
|
|
|
key_start= key - nod_flag;
|
|
if (!nod_flag)
|
|
key_length+= share->base.rec_reflength;
|
|
|
|
memmove(key_start, key + key_length, page_size - key_length -
|
|
(key - page_buf));
|
|
page_size-= key_length + nod_flag;
|
|
|
|
_ma_store_page_used(share, page_buf, page_size);
|
|
return 0;
|
|
}
|
|
|
|
|
|
/*
|
|
Calculate and store key MBR
|
|
*/
|
|
|
|
int maria_rtree_set_key_mbr(MARIA_HA *info, const MARIA_KEYDEF *keyinfo,
|
|
uchar *key,
|
|
uint key_length, my_off_t child_page)
|
|
{
|
|
DBUG_ENTER("maria_rtree_set_key_mbr");
|
|
if (!_ma_fetch_keypage(info, keyinfo, child_page,
|
|
PAGECACHE_LOCK_LEFT_UNLOCKED,
|
|
DFLT_INIT_HITS, info->buff, 0, 0))
|
|
DBUG_RETURN(-1);
|
|
|
|
DBUG_RETURN(maria_rtree_page_mbr(info, keyinfo->seg,
|
|
info->buff, key, key_length));
|
|
}
|
|
|
|
#endif /*HAVE_RTREE_KEYS*/
|