2006-04-11 16:45:10 +03:00
|
|
|
/* 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
|
2007-03-02 11:20:23 +01:00
|
|
|
the Free Software Foundation; version 2 of the License.
|
2006-04-11 16:45:10 +03:00
|
|
|
|
|
|
|
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 */
|
|
|
|
|
|
|
|
/* Functions to handle keys */
|
|
|
|
|
|
|
|
#include "maria_def.h"
|
|
|
|
#include "m_ctype.h"
|
|
|
|
#include "ma_sp_defs.h"
|
|
|
|
#ifdef HAVE_IEEEFP_H
|
|
|
|
#include <ieeefp.h>
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#define CHECK_KEYS /* Enable safety checks */
|
|
|
|
|
|
|
|
#define FIX_LENGTH(cs, pos, length, char_length) \
|
|
|
|
do { \
|
|
|
|
if (length > char_length) \
|
2008-01-13 00:30:38 +02:00
|
|
|
char_length= (uint) my_charpos(cs, pos, pos+length, char_length); \
|
2006-04-11 16:45:10 +03:00
|
|
|
set_if_smaller(char_length,length); \
|
|
|
|
} while(0)
|
|
|
|
|
2007-07-02 20:45:15 +03:00
|
|
|
static int _ma_put_key_in_record(MARIA_HA *info,uint keynr,uchar *record);
|
2006-04-11 16:45:10 +03:00
|
|
|
|
|
|
|
/*
|
|
|
|
Make a intern key from a record
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
_ma_make_key()
|
|
|
|
info MyiSAM handler
|
|
|
|
keynr key number
|
|
|
|
key Store created key here
|
|
|
|
record Record
|
|
|
|
filepos Position to record in the data file
|
|
|
|
|
|
|
|
RETURN
|
|
|
|
Length of key
|
|
|
|
*/
|
|
|
|
|
2007-07-02 20:45:15 +03:00
|
|
|
uint _ma_make_key(register MARIA_HA *info, uint keynr, uchar *key,
|
|
|
|
const uchar *record, MARIA_RECORD_POS filepos)
|
2006-04-11 16:45:10 +03:00
|
|
|
{
|
2007-07-02 20:45:15 +03:00
|
|
|
const uchar *pos;
|
|
|
|
uchar *start;
|
2006-04-11 16:45:10 +03:00
|
|
|
reg1 HA_KEYSEG *keyseg;
|
|
|
|
my_bool is_ft= info->s->keyinfo[keynr].flag & HA_FULLTEXT;
|
|
|
|
DBUG_ENTER("_ma_make_key");
|
|
|
|
|
|
|
|
if (info->s->keyinfo[keynr].flag & HA_SPATIAL)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
TODO: nulls processing
|
|
|
|
*/
|
|
|
|
#ifdef HAVE_SPATIAL
|
2007-01-26 13:32:02 +02:00
|
|
|
DBUG_RETURN(_ma_sp_make_key(info,keynr, key,record,filepos));
|
2006-04-11 16:45:10 +03:00
|
|
|
#else
|
|
|
|
DBUG_ASSERT(0); /* maria_open should check that this never happens*/
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
start=key;
|
|
|
|
for (keyseg=info->s->keyinfo[keynr].seg ; keyseg->type ;keyseg++)
|
|
|
|
{
|
|
|
|
enum ha_base_keytype type=(enum ha_base_keytype) keyseg->type;
|
|
|
|
uint length=keyseg->length;
|
|
|
|
uint char_length;
|
|
|
|
CHARSET_INFO *cs=keyseg->charset;
|
|
|
|
|
|
|
|
if (keyseg->null_bit)
|
|
|
|
{
|
|
|
|
if (record[keyseg->null_pos] & keyseg->null_bit)
|
|
|
|
{
|
|
|
|
*key++= 0; /* NULL in key */
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
*key++=1; /* Not NULL */
|
|
|
|
}
|
|
|
|
|
|
|
|
char_length= ((!is_ft && cs && cs->mbmaxlen > 1) ? length/cs->mbmaxlen :
|
|
|
|
length);
|
|
|
|
|
2007-01-18 21:38:14 +02:00
|
|
|
pos= record+keyseg->start;
|
2006-04-11 16:45:10 +03:00
|
|
|
if (type == HA_KEYTYPE_BIT)
|
|
|
|
{
|
|
|
|
if (keyseg->bit_length)
|
|
|
|
{
|
Injecting more "const" declarations into code which does not change
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
2008-04-03 15:40:25 +02:00
|
|
|
uchar bits= get_rec_bits(record + keyseg->bit_pos,
|
2006-04-11 16:45:10 +03:00
|
|
|
keyseg->bit_start, keyseg->bit_length);
|
2007-01-18 21:38:14 +02:00
|
|
|
*key++= (char) bits;
|
2006-04-11 16:45:10 +03:00
|
|
|
length--;
|
|
|
|
}
|
2007-01-18 21:38:14 +02:00
|
|
|
memcpy(key, pos, length);
|
2006-04-11 16:45:10 +03:00
|
|
|
key+= length;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (keyseg->flag & HA_SPACE_PACK)
|
|
|
|
{
|
|
|
|
if (type != HA_KEYTYPE_NUM)
|
|
|
|
{
|
Injecting more "const" declarations into code which does not change
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
2008-04-03 15:40:25 +02:00
|
|
|
length= (uint) cs->cset->lengthsp(cs, (const char*)pos, length);
|
2006-04-11 16:45:10 +03:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2007-07-02 20:45:15 +03:00
|
|
|
const uchar *end= pos + length;
|
2006-04-11 16:45:10 +03:00
|
|
|
while (pos < end && pos[0] == ' ')
|
|
|
|
pos++;
|
2007-01-26 13:32:02 +02:00
|
|
|
length= (uint) (end-pos);
|
2006-04-11 16:45:10 +03:00
|
|
|
}
|
|
|
|
FIX_LENGTH(cs, pos, length, char_length);
|
|
|
|
store_key_length_inc(key,char_length);
|
2007-01-18 21:38:14 +02:00
|
|
|
memcpy(key, pos, (size_t) char_length);
|
2006-04-11 16:45:10 +03:00
|
|
|
key+=char_length;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (keyseg->flag & HA_VAR_LENGTH_PART)
|
|
|
|
{
|
Completion of merge of mysql-5.1 into mysql-maria.
Manually imported changes done to MyISAM (include/myisam.h,
storage/myisam/*, sql/ha_myisam.*, mysql-test/t/myisam.test,
mysql-test/t/ps_2myisam.test) the last
months into Maria (tedious, should do it more frequently in the
future), including those not done at the previous 5.1->Maria merge
(please in the future don't forget to apply MyISAM changes to Maria
when you merge 5.1 into Maria).
Note: I didn't try to import anything which could be MyISAM-related
in other tests of mysql-test (I didn't want to dig in all csets),
but as QA is working to make most tests re-usable for other engines
(Falcon), it is likely that we'll benefit from this and just have
to set engine=Maria somewhere to run those tests on Maria.
func_group and partition tests fail but they already do in main 5.1
on my machine. No Valgrind error in t/*maria*.test.
Monty: please see the commit comment of maria.result and check.
BitKeeper/deleted/.del-ha_maria.m4:
Delete: config/ac-macros/ha_maria.m4
configure.in:
fix for the new way of enabling engines
include/maria.h:
importing changes done to MyISAM the last months into Maria
include/my_handler.h:
importing changes done to MyISAM the last months into Maria
include/myisam.h:
importing changes done to MyISAM the last months into Maria
mysql-test/r/maria.result:
identical to myisam.result, except the engine name in some places
AND in the line testing key_block_size=1000000000000000000:
Maria gives a key block size of 8192 while MyISAM gives 4096;
is it explainable by the difference between MARIA_KEY_BLOCK_LENGTH
and the same constant in MyISAM? Monty?
mysql-test/r/ps_maria.result:
identical to ps_2myisam.result (except the engine name in some places)
mysql-test/t/maria.test:
instead of engine=maria everywhere, I use @@storage_engine (reduces
the diff with myisam.test).
importing changes done to MyISAM the last months into Maria
mysys/my_handler.c:
importing changes done to MyISAM the last months into Maria
sql/ha_maria.cc:
importing changes done to MyISAM the last months into Maria
sql/ha_maria.h:
importing changes done to MyISAM the last months into Maria
sql/mysqld.cc:
unneeded
storage/maria/Makefile.am:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_check.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_create.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_delete_table.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_dynrec.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_extra.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_ft_boolean_search.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_ft_eval.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_ft_nlq_search.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_ft_parser.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_ft_test1.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_ft_update.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_ftdefs.h:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_key.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_open.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_page.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_rkey.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_rsamepos.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_rt_index.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_rt_mbr.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_search.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_sort.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_test1.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_test2.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_test3.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_update.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_write.c:
importing changes done to MyISAM the last months into Maria
storage/maria/maria_chk.c:
importing changes done to MyISAM the last months into Maria
storage/maria/maria_def.h:
importing changes done to MyISAM the last months into Maria
storage/maria/maria_ftdump.c:
importing changes done to MyISAM the last months into Maria
storage/maria/maria_pack.c:
importing changes done to MyISAM the last months into Maria
2006-08-10 16:36:54 +02:00
|
|
|
uint pack_length= (keyseg->bit_start == 1 ? 1 : 2);
|
Injecting more "const" declarations into code which does not change
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
2008-04-03 15:40:25 +02:00
|
|
|
uint tmp_length= (pack_length == 1 ? (uint) *pos :
|
2006-04-11 16:45:10 +03:00
|
|
|
uint2korr(pos));
|
|
|
|
pos+= pack_length; /* Skip VARCHAR length */
|
|
|
|
set_if_smaller(length,tmp_length);
|
|
|
|
FIX_LENGTH(cs, pos, length, char_length);
|
|
|
|
store_key_length_inc(key,char_length);
|
2007-01-18 21:38:14 +02:00
|
|
|
memcpy(key,pos,(size_t) char_length);
|
2006-04-11 16:45:10 +03:00
|
|
|
key+= char_length;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
else if (keyseg->flag & HA_BLOB_PART)
|
|
|
|
{
|
|
|
|
uint tmp_length= _ma_calc_blob_length(keyseg->bit_start,pos);
|
2008-01-10 21:21:36 +02:00
|
|
|
uchar *blob_pos;
|
|
|
|
memcpy_fixed(&blob_pos, pos+keyseg->bit_start,sizeof(char*));
|
2006-04-11 16:45:10 +03:00
|
|
|
set_if_smaller(length,tmp_length);
|
2008-01-10 21:21:36 +02:00
|
|
|
FIX_LENGTH(cs, blob_pos, length, char_length);
|
2006-04-11 16:45:10 +03:00
|
|
|
store_key_length_inc(key,char_length);
|
2008-01-10 21:21:36 +02:00
|
|
|
memcpy(key, blob_pos, (size_t) char_length);
|
2006-04-11 16:45:10 +03:00
|
|
|
key+= char_length;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
else if (keyseg->flag & HA_SWAP_KEY)
|
|
|
|
{ /* Numerical column */
|
|
|
|
#ifdef HAVE_ISNAN
|
|
|
|
if (type == HA_KEYTYPE_FLOAT)
|
|
|
|
{
|
|
|
|
float nr;
|
|
|
|
float4get(nr,pos);
|
|
|
|
if (isnan(nr))
|
|
|
|
{
|
|
|
|
/* Replace NAN with zero */
|
|
|
|
bzero(key,length);
|
|
|
|
key+=length;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (type == HA_KEYTYPE_DOUBLE)
|
|
|
|
{
|
|
|
|
double nr;
|
|
|
|
float8get(nr,pos);
|
|
|
|
if (isnan(nr))
|
|
|
|
{
|
|
|
|
bzero(key,length);
|
|
|
|
key+=length;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
pos+=length;
|
|
|
|
while (length--)
|
|
|
|
{
|
|
|
|
*key++ = *--pos;
|
|
|
|
}
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
FIX_LENGTH(cs, pos, length, char_length);
|
2007-01-18 21:38:14 +02:00
|
|
|
memcpy(key, pos, char_length);
|
2006-04-11 16:45:10 +03:00
|
|
|
if (length > char_length)
|
|
|
|
cs->cset->fill(cs, (char*) key+char_length, length-char_length, ' ');
|
|
|
|
key+= length;
|
|
|
|
}
|
|
|
|
_ma_dpointer(info,key,filepos);
|
|
|
|
DBUG_PRINT("exit",("keynr: %d",keynr));
|
2007-01-18 21:38:14 +02:00
|
|
|
DBUG_DUMP("key",start,(uint) (key-start)+keyseg->length);
|
2006-04-11 16:45:10 +03:00
|
|
|
DBUG_EXECUTE("key",
|
|
|
|
_ma_print_key(DBUG_FILE,info->s->keyinfo[keynr].seg,start,
|
|
|
|
(uint) (key-start)););
|
|
|
|
DBUG_RETURN((uint) (key-start)); /* Return keylength */
|
|
|
|
} /* _ma_make_key */
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
Pack a key to intern format from given format (c_rkey)
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
_ma_pack_key()
|
|
|
|
info MARIA handler
|
|
|
|
uint keynr key number
|
|
|
|
key Store packed key here
|
|
|
|
old Not packed key
|
2007-07-27 12:06:39 +02:00
|
|
|
keypart_map bitmap of used keyparts
|
2006-04-11 16:45:10 +03:00
|
|
|
last_used_keyseg out parameter. May be NULL
|
|
|
|
|
|
|
|
RETURN
|
|
|
|
length of packed key
|
|
|
|
|
|
|
|
last_use_keyseg Store pointer to the keyseg after the last used one
|
|
|
|
*/
|
|
|
|
|
2007-07-02 20:45:15 +03:00
|
|
|
uint _ma_pack_key(register MARIA_HA *info, uint keynr, uchar *key,
|
2007-07-27 12:06:39 +02:00
|
|
|
const uchar *old, key_part_map keypart_map,
|
|
|
|
HA_KEYSEG **last_used_keyseg)
|
2006-04-11 16:45:10 +03:00
|
|
|
{
|
2007-07-02 20:45:15 +03:00
|
|
|
uchar *start_key=key;
|
2006-04-11 16:45:10 +03:00
|
|
|
HA_KEYSEG *keyseg;
|
|
|
|
my_bool is_ft= info->s->keyinfo[keynr].flag & HA_FULLTEXT;
|
|
|
|
DBUG_ENTER("_ma_pack_key");
|
|
|
|
|
2007-07-27 12:06:39 +02:00
|
|
|
/* "one part" rtree key is 2*SPDIMS part key in Maria */
|
|
|
|
if (info->s->keyinfo[keynr].key_alg == HA_KEY_ALG_RTREE)
|
|
|
|
keypart_map= (((key_part_map)1) << (2*SPDIMS)) - 1;
|
|
|
|
|
|
|
|
/* only key prefixes are supported */
|
|
|
|
DBUG_ASSERT(((keypart_map+1) & keypart_map) == 0);
|
|
|
|
|
|
|
|
for (keyseg=info->s->keyinfo[keynr].seg ; keyseg->type && keypart_map;
|
|
|
|
old+= keyseg->length, keyseg++)
|
2006-04-11 16:45:10 +03:00
|
|
|
{
|
2007-07-27 12:06:39 +02:00
|
|
|
enum ha_base_keytype type= (enum ha_base_keytype) keyseg->type;
|
|
|
|
uint length= keyseg->length;
|
2006-04-11 16:45:10 +03:00
|
|
|
uint char_length;
|
2007-07-02 20:45:15 +03:00
|
|
|
const uchar *pos;
|
2006-04-11 16:45:10 +03:00
|
|
|
CHARSET_INFO *cs=keyseg->charset;
|
|
|
|
|
2007-07-27 12:06:39 +02:00
|
|
|
keypart_map>>= 1;
|
2006-04-11 16:45:10 +03:00
|
|
|
if (keyseg->null_bit)
|
|
|
|
{
|
|
|
|
if (!(*key++= (char) 1-*old++)) /* Copy null marker */
|
|
|
|
{
|
|
|
|
if (keyseg->flag & (HA_VAR_LENGTH_PART | HA_BLOB_PART))
|
|
|
|
old+= 2;
|
|
|
|
continue; /* Found NULL */
|
|
|
|
}
|
|
|
|
}
|
2007-01-18 21:38:14 +02:00
|
|
|
char_length= ((!is_ft && cs && cs->mbmaxlen > 1) ? length/cs->mbmaxlen :
|
|
|
|
length);
|
|
|
|
pos= old;
|
2006-04-11 16:45:10 +03:00
|
|
|
if (keyseg->flag & HA_SPACE_PACK)
|
|
|
|
{
|
2007-07-02 20:45:15 +03:00
|
|
|
const uchar *end= pos + length;
|
2007-07-27 12:06:39 +02:00
|
|
|
if (type == HA_KEYTYPE_NUM)
|
2006-04-11 16:45:10 +03:00
|
|
|
{
|
|
|
|
while (pos < end && pos[0] == ' ')
|
|
|
|
pos++;
|
|
|
|
}
|
2007-07-27 12:06:39 +02:00
|
|
|
else if (type != HA_KEYTYPE_BINARY)
|
|
|
|
{
|
|
|
|
while (end > pos && end[-1] == ' ')
|
|
|
|
end--;
|
|
|
|
}
|
2006-04-11 16:45:10 +03:00
|
|
|
length=(uint) (end-pos);
|
|
|
|
FIX_LENGTH(cs, pos, length, char_length);
|
|
|
|
store_key_length_inc(key,char_length);
|
2007-01-18 21:38:14 +02:00
|
|
|
memcpy(key,pos,(size_t) char_length);
|
2006-04-11 16:45:10 +03:00
|
|
|
key+= char_length;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
else if (keyseg->flag & (HA_VAR_LENGTH_PART | HA_BLOB_PART))
|
|
|
|
{
|
|
|
|
/* Length of key-part used with maria_rkey() always 2 */
|
|
|
|
uint tmp_length=uint2korr(pos);
|
|
|
|
pos+=2;
|
|
|
|
set_if_smaller(length,tmp_length); /* Safety */
|
|
|
|
FIX_LENGTH(cs, pos, length, char_length);
|
|
|
|
store_key_length_inc(key,char_length);
|
|
|
|
old+=2; /* Skip length */
|
2007-01-18 21:38:14 +02:00
|
|
|
memcpy(key, pos,(size_t) char_length);
|
2006-04-11 16:45:10 +03:00
|
|
|
key+= char_length;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
else if (keyseg->flag & HA_SWAP_KEY)
|
|
|
|
{ /* Numerical column */
|
|
|
|
pos+=length;
|
|
|
|
while (length--)
|
|
|
|
*key++ = *--pos;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
FIX_LENGTH(cs, pos, length, char_length);
|
2007-01-18 21:38:14 +02:00
|
|
|
memcpy(key, pos, char_length);
|
2006-04-11 16:45:10 +03:00
|
|
|
if (length > char_length)
|
|
|
|
cs->cset->fill(cs, (char*) key+char_length, length-char_length, ' ');
|
|
|
|
key+= length;
|
|
|
|
}
|
|
|
|
if (last_used_keyseg)
|
|
|
|
*last_used_keyseg= keyseg;
|
|
|
|
|
2007-06-09 14:52:17 +03:00
|
|
|
DBUG_PRINT("exit", ("length: %u", (uint) (key-start_key)));
|
2006-04-11 16:45:10 +03:00
|
|
|
DBUG_RETURN((uint) (key-start_key));
|
|
|
|
} /* _ma_pack_key */
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
Store found key in record
|
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
_ma_put_key_in_record()
|
|
|
|
info MARIA handler
|
|
|
|
keynr Key number that was used
|
|
|
|
record Store key here
|
|
|
|
|
|
|
|
Last read key is in info->lastkey
|
|
|
|
|
|
|
|
NOTES
|
|
|
|
Used when only-keyread is wanted
|
|
|
|
|
|
|
|
RETURN
|
|
|
|
0 ok
|
|
|
|
1 error
|
|
|
|
*/
|
|
|
|
|
|
|
|
static int _ma_put_key_in_record(register MARIA_HA *info, uint keynr,
|
2007-07-02 20:45:15 +03:00
|
|
|
uchar *record)
|
2006-04-11 16:45:10 +03:00
|
|
|
{
|
2007-07-02 20:45:15 +03:00
|
|
|
reg2 uchar *key;
|
|
|
|
uchar *pos,*key_end;
|
2006-04-11 16:45:10 +03:00
|
|
|
reg1 HA_KEYSEG *keyseg;
|
2007-07-02 20:45:15 +03:00
|
|
|
uchar *blob_ptr;
|
2006-04-11 16:45:10 +03:00
|
|
|
DBUG_ENTER("_ma_put_key_in_record");
|
|
|
|
|
2007-01-18 21:38:14 +02:00
|
|
|
blob_ptr= info->lastkey2; /* Place to put blob parts */
|
|
|
|
key=info->lastkey; /* KEy that was read */
|
2006-04-11 16:45:10 +03:00
|
|
|
key_end=key+info->lastkey_length;
|
|
|
|
for (keyseg=info->s->keyinfo[keynr].seg ; keyseg->type ;keyseg++)
|
|
|
|
{
|
|
|
|
if (keyseg->null_bit)
|
|
|
|
{
|
|
|
|
if (!*key++)
|
|
|
|
{
|
|
|
|
record[keyseg->null_pos]|= keyseg->null_bit;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
record[keyseg->null_pos]&= ~keyseg->null_bit;
|
|
|
|
}
|
|
|
|
if (keyseg->type == HA_KEYTYPE_BIT)
|
|
|
|
{
|
|
|
|
uint length= keyseg->length;
|
|
|
|
|
|
|
|
if (keyseg->bit_length)
|
|
|
|
{
|
2007-07-02 20:45:15 +03:00
|
|
|
uchar bits= *key++;
|
2006-04-11 16:45:10 +03:00
|
|
|
set_rec_bits(bits, record + keyseg->bit_pos, keyseg->bit_start,
|
|
|
|
keyseg->bit_length);
|
|
|
|
length--;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
clr_rec_bits(record + keyseg->bit_pos, keyseg->bit_start,
|
|
|
|
keyseg->bit_length);
|
|
|
|
}
|
2007-01-18 21:38:14 +02:00
|
|
|
memcpy(record + keyseg->start, key, length);
|
2006-04-11 16:45:10 +03:00
|
|
|
key+= length;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (keyseg->flag & HA_SPACE_PACK)
|
|
|
|
{
|
|
|
|
uint length;
|
|
|
|
get_key_length(length,key);
|
|
|
|
#ifdef CHECK_KEYS
|
|
|
|
if (length > keyseg->length || key+length > key_end)
|
|
|
|
goto err;
|
|
|
|
#endif
|
|
|
|
pos= record+keyseg->start;
|
|
|
|
if (keyseg->type != (int) HA_KEYTYPE_NUM)
|
|
|
|
{
|
2006-12-20 18:58:35 +01:00
|
|
|
memcpy(pos,key,(size_t) length);
|
|
|
|
keyseg->charset->cset->fill(keyseg->charset,
|
2007-10-04 20:33:42 +03:00
|
|
|
(char*) pos + length,
|
|
|
|
keyseg->length - length,
|
2006-12-20 18:58:35 +01:00
|
|
|
' ');
|
2006-04-11 16:45:10 +03:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
bfill(pos,keyseg->length-length,' ');
|
|
|
|
memcpy(pos+keyseg->length-length,key,(size_t) length);
|
|
|
|
}
|
|
|
|
key+=length;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (keyseg->flag & HA_VAR_LENGTH_PART)
|
|
|
|
{
|
|
|
|
uint length;
|
|
|
|
get_key_length(length,key);
|
|
|
|
#ifdef CHECK_KEYS
|
|
|
|
if (length > keyseg->length || key+length > key_end)
|
|
|
|
goto err;
|
|
|
|
#endif
|
|
|
|
/* Store key length */
|
|
|
|
if (keyseg->bit_start == 1)
|
|
|
|
*(uchar*) (record+keyseg->start)= (uchar) length;
|
|
|
|
else
|
|
|
|
int2store(record+keyseg->start, length);
|
|
|
|
/* And key data */
|
2007-01-18 21:38:14 +02:00
|
|
|
memcpy(record+keyseg->start + keyseg->bit_start, key, length);
|
2006-04-11 16:45:10 +03:00
|
|
|
key+= length;
|
|
|
|
}
|
|
|
|
else if (keyseg->flag & HA_BLOB_PART)
|
|
|
|
{
|
|
|
|
uint length;
|
|
|
|
get_key_length(length,key);
|
|
|
|
#ifdef CHECK_KEYS
|
|
|
|
if (length > keyseg->length || key+length > key_end)
|
|
|
|
goto err;
|
|
|
|
#endif
|
|
|
|
memcpy(record+keyseg->start+keyseg->bit_start,
|
|
|
|
(char*) &blob_ptr,sizeof(char*));
|
|
|
|
memcpy(blob_ptr,key,length);
|
|
|
|
blob_ptr+=length;
|
|
|
|
|
|
|
|
/* The above changed info->lastkey2. Inform maria_rnext_same(). */
|
|
|
|
info->update&= ~HA_STATE_RNEXT_SAME;
|
|
|
|
|
|
|
|
_ma_store_blob_length(record+keyseg->start,
|
|
|
|
(uint) keyseg->bit_start,length);
|
|
|
|
key+=length;
|
|
|
|
}
|
|
|
|
else if (keyseg->flag & HA_SWAP_KEY)
|
|
|
|
{
|
2007-07-02 20:45:15 +03:00
|
|
|
uchar *to= record+keyseg->start+keyseg->length;
|
|
|
|
uchar *end= key+keyseg->length;
|
2006-04-11 16:45:10 +03:00
|
|
|
#ifdef CHECK_KEYS
|
|
|
|
if (end > key_end)
|
|
|
|
goto err;
|
|
|
|
#endif
|
|
|
|
do
|
|
|
|
{
|
|
|
|
*--to= *key++;
|
|
|
|
} while (key != end);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
#ifdef CHECK_KEYS
|
|
|
|
if (key+keyseg->length > key_end)
|
|
|
|
goto err;
|
|
|
|
#endif
|
2007-01-18 21:38:14 +02:00
|
|
|
memcpy(record+keyseg->start, key, (size_t) keyseg->length);
|
2006-04-11 16:45:10 +03:00
|
|
|
key+= keyseg->length;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
DBUG_RETURN(0);
|
|
|
|
|
|
|
|
err:
|
|
|
|
DBUG_RETURN(1); /* Crashed row */
|
|
|
|
} /* _ma_put_key_in_record */
|
|
|
|
|
|
|
|
|
|
|
|
/* Here when key reads are used */
|
|
|
|
|
2007-07-02 20:45:15 +03:00
|
|
|
int _ma_read_key_record(MARIA_HA *info, uchar *buf, MARIA_RECORD_POS filepos)
|
2006-04-11 16:45:10 +03:00
|
|
|
{
|
|
|
|
fast_ma_writeinfo(info);
|
|
|
|
if (filepos != HA_OFFSET_ERROR)
|
|
|
|
{
|
|
|
|
if (info->lastinx >= 0)
|
|
|
|
{ /* Read only key */
|
|
|
|
if (_ma_put_key_in_record(info,(uint) info->lastinx,buf))
|
|
|
|
{
|
|
|
|
maria_print_error(info->s, HA_ERR_CRASHED);
|
|
|
|
my_errno=HA_ERR_CRASHED;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
info->update|= HA_STATE_AKTIV; /* We should find a record */
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
my_errno=HA_ERR_WRONG_INDEX;
|
|
|
|
}
|
|
|
|
return(-1); /* Wrong data to read */
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
Completion of merge of mysql-5.1 into mysql-maria.
Manually imported changes done to MyISAM (include/myisam.h,
storage/myisam/*, sql/ha_myisam.*, mysql-test/t/myisam.test,
mysql-test/t/ps_2myisam.test) the last
months into Maria (tedious, should do it more frequently in the
future), including those not done at the previous 5.1->Maria merge
(please in the future don't forget to apply MyISAM changes to Maria
when you merge 5.1 into Maria).
Note: I didn't try to import anything which could be MyISAM-related
in other tests of mysql-test (I didn't want to dig in all csets),
but as QA is working to make most tests re-usable for other engines
(Falcon), it is likely that we'll benefit from this and just have
to set engine=Maria somewhere to run those tests on Maria.
func_group and partition tests fail but they already do in main 5.1
on my machine. No Valgrind error in t/*maria*.test.
Monty: please see the commit comment of maria.result and check.
BitKeeper/deleted/.del-ha_maria.m4:
Delete: config/ac-macros/ha_maria.m4
configure.in:
fix for the new way of enabling engines
include/maria.h:
importing changes done to MyISAM the last months into Maria
include/my_handler.h:
importing changes done to MyISAM the last months into Maria
include/myisam.h:
importing changes done to MyISAM the last months into Maria
mysql-test/r/maria.result:
identical to myisam.result, except the engine name in some places
AND in the line testing key_block_size=1000000000000000000:
Maria gives a key block size of 8192 while MyISAM gives 4096;
is it explainable by the difference between MARIA_KEY_BLOCK_LENGTH
and the same constant in MyISAM? Monty?
mysql-test/r/ps_maria.result:
identical to ps_2myisam.result (except the engine name in some places)
mysql-test/t/maria.test:
instead of engine=maria everywhere, I use @@storage_engine (reduces
the diff with myisam.test).
importing changes done to MyISAM the last months into Maria
mysys/my_handler.c:
importing changes done to MyISAM the last months into Maria
sql/ha_maria.cc:
importing changes done to MyISAM the last months into Maria
sql/ha_maria.h:
importing changes done to MyISAM the last months into Maria
sql/mysqld.cc:
unneeded
storage/maria/Makefile.am:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_check.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_create.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_delete_table.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_dynrec.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_extra.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_ft_boolean_search.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_ft_eval.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_ft_nlq_search.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_ft_parser.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_ft_test1.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_ft_update.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_ftdefs.h:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_key.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_open.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_page.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_rkey.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_rsamepos.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_rt_index.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_rt_mbr.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_search.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_sort.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_test1.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_test2.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_test3.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_update.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_write.c:
importing changes done to MyISAM the last months into Maria
storage/maria/maria_chk.c:
importing changes done to MyISAM the last months into Maria
storage/maria/maria_def.h:
importing changes done to MyISAM the last months into Maria
storage/maria/maria_ftdump.c:
importing changes done to MyISAM the last months into Maria
storage/maria/maria_pack.c:
importing changes done to MyISAM the last months into Maria
2006-08-10 16:36:54 +02:00
|
|
|
Retrieve auto_increment info
|
2006-04-11 16:45:10 +03:00
|
|
|
|
|
|
|
SYNOPSIS
|
Completion of merge of mysql-5.1 into mysql-maria.
Manually imported changes done to MyISAM (include/myisam.h,
storage/myisam/*, sql/ha_myisam.*, mysql-test/t/myisam.test,
mysql-test/t/ps_2myisam.test) the last
months into Maria (tedious, should do it more frequently in the
future), including those not done at the previous 5.1->Maria merge
(please in the future don't forget to apply MyISAM changes to Maria
when you merge 5.1 into Maria).
Note: I didn't try to import anything which could be MyISAM-related
in other tests of mysql-test (I didn't want to dig in all csets),
but as QA is working to make most tests re-usable for other engines
(Falcon), it is likely that we'll benefit from this and just have
to set engine=Maria somewhere to run those tests on Maria.
func_group and partition tests fail but they already do in main 5.1
on my machine. No Valgrind error in t/*maria*.test.
Monty: please see the commit comment of maria.result and check.
BitKeeper/deleted/.del-ha_maria.m4:
Delete: config/ac-macros/ha_maria.m4
configure.in:
fix for the new way of enabling engines
include/maria.h:
importing changes done to MyISAM the last months into Maria
include/my_handler.h:
importing changes done to MyISAM the last months into Maria
include/myisam.h:
importing changes done to MyISAM the last months into Maria
mysql-test/r/maria.result:
identical to myisam.result, except the engine name in some places
AND in the line testing key_block_size=1000000000000000000:
Maria gives a key block size of 8192 while MyISAM gives 4096;
is it explainable by the difference between MARIA_KEY_BLOCK_LENGTH
and the same constant in MyISAM? Monty?
mysql-test/r/ps_maria.result:
identical to ps_2myisam.result (except the engine name in some places)
mysql-test/t/maria.test:
instead of engine=maria everywhere, I use @@storage_engine (reduces
the diff with myisam.test).
importing changes done to MyISAM the last months into Maria
mysys/my_handler.c:
importing changes done to MyISAM the last months into Maria
sql/ha_maria.cc:
importing changes done to MyISAM the last months into Maria
sql/ha_maria.h:
importing changes done to MyISAM the last months into Maria
sql/mysqld.cc:
unneeded
storage/maria/Makefile.am:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_check.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_create.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_delete_table.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_dynrec.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_extra.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_ft_boolean_search.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_ft_eval.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_ft_nlq_search.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_ft_parser.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_ft_test1.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_ft_update.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_ftdefs.h:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_key.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_open.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_page.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_rkey.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_rsamepos.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_rt_index.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_rt_mbr.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_search.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_sort.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_test1.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_test2.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_test3.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_update.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_write.c:
importing changes done to MyISAM the last months into Maria
storage/maria/maria_chk.c:
importing changes done to MyISAM the last months into Maria
storage/maria/maria_def.h:
importing changes done to MyISAM the last months into Maria
storage/maria/maria_ftdump.c:
importing changes done to MyISAM the last months into Maria
storage/maria/maria_pack.c:
importing changes done to MyISAM the last months into Maria
2006-08-10 16:36:54 +02:00
|
|
|
retrieve_auto_increment()
|
WL#3072 - Maria Recovery: recovery of state.auto_increment.
When we log UNDO_KEY_INSERT for an auto_inc key, we update
state.auto_increment (not anymore at the end of maria_write() except
if this is a non-transactional table). When Recovery sees UNDO_KEY_INSERT
in the REDO phase, it reads the auto_inc value from it and updates
state.auto_increment.
mysql-test/r/maria-recovery.result:
Without the code fix, there would be in CHECK TABLE:
"Auto-increment value: 0 is smaller than max used value: 3"
and no AUTO_INCREMENT= clause in SHOW CREATE TABLE.
mysql-test/t/maria-recovery.test:
Test of recovery of state.auto_increment: from an old table,
does the replaying of the log set state.auto_increment to
what it should be.
storage/maria/ma_check.c:
new way of calling ma_retrieve_auto_increment(): pass key
storage/maria/ma_key.c:
ma_retrieve_auto_increment() now operates directly with a pointer
to the key and not on the record.
storage/maria/ma_key_recover.c:
dedicated write_hook_for_undo_key_insert(): sets state.auto_increment
under log's mutex.
storage/maria/ma_key_recover.h:
Dedicated hook for UNDO_KEY_INSERT, to set state.auto_increment.
Such hook needs a new member st_msg_write_hook_for_undo_key::auto_increment,
which contains the auto_increment value inserted.
storage/maria/ma_loghandler.c:
UNDO_KEY_INSERT gets a dedicated write_hook, to set auto_increment.
storage/maria/ma_recovery.c:
When in the REDO phase we see UNDO_KEY_INSERT: if the state is older
than this record, and the key is the auto_increment one, read
the key's value from the log record and update state.auto_increment.
storage/maria/ma_test_all.sh:
use $maria_path to be able to run from /dev/shm (faster)
storage/maria/ma_update.c:
bool is more of C++, using my_bool.
If table is transactional, state.auto_increment is already updated
in write_hook_for_undo_key_insert().
storage/maria/ma_write.c:
If table is transactional, state.auto_increment is not updated at
the end of maria_write() but rather in write_hook_for_undo_key_insert()
(under log's mutex, so that a concurrent checkpoint does not read
state.auto_increment while it is changing - corrupted).
_ma_ck_write_btree_with_log() extracts the auto_increment value
from the key, puts it into msg.auto_increment, and this is passed
to write_hook_for_undo_key_insert().
storage/maria/maria_def.h:
change of prototype of ma_retrieve_auto_increment()
storage/maria/maria_read_log.c:
use default log file size. Use separate page caches for table
and logs (needed if maria_block_size!=TRANSLOG_PAGE_SIZE).
2007-12-12 22:33:36 +01:00
|
|
|
key Auto-increment key
|
|
|
|
key_type Key's type
|
|
|
|
|
|
|
|
NOTE
|
|
|
|
'key' should in "record" format, that is, how it is packed in a record
|
|
|
|
(this matters with HA_SWAP_KEY).
|
2006-04-11 16:45:10 +03:00
|
|
|
|
|
|
|
IMPLEMENTATION
|
Completion of merge of mysql-5.1 into mysql-maria.
Manually imported changes done to MyISAM (include/myisam.h,
storage/myisam/*, sql/ha_myisam.*, mysql-test/t/myisam.test,
mysql-test/t/ps_2myisam.test) the last
months into Maria (tedious, should do it more frequently in the
future), including those not done at the previous 5.1->Maria merge
(please in the future don't forget to apply MyISAM changes to Maria
when you merge 5.1 into Maria).
Note: I didn't try to import anything which could be MyISAM-related
in other tests of mysql-test (I didn't want to dig in all csets),
but as QA is working to make most tests re-usable for other engines
(Falcon), it is likely that we'll benefit from this and just have
to set engine=Maria somewhere to run those tests on Maria.
func_group and partition tests fail but they already do in main 5.1
on my machine. No Valgrind error in t/*maria*.test.
Monty: please see the commit comment of maria.result and check.
BitKeeper/deleted/.del-ha_maria.m4:
Delete: config/ac-macros/ha_maria.m4
configure.in:
fix for the new way of enabling engines
include/maria.h:
importing changes done to MyISAM the last months into Maria
include/my_handler.h:
importing changes done to MyISAM the last months into Maria
include/myisam.h:
importing changes done to MyISAM the last months into Maria
mysql-test/r/maria.result:
identical to myisam.result, except the engine name in some places
AND in the line testing key_block_size=1000000000000000000:
Maria gives a key block size of 8192 while MyISAM gives 4096;
is it explainable by the difference between MARIA_KEY_BLOCK_LENGTH
and the same constant in MyISAM? Monty?
mysql-test/r/ps_maria.result:
identical to ps_2myisam.result (except the engine name in some places)
mysql-test/t/maria.test:
instead of engine=maria everywhere, I use @@storage_engine (reduces
the diff with myisam.test).
importing changes done to MyISAM the last months into Maria
mysys/my_handler.c:
importing changes done to MyISAM the last months into Maria
sql/ha_maria.cc:
importing changes done to MyISAM the last months into Maria
sql/ha_maria.h:
importing changes done to MyISAM the last months into Maria
sql/mysqld.cc:
unneeded
storage/maria/Makefile.am:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_check.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_create.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_delete_table.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_dynrec.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_extra.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_ft_boolean_search.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_ft_eval.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_ft_nlq_search.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_ft_parser.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_ft_test1.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_ft_update.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_ftdefs.h:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_key.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_open.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_page.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_rkey.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_rsamepos.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_rt_index.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_rt_mbr.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_search.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_sort.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_test1.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_test2.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_test3.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_update.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_write.c:
importing changes done to MyISAM the last months into Maria
storage/maria/maria_chk.c:
importing changes done to MyISAM the last months into Maria
storage/maria/maria_def.h:
importing changes done to MyISAM the last months into Maria
storage/maria/maria_ftdump.c:
importing changes done to MyISAM the last months into Maria
storage/maria/maria_pack.c:
importing changes done to MyISAM the last months into Maria
2006-08-10 16:36:54 +02:00
|
|
|
For signed columns we don't retrieve the auto increment value if it's
|
2006-04-11 16:45:10 +03:00
|
|
|
less than zero.
|
|
|
|
*/
|
|
|
|
|
WL#3072 - Maria Recovery: recovery of state.auto_increment.
When we log UNDO_KEY_INSERT for an auto_inc key, we update
state.auto_increment (not anymore at the end of maria_write() except
if this is a non-transactional table). When Recovery sees UNDO_KEY_INSERT
in the REDO phase, it reads the auto_inc value from it and updates
state.auto_increment.
mysql-test/r/maria-recovery.result:
Without the code fix, there would be in CHECK TABLE:
"Auto-increment value: 0 is smaller than max used value: 3"
and no AUTO_INCREMENT= clause in SHOW CREATE TABLE.
mysql-test/t/maria-recovery.test:
Test of recovery of state.auto_increment: from an old table,
does the replaying of the log set state.auto_increment to
what it should be.
storage/maria/ma_check.c:
new way of calling ma_retrieve_auto_increment(): pass key
storage/maria/ma_key.c:
ma_retrieve_auto_increment() now operates directly with a pointer
to the key and not on the record.
storage/maria/ma_key_recover.c:
dedicated write_hook_for_undo_key_insert(): sets state.auto_increment
under log's mutex.
storage/maria/ma_key_recover.h:
Dedicated hook for UNDO_KEY_INSERT, to set state.auto_increment.
Such hook needs a new member st_msg_write_hook_for_undo_key::auto_increment,
which contains the auto_increment value inserted.
storage/maria/ma_loghandler.c:
UNDO_KEY_INSERT gets a dedicated write_hook, to set auto_increment.
storage/maria/ma_recovery.c:
When in the REDO phase we see UNDO_KEY_INSERT: if the state is older
than this record, and the key is the auto_increment one, read
the key's value from the log record and update state.auto_increment.
storage/maria/ma_test_all.sh:
use $maria_path to be able to run from /dev/shm (faster)
storage/maria/ma_update.c:
bool is more of C++, using my_bool.
If table is transactional, state.auto_increment is already updated
in write_hook_for_undo_key_insert().
storage/maria/ma_write.c:
If table is transactional, state.auto_increment is not updated at
the end of maria_write() but rather in write_hook_for_undo_key_insert()
(under log's mutex, so that a concurrent checkpoint does not read
state.auto_increment while it is changing - corrupted).
_ma_ck_write_btree_with_log() extracts the auto_increment value
from the key, puts it into msg.auto_increment, and this is passed
to write_hook_for_undo_key_insert().
storage/maria/maria_def.h:
change of prototype of ma_retrieve_auto_increment()
storage/maria/maria_read_log.c:
use default log file size. Use separate page caches for table
and logs (needed if maria_block_size!=TRANSLOG_PAGE_SIZE).
2007-12-12 22:33:36 +01:00
|
|
|
ulonglong ma_retrieve_auto_increment(const uchar *key, uint8 key_type)
|
2006-04-11 16:45:10 +03:00
|
|
|
{
|
|
|
|
ulonglong value= 0; /* Store unsigned values here */
|
|
|
|
longlong s_value= 0; /* Store signed values here */
|
|
|
|
|
WL#3072 - Maria Recovery: recovery of state.auto_increment.
When we log UNDO_KEY_INSERT for an auto_inc key, we update
state.auto_increment (not anymore at the end of maria_write() except
if this is a non-transactional table). When Recovery sees UNDO_KEY_INSERT
in the REDO phase, it reads the auto_inc value from it and updates
state.auto_increment.
mysql-test/r/maria-recovery.result:
Without the code fix, there would be in CHECK TABLE:
"Auto-increment value: 0 is smaller than max used value: 3"
and no AUTO_INCREMENT= clause in SHOW CREATE TABLE.
mysql-test/t/maria-recovery.test:
Test of recovery of state.auto_increment: from an old table,
does the replaying of the log set state.auto_increment to
what it should be.
storage/maria/ma_check.c:
new way of calling ma_retrieve_auto_increment(): pass key
storage/maria/ma_key.c:
ma_retrieve_auto_increment() now operates directly with a pointer
to the key and not on the record.
storage/maria/ma_key_recover.c:
dedicated write_hook_for_undo_key_insert(): sets state.auto_increment
under log's mutex.
storage/maria/ma_key_recover.h:
Dedicated hook for UNDO_KEY_INSERT, to set state.auto_increment.
Such hook needs a new member st_msg_write_hook_for_undo_key::auto_increment,
which contains the auto_increment value inserted.
storage/maria/ma_loghandler.c:
UNDO_KEY_INSERT gets a dedicated write_hook, to set auto_increment.
storage/maria/ma_recovery.c:
When in the REDO phase we see UNDO_KEY_INSERT: if the state is older
than this record, and the key is the auto_increment one, read
the key's value from the log record and update state.auto_increment.
storage/maria/ma_test_all.sh:
use $maria_path to be able to run from /dev/shm (faster)
storage/maria/ma_update.c:
bool is more of C++, using my_bool.
If table is transactional, state.auto_increment is already updated
in write_hook_for_undo_key_insert().
storage/maria/ma_write.c:
If table is transactional, state.auto_increment is not updated at
the end of maria_write() but rather in write_hook_for_undo_key_insert()
(under log's mutex, so that a concurrent checkpoint does not read
state.auto_increment while it is changing - corrupted).
_ma_ck_write_btree_with_log() extracts the auto_increment value
from the key, puts it into msg.auto_increment, and this is passed
to write_hook_for_undo_key_insert().
storage/maria/maria_def.h:
change of prototype of ma_retrieve_auto_increment()
storage/maria/maria_read_log.c:
use default log file size. Use separate page caches for table
and logs (needed if maria_block_size!=TRANSLOG_PAGE_SIZE).
2007-12-12 22:33:36 +01:00
|
|
|
switch (key_type) {
|
2006-04-11 16:45:10 +03:00
|
|
|
case HA_KEYTYPE_INT8:
|
Injecting more "const" declarations into code which does not change
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
2008-04-03 15:40:25 +02:00
|
|
|
s_value= (longlong) *(const char*)key;
|
2006-04-11 16:45:10 +03:00
|
|
|
break;
|
|
|
|
case HA_KEYTYPE_BINARY:
|
Injecting more "const" declarations into code which does not change
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
2008-04-03 15:40:25 +02:00
|
|
|
value=(ulonglong) *key;
|
2006-04-11 16:45:10 +03:00
|
|
|
break;
|
|
|
|
case HA_KEYTYPE_SHORT_INT:
|
|
|
|
s_value= (longlong) sint2korr(key);
|
|
|
|
break;
|
|
|
|
case HA_KEYTYPE_USHORT_INT:
|
|
|
|
value=(ulonglong) uint2korr(key);
|
|
|
|
break;
|
|
|
|
case HA_KEYTYPE_LONG_INT:
|
|
|
|
s_value= (longlong) sint4korr(key);
|
|
|
|
break;
|
|
|
|
case HA_KEYTYPE_ULONG_INT:
|
|
|
|
value=(ulonglong) uint4korr(key);
|
|
|
|
break;
|
|
|
|
case HA_KEYTYPE_INT24:
|
|
|
|
s_value= (longlong) sint3korr(key);
|
|
|
|
break;
|
|
|
|
case HA_KEYTYPE_UINT24:
|
|
|
|
value=(ulonglong) uint3korr(key);
|
|
|
|
break;
|
|
|
|
case HA_KEYTYPE_FLOAT: /* This shouldn't be used */
|
|
|
|
{
|
|
|
|
float f_1;
|
|
|
|
float4get(f_1,key);
|
|
|
|
/* Ignore negative values */
|
|
|
|
value = (f_1 < (float) 0.0) ? 0 : (ulonglong) f_1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
case HA_KEYTYPE_DOUBLE: /* This shouldn't be used */
|
|
|
|
{
|
|
|
|
double f_1;
|
|
|
|
float8get(f_1,key);
|
|
|
|
/* Ignore negative values */
|
|
|
|
value = (f_1 < 0.0) ? 0 : (ulonglong) f_1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
case HA_KEYTYPE_LONGLONG:
|
|
|
|
s_value= sint8korr(key);
|
|
|
|
break;
|
|
|
|
case HA_KEYTYPE_ULONGLONG:
|
|
|
|
value= uint8korr(key);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
DBUG_ASSERT(0);
|
|
|
|
value=0; /* Error */
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
The following code works becasue if s_value < 0 then value is 0
|
|
|
|
and if s_value == 0 then value will contain either s_value or the
|
|
|
|
correct value.
|
|
|
|
*/
|
Completion of merge of mysql-5.1 into mysql-maria.
Manually imported changes done to MyISAM (include/myisam.h,
storage/myisam/*, sql/ha_myisam.*, mysql-test/t/myisam.test,
mysql-test/t/ps_2myisam.test) the last
months into Maria (tedious, should do it more frequently in the
future), including those not done at the previous 5.1->Maria merge
(please in the future don't forget to apply MyISAM changes to Maria
when you merge 5.1 into Maria).
Note: I didn't try to import anything which could be MyISAM-related
in other tests of mysql-test (I didn't want to dig in all csets),
but as QA is working to make most tests re-usable for other engines
(Falcon), it is likely that we'll benefit from this and just have
to set engine=Maria somewhere to run those tests on Maria.
func_group and partition tests fail but they already do in main 5.1
on my machine. No Valgrind error in t/*maria*.test.
Monty: please see the commit comment of maria.result and check.
BitKeeper/deleted/.del-ha_maria.m4:
Delete: config/ac-macros/ha_maria.m4
configure.in:
fix for the new way of enabling engines
include/maria.h:
importing changes done to MyISAM the last months into Maria
include/my_handler.h:
importing changes done to MyISAM the last months into Maria
include/myisam.h:
importing changes done to MyISAM the last months into Maria
mysql-test/r/maria.result:
identical to myisam.result, except the engine name in some places
AND in the line testing key_block_size=1000000000000000000:
Maria gives a key block size of 8192 while MyISAM gives 4096;
is it explainable by the difference between MARIA_KEY_BLOCK_LENGTH
and the same constant in MyISAM? Monty?
mysql-test/r/ps_maria.result:
identical to ps_2myisam.result (except the engine name in some places)
mysql-test/t/maria.test:
instead of engine=maria everywhere, I use @@storage_engine (reduces
the diff with myisam.test).
importing changes done to MyISAM the last months into Maria
mysys/my_handler.c:
importing changes done to MyISAM the last months into Maria
sql/ha_maria.cc:
importing changes done to MyISAM the last months into Maria
sql/ha_maria.h:
importing changes done to MyISAM the last months into Maria
sql/mysqld.cc:
unneeded
storage/maria/Makefile.am:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_check.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_create.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_delete_table.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_dynrec.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_extra.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_ft_boolean_search.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_ft_eval.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_ft_nlq_search.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_ft_parser.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_ft_test1.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_ft_update.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_ftdefs.h:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_key.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_open.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_page.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_rkey.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_rsamepos.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_rt_index.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_rt_mbr.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_search.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_sort.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_test1.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_test2.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_test3.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_update.c:
importing changes done to MyISAM the last months into Maria
storage/maria/ma_write.c:
importing changes done to MyISAM the last months into Maria
storage/maria/maria_chk.c:
importing changes done to MyISAM the last months into Maria
storage/maria/maria_def.h:
importing changes done to MyISAM the last months into Maria
storage/maria/maria_ftdump.c:
importing changes done to MyISAM the last months into Maria
storage/maria/maria_pack.c:
importing changes done to MyISAM the last months into Maria
2006-08-10 16:36:54 +02:00
|
|
|
return (s_value > 0) ? (ulonglong) s_value : value;
|
2006-04-11 16:45:10 +03:00
|
|
|
}
|