mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 04:22:27 +01:00
52cb0c24a6
Store max_trid in index file as state.create_trid. This is used to pack all transids in the index pages relative to max possible transid for file. Enable versioning for transactional tables with index. Tables with an auto-increment key, rtree or fulltext keys are not versioned. Changed info->lastkey to type MARIA_KEY. Removed info->lastkey_length as this is now part of info->lastkey Renamed old info->lastkey to info->lastkey_buff Use exact key lenghts for keys, not USE_WHOLE_KEY For partial key searches, use SEARCH_PART_KEY When searching to insert new key on page, use SEARCH_INSERT to mark that key has rowid Changes done in a lot of files: - Modified functions to use MARIA_KEY instead of key pointer and key length - Use keyinfo->root_lock instead of share->key_root_lock[keynr] - Simplify code by using local variable keyinfo instead if share->keyinfo[i] - Added #fdef EXTERNAL_LOCKING around removed state elements - HA_MAX_KEY_BUFF -> MARIA_MAX_KEY_BUFF (to reserve space for transid) - Changed type of 'nextflag' to uint32 to ensure all SEARCH_xxx flags fits into it .bzrignore: Added missing temporary directory extra/Makefile.am: comp_err is now deleted on make distclean include/maria.h: Added structure MARIA_KEY, which is used for intern key objects in Maria. Changed functions to take MARIA_KEY as an argument instead of pointer to packed key. Changed some functions that always return true or false to my_bool. Added virtual function make_key() to avoid if in _ma_make_key() Moved rw_lock_t for locking trees from share->key_root_lock to MARIA_KEYDEF. This makes usage of the locks simpler and faster include/my_base.h: Added HA_RTREE_INDEX flag to mark rtree index. Used for easier checks in ma_check() Added SEARCH_INSERT to be used when inserting new keys Added SEARCH_PART_KEY for partial searches Added SEARCH_USER_KEY_HAS_TRANSID to be used when key we use for searching in btree has a TRANSID Added SEARCH_PAGE_KEY_HAS_TRANSID to be used when key we found in btree has a transid include/my_handler.h: Make next_flag 32 bit to make sure we can handle all SEARCH_ bits mysql-test/include/maria_empty_logs.inc: Read and restore current database; Don't assume we are using mysqltest. Don't log use databasename to log. Using this include should not cause any result changes. mysql-test/r/maria-gis-rtree-dynamic.result: Updated results after adding some check table commands to help pinpoint errors mysql-test/r/maria-mvcc.result: New tests mysql-test/r/maria-purge.result: New result after adding removal of logs mysql-test/r/maria-recovery-big.result: maria_empty_logs doesn't log 'use mysqltest' anymore mysql-test/r/maria-recovery-bitmap.result: maria_empty_logs doesn't log 'use mysqltest' anymore mysql-test/r/maria-recovery-rtree-ft.result: maria_empty_logs doesn't log 'use mysqltest' anymore mysql-test/r/maria-recovery.result: maria_empty_logs doesn't log 'use mysqltest' anymore mysql-test/r/maria.result: New tests mysql-test/r/variables-big.result: Don't log id as it's not predictable mysql-test/suite/rpl_ndb/r/rpl_truncate_7ndb_2.result: Updated results to new binlog results. (Test has not been run in a long time as it requires --big) mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2-master.opt: Moved file to ndb replication test directory mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2.test: Fixed wrong path to included tests mysql-test/t/maria-gis-rtree-dynamic.test: Added some check table commands to help pinpoint errors mysql-test/t/maria-mvcc.test: New tests mysql-test/t/maria-purge.test: Remove logs to make test results predictable mysql-test/t/maria.test: New tests for some possible problems mysql-test/t/variables-big.test: Don't log id as it's not predictable mysys/my_handler.c: Updated function comment to reflect old code Changed nextflag to be uint32 to ensure we can have flags > 16 bit Changed checking if we are in insert with NULL keys as next_flag can now include additional bits that have to be ignored. Added SEARCH_INSERT flag to be used when inserting new keys in btree. This flag tells us the that the keys includes row position and it's thus safe to remove SEARCH_FIND Added comparision of transid. This is only done if the keys actually have a transid, which is indicated by nextflag mysys/my_lock.c: Fixed wrong test (Found by Guilhem) scripts/Makefile.am: Ensure that test programs are deleted by make clean sql/rpl_rli.cc: Moved assignment order to fix compiler warning storage/heap/hp_write.c: Add SEARCH_INSERT to signal ha_key_cmp that we we should also compare rowid for keys storage/maria/Makefile.am: Remove also maria log files when doing make distclean storage/maria/ha_maria.cc: Use 'file->start_state' as default state for transactional tables without versioning At table unlock, set file->state to point to live state. (Needed for information schema to pick up right number of rows) In ha_maria::implicit_commit() move all locked (ie open) tables to new transaction. This is needed to ensure ha_maria->info doesn't point to a deleted history event. Disable concurrent inserts for insert ... select and table changes with subqueries if statement based replication as this would cause wrong results on slave storage/maria/ma_blockrec.c: Updated comment storage/maria/ma_check.c: Compact key pages (removes transid) when doing --zerofill Check that 'page_flag' on key pages contains KEYPAGE_FLAG_HAS_TRANSID if there is a single key on the page with a transid Modified functions to use MARIA_KEY instead of key pointer and key length Use new interface to _ma_rec_pos(), _ma_dpointer(), _ma_ft_del(), ma_update_state_lsn() Removed not needed argument from get_record_for_key() Fixed that we check doesn't give errors for RTREE; We now treath these like SPATIAL Remove some SPATIAL specific code where the virtual functions can handle this in a general manner Use info->lastkey_buff instead of info->lastkey _ma_dpos() -> _ma_row_pos_from_key() _ma_make_key() -> keyinfo->make_key() _ma_print_key() -> _ma_print_keydata() _ma_move_key() -> ma_copy_copy() Add SEARCH_INSERT to signal ha_key_cmp that we we should also compare rowid for keys Ensure that data on page doesn't overwrite page checksum position Use DBUG_DUMP_KEY instead of DBUG_DUMP Use exact key lengths instead of USE_WHOLE_KEY to ha_key_cmp() Fixed check if rowid points outside of BLOCK_RECORD data file Use info->lastkey_buff instead of key on stack in some safe places Added #fdef EXTERNAL_LOCKING around removed state elements storage/maria/ma_close.c: Use keyinfo->root_lock instead of share->key_root_lock[keynr] storage/maria/ma_create.c: Removed assert that is already checked in maria_init() Force transactinal tables to be of type BLOCK_RECORD Fixed wrong usage of HA_PACK_RECORD (should be HA_OPTION_PACK_RECORD) Mark keys that uses HA_KEY_ALG_RTREE with HA_RTREE_INDEX for easier handling of these in ma_check Store max_trid in index file as state.create_trid. This is used to pack all transids in the index pages relative to max possible transid for file. storage/maria/ma_dbug.c: Changed _ma_print_key() to use MARIA_KEY storage/maria/ma_delete.c: Modified functions to use MARIA_KEY instead of key pointer and key length info->lastkey2-> info->lastkey_buff2 Added SEARCH_INSERT to signal ha_key_cmp that we we should also compare rowid for keys Use new interface for get_key(), _ma_get_last_key() and others _ma_dpos() -> ma_row_pos_from_key() Simplify setting of prev_key in del() Ensure that KEYPAGE_FLAG_HAS_TRANSID is set in page_flag if key page has transid Treath key pages that may have a transid as if keys would be of variable length storage/maria/ma_delete_all.c: Reset history state if maria_delete_all_rows() are called Update parameters to _ma_update_state_lsns() call storage/maria/ma_extra.c: Store and restore info->lastkey storage/maria/ma_ft_boolean_search.c: Modified functions to use MARIA_KEY instead of key pointer and key length storage/maria/ma_ft_nlq_search.c: Modified functions to use MARIA_KEY instead of key pointer and key length Use lastkey_buff2 instead of info->lastkey+info->s->base.max_key_length (same thing) storage/maria/ma_ft_update.c: Modified functions to use MARIA_KEY instead of key pointer and key length storage/maria/ma_ftdefs.h: Modified functions to use MARIA_KEY instead of key pointer and key length storage/maria/ma_fulltext.h: Modified functions to use MARIA_KEY instead of key pointer and key length storage/maria/ma_init.c: Check if blocksize is legal (Moved test here from ma_open()) storage/maria/ma_key.c: Added functions for storing/reading of transid Modified functions to use MARIA_KEY instead of key pointer and key length Moved _ma_sp_make_key() out of _ma_make_key() as we now use keyinfo->make_key to create keys Add transid to keys if table is versioned Added _ma_copy_key() storage/maria/ma_key_recover.c: Add logging of page_flag (holds information if there are keys with transid on page) Changed DBUG_PRINT("info" -> DBUG_PRINT("redo" as the redo logging can be quite extensive Added lots of DBUG_PRINT() Added support for index page operations: KEY_OP_SET_PAGEFLAG and KEY_OP_COMPACT_PAGE storage/maria/ma_key_recover.h: Modified functions to use MARIA_KEY instead of key pointer and key length storage/maria/ma_locking.c: Added new arguments to _ma_update_state_lsns_sub() storage/maria/ma_loghandler.c: Fixed all logging of LSN to look similar in DBUG log Changed if (left != 0) to if (left) as the later is used also later in the code storage/maria/ma_loghandler.h: Added new index page operations storage/maria/ma_open.c: Removed allocated "state_dummy" and instead use share->state.common for transactional tables that are not versioned This is needed to not get double increments of state.records (one in ma_write.c and on when log is written) Changed info->lastkey to MARIA_KEY type Removed resetting of MARIA_HA variables that have 0 as default value (as info is zerofilled) Enable versioning for transactional tables with index. Tables with an auto-increment key, rtree or fulltext keys are not versioned. Check on open that state.create_trid is correct Extend share->base.max_key_length in case of transactional table so that it can hold transid Removed 4.0 compatible fulltext key mode as this is not relevant for Maria Removed old and wrong #ifdef ENABLE_WHEN_WE_HAVE_TRANS_ROW_ID code block Initialize all new virtual function pointers Removed storing of state->unique, state->process and store state->create_trid instead storage/maria/ma_page.c: Added comment to describe key page structure Added functions to compact key page and log the compact operation storage/maria/ma_range.c: Modified functions to use MARIA_KEY instead of key pointer and key length Use SEARCH_PART_KEY indicator instead of USE_WHOLE_KEY to detect if we are doing a part key search Added handling of pages with transid storage/maria/ma_recovery.c: Don't assert if table we opened are not transactional. This may be a table which has been changed from transactional to not transactinal Added new arguments to _ma_update_state_lsns() storage/maria/ma_rename.c: Added new arguments to _ma_update_state_lsns() storage/maria/ma_rkey.c: Modified functions to use MARIA_KEY instead of key pointer and key length Don't use USE_WHOLE_KEY, use real length of key Use share->row_is_visible() to test if row is visible Moved search_flag == HA_READ_KEY_EXACT out of 'read-next-row' loop as this only need to be tested once Removed test if last_used_keyseg != 0 as this is always true storage/maria/ma_rnext.c: Modified functions to use MARIA_KEY instead of key pointer and key length Simplify code by using local variable keyinfo instead if share->keyinfo[i] Use share->row_is_visible() to test if row is visible storage/maria/ma_rnext_same.c: Modified functions to use MARIA_KEY instead of key pointer and key length lastkey2 -> lastkey_buff2 storage/maria/ma_rprev.c: Modified functions to use MARIA_KEY instead of key pointer and key length Simplify code by using local variable keyinfo instead if share->keyinfo[i] Use share->row_is_visible() to test if row is visible storage/maria/ma_rsame.c: Updated comment Simplify code by using local variable keyinfo instead if share->keyinfo[i] Modified functions to use MARIA_KEY instead of key pointer and key length storage/maria/ma_rsamepos.c: Modified functions to use MARIA_KEY instead of key pointer and key length storage/maria/ma_rt_index.c: Modified functions to use MARIA_KEY instead of key pointer and key length Use better variable names Removed not needed casts _ma_dpos() -> _ma_row_pos_from_key() Use info->last_rtree_keypos to save position to key instead of info->int_keypos Simplify err: condition Changed return type for maria_rtree_insert() to my_bool as we are only intressed in ok/fail from this function storage/maria/ma_rt_index.h: Modified functions to use MARIA_KEY instead of key pointer and key length storage/maria/ma_rt_key.c: Modified functions to use MARIA_KEY instead of key pointer and key length Simplify maria_rtree_add_key by combining idenitcal code and removing added_len storage/maria/ma_rt_key.h: Modified functions to use MARIA_KEY instead of key pointer and key length storage/maria/ma_rt_mbr.c: Changed type of 'nextflag' to uint32 Added 'to' argument to RT_PAGE_MBR_XXX functions to more clearly see which variables changes value storage/maria/ma_rt_mbr.h: Changed type of 'nextflag' to uint32 storage/maria/ma_rt_split.c: Modified functions to use MARIA_KEY instead of key pointer and key length key_length -> key_data_length to catch possible errors storage/maria/ma_rt_test.c: Fixed wrong comment Reset recinfo to avoid valgrind varnings Fixed wrong argument to create_record() that caused test to fail storage/maria/ma_search.c: Modified functions to use MARIA_KEY instead of key pointer and key length Added support of keys with optional trid Test for SEARCH_PART_KEY instead of USE_WHOLE_KEY to detect part key reads _ma_dpos() -> _ma_row_pos_from_key() If there may be keys with transid on the page, have _ma_bin_search() call _ma_seq_search() Add _ma_skip_xxx() functions to quickly step over keys (faster than calling get_key() in most cases as we don't have to copy key data) Combine similar code at end of _ma_get_binary_pack_key() Removed not used function _ma_move_key() In _ma_search_next() don't call _ma_search() if we aren't on a nod page. Update info->cur_row.trid with trid for found key Removed some not needed casts Added _ma_trid_from_key() Use MARIA_SHARE instead of MARIA_HA as arguments to _ma_rec_pos(), _ma_dpointer() and _ma_xxx_keypos_to_recpos() to make functions faster and smaller storage/maria/ma_sort.c: Modified functions to use MARIA_KEY instead of key pointer and key length storage/maria/ma_sp_defs.h: _ma_sp_make_key() now fills in and returns (MARIA_KEY *) value storage/maria/ma_sp_key.c: _ma_sp_make_key() now fills in and returns (MARIA_KEY *) value Don't test sizeof(double), test against 8 as we are using float8store() Use mi_float8store() instead of doing swap of value (same thing but faster) storage/maria/ma_state.c: maria_versioning() now only calls _ma_block_get_status() if table supports versioning Added _ma_row_visible_xxx() functions for different occasions When emptying history, set info->state to point to the first history event. storage/maria/ma_state.h: Added _ma_row_visible_xxx() prototypes storage/maria/ma_static.c: Indentation changes storage/maria/ma_statrec.c: Fixed arguments to _ma_dpointer() and _ma_rec_pos() storage/maria/ma_test1.c: Call init_thr_lock() if we have versioning storage/maria/ma_test2.c: Call init_thr_lock() if we have versioning storage/maria/ma_unique.c: Modified functions to use MARIA_KEY storage/maria/ma_update.c: Modified functions to use MARIA_KEY instead of key pointer and key length storage/maria/ma_write.c: Modified functions to use MARIA_KEY instead of key pointer and key length Simplify code by using local variable keyinfo instead if share->keyinfo[i] In _ma_enlarge_root(), mark in page_flag if new key has transid _ma_dpos() -> _ma_row_pos_from_key() Changed return type of _ma_ck_write_tree() to my_bool as we are only testing if result is true or not Moved 'reversed' to outside block as area was used later storage/maria/maria_chk.c: Added error if trying to sort with HA_BINARY_PACK_KEY Use new interface to get_key() and _ma_dpointer() _ma_dpos() -> _ma_row_pos_from_key() storage/maria/maria_def.h: Modified functions to use MARIA_KEY instead of key pointer and key length Added 'common' to MARIA_SHARE->state for storing state for transactional tables without versioning Added create_trid to MARIA_SHARE Removed not used state variables 'process' and 'unique' Added defines for handling TRID's in index pages Changed to use MARIA_SHARE instead of MARIA_HA for some functions Added 'have_versioning' flag if table supports versioning Moved key_root_lock from MARIA_SHARE to MARIA_KEYDEF Changed last_key to be of type MARIA_KEY. Removed lastkey_length lastkey -> lastkey_buff, lastkey2 -> lastkey_buff2 Added _ma_get_used_and_nod_with_flag() for faster access to page data when page_flag is read Added DBUG_DUMP_KEY for easier DBUG_DUMP of a key Changed 'nextflag' and assocaited variables to uint32 storage/maria/maria_ftdump.c: lastkey -> lastkey_buff storage/maria/trnman.c: Fixed wrong initialization of min_read_from and max_commit_trid Added trnman_get_min_safe_trid() storage/maria/unittest/ma_test_all-t: Added --start-from storage/myisam/mi_check.c: Added SEARCH_INSERT, as ha_key_cmp() needs it when doing key comparision for inserting key on page in rowid order storage/myisam/mi_delete.c: Added SEARCH_INSERT, as ha_key_cmp() needs it when doing key comparision for inserting key on page in rowid order storage/myisam/mi_range.c: Updated comment storage/myisam/mi_write.c: Added SEARCH_INSERT, as ha_key_cmp() needs it when doing key comparision for inserting key on page in rowid order storage/myisam/rt_index.c: Fixed wrong parameter to rtree_get_req() which could cause crash
563 lines
17 KiB
C
563 lines
17 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"
|
|
#include "trnman.h"
|
|
#include "ma_key_recover.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.
|
|
|
|
Note that such function uses 'double' arithmetic so may behave differently
|
|
on different platforms/builds. There are others in this file.
|
|
*/
|
|
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;
|
|
}
|
|
|
|
|
|
/**
|
|
Logs key reorganization done in a split page (new page is logged elsewhere).
|
|
|
|
The effect of a split on the split page is three changes:
|
|
- some piece of the page move to different places inside this page (we are
|
|
not interested here in the pieces which move to the new page)
|
|
- the key is inserted into the page or not (could be in the new page)
|
|
- page is shrunk
|
|
All this is uniquely determined by a few parameters:
|
|
- the key (starting at 'key-nod_flag', for 'full_length' bytes
|
|
(maria_rtree_split_page() seems to depend on its parameters key&key_length
|
|
but in fact it reads more (to the left: nod_flag, and to the right:
|
|
full_length)
|
|
- the binary content of the page
|
|
- some variables in the share
|
|
- double arithmetic, which is unpredictable from machine to machine and
|
|
from build to build (see pick_seeds() above: it has a comparison between
|
|
double-s 'if (d > max_d)' so the comparison can go differently from machine
|
|
to machine or build to build, it has happened in real life).
|
|
If one day we use precision-math instead of double-math, in GIS, then the
|
|
last parameter would become constant accross machines and builds and we
|
|
could some cheap logging: just log the few parameters above.
|
|
Until then, we log the list of memcpy() operations (fortunately, we often do
|
|
not have to log the source bytes, as they can be found in the page before
|
|
applying the REDO; the only source bytes to log are the key), the key if it
|
|
was inserted into this page, and the shrinking.
|
|
|
|
@param info table
|
|
@param page page's offset in the file
|
|
@param buff content of the page (post-split)
|
|
@param key_with_nod_flag pointer to key-nod_flag
|
|
@param full_length length of (key + (nod_flag (if node) or rowid (if
|
|
leaf)))
|
|
@param log_internal_copy encoded list of mempcy() operations done on
|
|
split page, having their source in the page
|
|
@param log_internal_copy_length length of above list, in bytes
|
|
@param log_key_copy operation describing the key's copy, or NULL if the
|
|
inserted key was not put into the page (was put in
|
|
new page, so does not have to be logged here)
|
|
@param length_diff by how much the page has shrunk during split
|
|
*/
|
|
|
|
static my_bool _ma_log_rt_split(MARIA_HA *info,
|
|
my_off_t page,
|
|
const uchar *buff __attribute__((unused)),
|
|
const uchar *key_with_nod_flag,
|
|
uint full_length,
|
|
const uchar *log_internal_copy,
|
|
uint log_internal_copy_length,
|
|
const uchar *log_key_copy,
|
|
uint length_diff)
|
|
{
|
|
MARIA_SHARE *share= info->s;
|
|
LSN lsn;
|
|
uchar log_data[FILEID_STORE_SIZE + PAGE_STORE_SIZE + 1 + 2 + 1 + 2 + 2 + 7],
|
|
*log_pos;
|
|
LEX_CUSTRING log_array[TRANSLOG_INTERNAL_PARTS + 5];
|
|
uint translog_parts, extra_length= 0;
|
|
DBUG_ENTER("_ma_log_rt_split");
|
|
DBUG_PRINT("enter", ("page: %lu", (ulong) page));
|
|
|
|
DBUG_ASSERT(share->now_transactional);
|
|
page/= share->block_size;
|
|
page_store(log_data + FILEID_STORE_SIZE, page);
|
|
log_pos= log_data+ FILEID_STORE_SIZE + PAGE_STORE_SIZE;
|
|
log_pos[0]= KEY_OP_DEL_SUFFIX;
|
|
log_pos++;
|
|
DBUG_ASSERT((int)length_diff > 0);
|
|
int2store(log_pos, length_diff);
|
|
log_pos+= 2;
|
|
log_pos[0]= KEY_OP_MULTI_COPY;
|
|
log_pos++;
|
|
int2store(log_pos, full_length);
|
|
log_pos+= 2;
|
|
int2store(log_pos, log_internal_copy_length);
|
|
log_pos+= 2;
|
|
log_array[TRANSLOG_INTERNAL_PARTS + 0].str= log_data;
|
|
log_array[TRANSLOG_INTERNAL_PARTS + 0].length= sizeof(log_data) - 7;
|
|
log_array[TRANSLOG_INTERNAL_PARTS + 1].str= log_internal_copy;
|
|
log_array[TRANSLOG_INTERNAL_PARTS + 1].length= log_internal_copy_length;
|
|
translog_parts= 2;
|
|
if (log_key_copy != NULL) /* need to store key into record */
|
|
{
|
|
log_array[TRANSLOG_INTERNAL_PARTS + 2].str= log_key_copy;
|
|
log_array[TRANSLOG_INTERNAL_PARTS + 2].length= 1 + 2 + 1 + 2;
|
|
log_array[TRANSLOG_INTERNAL_PARTS + 3].str= key_with_nod_flag;
|
|
log_array[TRANSLOG_INTERNAL_PARTS + 3].length= full_length;
|
|
extra_length= 1 + 2 + 1 + 2 + full_length;
|
|
translog_parts+= 2;
|
|
}
|
|
|
|
#ifdef EXTRA_DEBUG_KEY_CHANGES
|
|
{
|
|
int page_length= _ma_get_page_used(share, buff);
|
|
ha_checksum crc;
|
|
uchar *check_start= log_pos;
|
|
crc= my_checksum(0, buff + LSN_STORE_SIZE, page_length - LSN_STORE_SIZE);
|
|
log_pos[0]= KEY_OP_CHECK;
|
|
log_pos++;
|
|
int2store(log_pos, page_length);
|
|
log_pos+= 2;
|
|
int4store(log_pos, crc);
|
|
log_pos+= 4;
|
|
log_array[TRANSLOG_INTERNAL_PARTS + translog_parts].str= check_start;
|
|
log_array[TRANSLOG_INTERNAL_PARTS + translog_parts].length= 7;
|
|
translog_parts++;
|
|
}
|
|
#endif
|
|
|
|
if (translog_write_record(&lsn, LOGREC_REDO_INDEX,
|
|
info->trn, info,
|
|
(translog_size_t) ((log_pos - log_data) +
|
|
log_internal_copy_length +
|
|
extra_length),
|
|
TRANSLOG_INTERNAL_PARTS + translog_parts,
|
|
log_array, log_data, NULL))
|
|
DBUG_RETURN(1);
|
|
DBUG_RETURN(0);
|
|
}
|
|
|
|
/**
|
|
0 ok; the created page is put into page cache; the shortened one is not (up
|
|
to the caller to do it)
|
|
1 or -1: error.
|
|
If new_page_offs==NULL, won't create new page (for redo phase).
|
|
*/
|
|
|
|
int maria_rtree_split_page(MARIA_HA *info, const MARIA_KEY *key,
|
|
my_off_t page_offs, uchar *page,
|
|
my_off_t *new_page_offs)
|
|
{
|
|
MARIA_SHARE *share= info->s;
|
|
const my_bool transactional= share->now_transactional;
|
|
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, *log_internal_copy, *log_internal_copy_ptr,
|
|
*log_key_copy= NULL;
|
|
int err_code= 0;
|
|
uint nod_flag= _ma_test_if_nod(share, page);
|
|
uint org_length= _ma_get_page_used(share, page), new_length;
|
|
uint full_length= key->data_length + (nod_flag ? nod_flag :
|
|
key->ref_length);
|
|
uint key_data_length= key->data_length;
|
|
int max_keys= ((org_length - share->keypage_header) / (full_length));
|
|
MARIA_PINNED_PAGE tmp_page_link, *page_link= &tmp_page_link;
|
|
MARIA_KEYDEF *keyinfo= key->keyinfo;
|
|
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_data_length,
|
|
nod_flag))
|
|
{
|
|
cur->coords= reserve_coords(&next_coord, n_dim);
|
|
cur->key= source_cur;
|
|
maria_rtree_d_mbr(keyinfo->seg, source_cur, key_data_length, cur->coords);
|
|
}
|
|
|
|
cur->coords= reserve_coords(&next_coord, n_dim);
|
|
maria_rtree_d_mbr(keyinfo->seg, key->data, key_data_length, cur->coords);
|
|
cur->key= key->data;
|
|
|
|
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;
|
|
}
|
|
|
|
/* Allocate buffer for new page and piece of log record */
|
|
if (!(new_page= (uchar*) my_alloca((uint)keyinfo->block_length +
|
|
(transactional ?
|
|
(max_keys * (2 + 2) +
|
|
1 + 2 + 1 + 2) : 0))))
|
|
{
|
|
err_code= -1;
|
|
goto split_err;
|
|
}
|
|
log_internal_copy= log_internal_copy_ptr= new_page + keyinfo->block_length;
|
|
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;
|
|
const uchar *cur_key= cur->key;
|
|
my_bool log_this_change;
|
|
DBUG_ASSERT(log_key_copy == NULL);
|
|
if (cur->n_node == 1)
|
|
{
|
|
to= cur1;
|
|
cur1= rt_PAGE_NEXT_KEY(share, cur1, key_data_length, nod_flag);
|
|
n1++;
|
|
log_this_change= transactional;
|
|
}
|
|
else
|
|
{
|
|
to= cur2;
|
|
cur2= rt_PAGE_NEXT_KEY(share, cur2, key_data_length, nod_flag);
|
|
n2++;
|
|
log_this_change= FALSE;
|
|
}
|
|
if (to != cur_key)
|
|
{
|
|
uchar *to_with_nod_flag= to - nod_flag;
|
|
const uchar *cur_key_with_nod_flag= cur_key - nod_flag;
|
|
memcpy(to_with_nod_flag, cur_key_with_nod_flag, full_length);
|
|
if (log_this_change)
|
|
{
|
|
uint to_with_nod_flag_offs= to_with_nod_flag - page;
|
|
if (likely(cur_key != key->data))
|
|
{
|
|
/* this memcpy() is internal to the page (source in the page) */
|
|
uint cur_key_with_nod_flag_offs= cur_key_with_nod_flag - page;
|
|
int2store(log_internal_copy_ptr, to_with_nod_flag_offs);
|
|
log_internal_copy_ptr+= 2;
|
|
int2store(log_internal_copy_ptr, cur_key_with_nod_flag_offs);
|
|
log_internal_copy_ptr+= 2;
|
|
}
|
|
else
|
|
{
|
|
/* last iteration, and this involves *key: source is external */
|
|
log_key_copy= log_internal_copy_ptr;
|
|
log_key_copy[0]= KEY_OP_OFFSET;
|
|
int2store(log_key_copy + 1, to_with_nod_flag_offs);
|
|
log_key_copy[3]= KEY_OP_CHANGE;
|
|
int2store(log_key_copy + 4, full_length);
|
|
/* _ma_log_rt_split() will store *key, right after */
|
|
}
|
|
}
|
|
}
|
|
}
|
|
{ /* verify that above loop didn't touch header bytes */
|
|
uint i;
|
|
for (i= 0; i < share->keypage_header; i++)
|
|
DBUG_ASSERT(new_page[i]==0);
|
|
}
|
|
|
|
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, new_page, share->keypage_header +
|
|
n2 * full_length);
|
|
new_length= share->keypage_header + n1 * full_length;
|
|
_ma_store_page_used(share, page, new_length);
|
|
|
|
if ((*new_page_offs= _ma_new(info, DFLT_INIT_HITS, &page_link)) ==
|
|
HA_OFFSET_ERROR)
|
|
err_code= -1;
|
|
else
|
|
{
|
|
if (transactional &&
|
|
( /* log change to split page */
|
|
_ma_log_rt_split(info, page_offs, page, key->data - nod_flag,
|
|
full_length, log_internal_copy,
|
|
log_internal_copy_ptr - log_internal_copy,
|
|
log_key_copy, org_length - new_length) ||
|
|
/* and to new page */
|
|
_ma_log_new(info, *new_page_offs, new_page,
|
|
share->keypage_header + n2 * full_length,
|
|
keyinfo->key_nr, 0)))
|
|
err_code= -1;
|
|
if ( _ma_write_keypage(info, keyinfo, *new_page_offs,
|
|
page_link->write_lock,
|
|
DFLT_INIT_HITS, new_page))
|
|
err_code= -1;
|
|
}
|
|
DBUG_PRINT("rtree", ("split new block: %lu", (ulong) *new_page_offs));
|
|
|
|
my_afree(new_page);
|
|
|
|
split_err:
|
|
my_afree(coord_buf);
|
|
DBUG_RETURN(err_code);
|
|
}
|
|
|
|
#endif /*HAVE_RTREE_KEYS*/
|