mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 20:42:30 +01:00
2f6f08ed88
Changed info->s -> share to get more efficent code Updated arguments to page accessor functions to use MARIA_SHARE * instead of MARIA_HA *. Tested running tests in quick mode (no balance page on insert and only when critical on delete) Fixed bug in underflow handling in quick mode Fixed bug in log handler where it accessed not initialized variable Fixed bug in log handler where it didn't free mutex in unlikely error condition Removed double write of page in case of of some underflow conditions Added DBUG_PRINT in safemutex lock/unlock dbug/dbug.c: Compile without SAFE_MUTEX (to be able to use DBUG_PRINT in safe_mutex code) Use calls to get/set my_thread_var->dbug. (Make dbug independent of compile time options for mysys) include/my_pthread.h: Added prototypes for my_thread_var_get_dbug() & my_thread_var_set_dbug() mysql-test/lib/mtr_report.pl: Don't check warnings in log files if we are using --extern mysys/my_thr_init.c: Added my_thread_var_get_dbug() & my_thread_var_set_dbug() mysys/thr_mutex.c: Added DBUG printing of addresses to mutex for lock/unlock storage/maria/ma_blockrec.c: Fixed comment storage/maria/ma_check.c: Added MARIA_SHARE *share to a lot of places to make code simpler info->s -> share Updated arguments to page accessor functions storage/maria/ma_close.c: Indentation fixes storage/maria/ma_create.c: Calculate min_key_length correctly storage/maria/ma_dbug.c: Indentation fixes storage/maria/ma_delete.c: Added MARIA_SHARE *share to a lot of places to make code simpler info->s -> share Updated arguments to page accessor functions Removed some writing of key pages that underflow (will be written by caller) Fixed crashing bug in underflow handling when using quick mode storage/maria/ma_delete_all.c: Indentation fixes storage/maria/ma_dynrec.c: Indentation fixes storage/maria/ma_extra.c: Fixed indentation Removed old useless code Reset share->changed if we have written state storage/maria/ma_ft_update.c: Added MARIA_SHARE *share to a lot of places to make code simpler info->s -> share Updated arguments to page accessor functions storage/maria/ma_info.c: Indentation fixes storage/maria/ma_key_recover.c: Added MARIA_SHARE *share to a lot of places to make code simpler info->s -> share Updated arguments to page accessor functions storage/maria/ma_locking.c: Indentation fixes storage/maria/ma_loghandler.c: Removed wrapper functions translog_mutex_lock and translog_mutex_unlock (safemutex now does same kind of printing) Renamed LOGREC_REDO_INSERT_ROW_BLOB to LOGREC_REDO_INSERT_NOT_USED to mark it free Fixed some DBUG_PRINT to ensure that convert-dbug-for-diff works Fixed bug in translog_flush() that caused log to stop syncing to disk Added missing mutex_unlock in case of error storage/maria/ma_loghandler.h: Renamed LOGREC_REDO_INSERT_ROW_BLOB to LOGREC_REDO_INSERT_NOT_USED to mark it free storage/maria/ma_open.c: Indentation fixes storage/maria/ma_packrec.c: Indentation fixes storage/maria/ma_page.c: Added MARIA_SHARE *share to a lot of places to make code simpler info->s -> share Updated arguments to page accessor functions Added check that we never write a key page without content (except in recovery where a key page may temporary be without content) storage/maria/ma_preload.c: Updated arguments to page accessor functions storage/maria/ma_range.c: Updated arguments to page accessor functions storage/maria/ma_rkey.c: Indentation fixes storage/maria/ma_rprev.c: Indentation fixes storage/maria/ma_rt_index.c: Added MARIA_SHARE *share to a lot of places to make code simpler info->s -> share Updated arguments to page accessor functions storage/maria/ma_rt_index.h: Updated arguments to page accessor functions storage/maria/ma_rt_key.c: Added MARIA_SHARE *share to a lot of places to make code simpler info->s -> share Updated arguments to page accessor functions storage/maria/ma_rt_mbr.c: Added MARIA_SHARE *share to a lot of places to make code simpler info->s -> share Updated arguments to page accessor functions storage/maria/ma_rt_split.c: Added MARIA_SHARE *share to a lot of places to make code simpler info->s -> share Updated arguments to page accessor functions storage/maria/ma_search.c: Added MARIA_SHARE *share to a lot of places to make code simpler info->s -> share Updated arguments to page accessor functions storage/maria/ma_sort.c: Indentation fixes storage/maria/ma_statrec.c: Indentation fixes storage/maria/ma_test1.c: Added extra undo test Flush also keys in -u1, to ensure that the full log is flushed storage/maria/ma_test2.c: Added extra undo test Flush also keys in -u1, to ensure that the full log is flushed storage/maria/ma_test_recovery.expected: Updated results storage/maria/ma_test_recovery: Added extra undo test storage/maria/ma_update.c: Indentation fixes storage/maria/ma_write.c: Added MARIA_SHARE *share to a lot of places to make code simpler info->s -> share Updated arguments to page accessor functions Prepare for quick mode for insert (don't balance page) storage/maria/maria_chk.c: Added MARIA_SHARE *share to a lot of places to make code simpler info->s -> share Updated arguments to page accessor functions storage/maria/maria_def.h: Updated arguments to page accessor functions
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;
|
|
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, MARIA_KEYDEF *keyinfo,
|
|
uchar *page, 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;
|
|
}
|
|
|
|
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);
|
|
}
|
|
|
|
bzero(new_page, share->keypage_header);
|
|
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*/
|