mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 20:12:31 +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
374 lines
8.9 KiB
C
374 lines
8.9 KiB
C
/* Copyright (C) 2006 MySQL AB & Alexey Botchkov & 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 */
|
|
|
|
#include "maria_def.h"
|
|
|
|
#ifdef HAVE_RTREE_KEYS
|
|
|
|
#include "ma_rt_index.h"
|
|
#include "ma_rt_key.h"
|
|
#include "ma_rt_mbr.h"
|
|
|
|
typedef struct
|
|
{
|
|
double square;
|
|
int n_node;
|
|
const uchar *key;
|
|
double *coords;
|
|
} SplitStruct;
|
|
|
|
inline static double *reserve_coords(double **d_buffer, int n_dim)
|
|
{
|
|
double *coords= *d_buffer;
|
|
(*d_buffer)+= n_dim * 2;
|
|
return coords;
|
|
}
|
|
|
|
static void mbr_join(double *a, const double *b, int n_dim)
|
|
{
|
|
double *end= a + n_dim * 2;
|
|
do
|
|
{
|
|
if (a[0] > b[0])
|
|
a[0]= b[0];
|
|
|
|
if (a[1] < b[1])
|
|
a[1]= b[1];
|
|
|
|
a+= 2;
|
|
b+= 2;
|
|
} while (a != end);
|
|
}
|
|
|
|
/*
|
|
Counts the square of mbr which is a join of a and b
|
|
*/
|
|
static double mbr_join_square(const double *a, const double *b, int n_dim)
|
|
{
|
|
const double *end= a + n_dim * 2;
|
|
double square= 1.0;
|
|
do
|
|
{
|
|
square *=
|
|
((a[1] < b[1]) ? b[1] : a[1]) - ((a[0] > b[0]) ? b[0] : a[0]);
|
|
|
|
a+= 2;
|
|
b+= 2;
|
|
} while (a != end);
|
|
|
|
return square;
|
|
}
|
|
|
|
static double count_square(const double *a, int n_dim)
|
|
{
|
|
const double *end= a + n_dim * 2;
|
|
double square= 1.0;
|
|
do
|
|
{
|
|
square *= a[1] - a[0];
|
|
a+= 2;
|
|
} while (a != end);
|
|
return square;
|
|
}
|
|
|
|
inline static void copy_coords(double *dst, const double *src, int n_dim)
|
|
{
|
|
memcpy(dst, src, sizeof(double) * (n_dim * 2));
|
|
}
|
|
|
|
/*
|
|
Select two nodes to collect group upon
|
|
*/
|
|
static void pick_seeds(SplitStruct *node, int n_entries,
|
|
SplitStruct **seed_a, SplitStruct **seed_b, int n_dim)
|
|
{
|
|
SplitStruct *cur1;
|
|
SplitStruct *lim1= node + (n_entries - 1);
|
|
SplitStruct *cur2;
|
|
SplitStruct *lim2= node + n_entries;
|
|
|
|
double max_d= -DBL_MAX;
|
|
double d;
|
|
|
|
for (cur1= node; cur1 < lim1; cur1++)
|
|
{
|
|
for (cur2=cur1 + 1; cur2 < lim2; cur2++)
|
|
{
|
|
|
|
d= mbr_join_square(cur1->coords, cur2->coords, n_dim) - cur1->square -
|
|
cur2->square;
|
|
if (d > max_d)
|
|
{
|
|
max_d= d;
|
|
*seed_a= cur1;
|
|
*seed_b= cur2;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
/*
|
|
Select next node and group where to add
|
|
*/
|
|
static void pick_next(SplitStruct *node, int n_entries, double *g1, double *g2,
|
|
SplitStruct **choice, int *n_group, int n_dim)
|
|
{
|
|
SplitStruct *cur= node;
|
|
SplitStruct *end= node + n_entries;
|
|
|
|
double max_diff= -DBL_MAX;
|
|
|
|
for (; cur < end; cur++)
|
|
{
|
|
double diff;
|
|
double abs_diff;
|
|
|
|
if (cur->n_node)
|
|
{
|
|
continue;
|
|
}
|
|
|
|
diff= mbr_join_square(g1, cur->coords, n_dim) -
|
|
mbr_join_square(g2, cur->coords, n_dim);
|
|
|
|
abs_diff= fabs(diff);
|
|
if (abs_diff > max_diff)
|
|
{
|
|
max_diff= abs_diff;
|
|
*n_group= 1 + (diff > 0);
|
|
*choice= cur;
|
|
}
|
|
}
|
|
}
|
|
|
|
/*
|
|
Mark not-in-group entries as n_group
|
|
*/
|
|
static void mark_all_entries(SplitStruct *node, int n_entries, int n_group)
|
|
{
|
|
SplitStruct *cur= node;
|
|
SplitStruct *end= node + n_entries;
|
|
|
|
for (; cur < end; cur++)
|
|
{
|
|
if (cur->n_node)
|
|
{
|
|
continue;
|
|
}
|
|
cur->n_node= n_group;
|
|
}
|
|
}
|
|
|
|
static int split_maria_rtree_node(SplitStruct *node, int n_entries,
|
|
int all_size, /* Total key's size */
|
|
int key_size,
|
|
int min_size, /* Minimal group size */
|
|
int size1, int size2 /* initial group sizes */,
|
|
double **d_buffer, int n_dim)
|
|
{
|
|
SplitStruct *cur;
|
|
SplitStruct *a;
|
|
SplitStruct *b;
|
|
double *g1= reserve_coords(d_buffer, n_dim);
|
|
double *g2= reserve_coords(d_buffer, n_dim);
|
|
SplitStruct *next;
|
|
int next_node;
|
|
int i;
|
|
SplitStruct *end= node + n_entries;
|
|
LINT_INIT(a);
|
|
LINT_INIT(b);
|
|
LINT_INIT(next);
|
|
LINT_INIT(next_node);
|
|
|
|
if (all_size < min_size * 2)
|
|
{
|
|
return 1;
|
|
}
|
|
|
|
cur= node;
|
|
for (; cur < end; cur++)
|
|
{
|
|
cur->square= count_square(cur->coords, n_dim);
|
|
cur->n_node= 0;
|
|
}
|
|
|
|
pick_seeds(node, n_entries, &a, &b, n_dim);
|
|
a->n_node= 1;
|
|
b->n_node= 2;
|
|
|
|
|
|
copy_coords(g1, a->coords, n_dim);
|
|
size1+= key_size;
|
|
copy_coords(g2, b->coords, n_dim);
|
|
size2+= key_size;
|
|
|
|
|
|
for (i=n_entries - 2; i>0; --i)
|
|
{
|
|
if (all_size - (size2 + key_size) < min_size) /* Can't write into group 2 */
|
|
{
|
|
mark_all_entries(node, n_entries, 1);
|
|
break;
|
|
}
|
|
|
|
if (all_size - (size1 + key_size) < min_size) /* Can't write into group 1 */
|
|
{
|
|
mark_all_entries(node, n_entries, 2);
|
|
break;
|
|
}
|
|
|
|
pick_next(node, n_entries, g1, g2, &next, &next_node, n_dim);
|
|
if (next_node == 1)
|
|
{
|
|
size1+= key_size;
|
|
mbr_join(g1, next->coords, n_dim);
|
|
}
|
|
else
|
|
{
|
|
size2+= key_size;
|
|
mbr_join(g2, next->coords, n_dim);
|
|
}
|
|
next->n_node= next_node;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
int maria_rtree_split_page(MARIA_HA *info, const MARIA_KEYDEF *keyinfo,
|
|
uchar *page, const uchar *key,
|
|
uint key_length, my_off_t *new_page_offs)
|
|
{
|
|
MARIA_SHARE *share= info->s;
|
|
int n1, n2; /* Number of items in groups */
|
|
SplitStruct *task;
|
|
SplitStruct *cur;
|
|
SplitStruct *stop;
|
|
double *coord_buf;
|
|
double *next_coord;
|
|
double *old_coord;
|
|
int n_dim;
|
|
uchar *source_cur, *cur1, *cur2;
|
|
uchar *new_page;
|
|
int err_code= 0;
|
|
uint nod_flag= _ma_test_if_nod(share, page);
|
|
uint full_length= key_length + (nod_flag ? nod_flag :
|
|
share->base.rec_reflength);
|
|
int max_keys= ((_ma_get_page_used(share, page) - share->keypage_header) /
|
|
(full_length));
|
|
MARIA_PINNED_PAGE tmp_page_link, *page_link= &tmp_page_link;
|
|
DBUG_ENTER("maria_rtree_split_page");
|
|
DBUG_PRINT("rtree", ("splitting block"));
|
|
|
|
n_dim= keyinfo->keysegs / 2;
|
|
|
|
if (!(coord_buf= (double*) my_alloca(n_dim * 2 * sizeof(double) *
|
|
(max_keys + 1 + 4) +
|
|
sizeof(SplitStruct) * (max_keys + 1))))
|
|
DBUG_RETURN(-1); /* purecov: inspected */
|
|
|
|
task= (SplitStruct *)(coord_buf + n_dim * 2 * (max_keys + 1 + 4));
|
|
|
|
next_coord= coord_buf;
|
|
|
|
stop= task + max_keys;
|
|
source_cur= rt_PAGE_FIRST_KEY(share, page, nod_flag);
|
|
|
|
for (cur= task;
|
|
cur < stop;
|
|
cur++, source_cur= rt_PAGE_NEXT_KEY(share, source_cur, key_length,
|
|
nod_flag))
|
|
{
|
|
cur->coords= reserve_coords(&next_coord, n_dim);
|
|
cur->key= source_cur;
|
|
maria_rtree_d_mbr(keyinfo->seg, source_cur, key_length, cur->coords);
|
|
}
|
|
|
|
cur->coords= reserve_coords(&next_coord, n_dim);
|
|
maria_rtree_d_mbr(keyinfo->seg, key, key_length, cur->coords);
|
|
cur->key= key;
|
|
|
|
old_coord= next_coord;
|
|
|
|
if (split_maria_rtree_node(task, max_keys + 1,
|
|
_ma_get_page_used(share, page) + full_length + 2,
|
|
full_length,
|
|
rt_PAGE_MIN_SIZE(keyinfo->block_length),
|
|
2, 2, &next_coord, n_dim))
|
|
{
|
|
err_code= 1;
|
|
goto split_err;
|
|
}
|
|
|
|
if (!(new_page= (uchar*) my_alloca((uint)keyinfo->block_length)))
|
|
{
|
|
err_code= -1;
|
|
goto split_err;
|
|
}
|
|
bzero(new_page, share->block_size);
|
|
|
|
stop= task + (max_keys + 1);
|
|
cur1= rt_PAGE_FIRST_KEY(share, page, nod_flag);
|
|
cur2= rt_PAGE_FIRST_KEY(share, new_page, nod_flag);
|
|
|
|
n1= n2= 0;
|
|
for (cur= task; cur < stop; cur++)
|
|
{
|
|
uchar *to;
|
|
if (cur->n_node == 1)
|
|
{
|
|
to= cur1;
|
|
cur1= rt_PAGE_NEXT_KEY(share, cur1, key_length, nod_flag);
|
|
n1++;
|
|
}
|
|
else
|
|
{
|
|
to= cur2;
|
|
cur2= rt_PAGE_NEXT_KEY(share, cur2, key_length, nod_flag);
|
|
n2++;
|
|
}
|
|
if (to != cur->key)
|
|
memcpy(to - nod_flag, cur->key - nod_flag, full_length);
|
|
}
|
|
|
|
if (nod_flag)
|
|
_ma_store_keypage_flag(share, new_page, KEYPAGE_FLAG_ISNOD);
|
|
_ma_store_keynr(share, new_page, keyinfo->key_nr);
|
|
_ma_store_page_used(share, page, share->keypage_header + n1 * full_length)
|
|
_ma_store_page_used(share, new_page, share->keypage_header +
|
|
n2 * full_length);
|
|
|
|
if ((*new_page_offs= _ma_new(info, DFLT_INIT_HITS, &page_link)) ==
|
|
HA_OFFSET_ERROR)
|
|
err_code= -1;
|
|
else
|
|
err_code= _ma_write_keypage(info, keyinfo, *new_page_offs,
|
|
page_link->write_lock,
|
|
DFLT_INIT_HITS, new_page);
|
|
DBUG_PRINT("rtree", ("split new block: %lu", (ulong) *new_page_offs));
|
|
|
|
my_afree((uchar*)new_page);
|
|
|
|
split_err:
|
|
/**
|
|
@todo the cast below is useless (coord_buf is uchar*); at the moment we
|
|
changed all "byte" to "uchar", some casts became useless and should be
|
|
removed.
|
|
*/
|
|
my_afree((uchar*) coord_buf);
|
|
DBUG_RETURN(err_code);
|
|
}
|
|
|
|
#endif /*HAVE_RTREE_KEYS*/
|