mirror of
https://github.com/MariaDB/server.git
synced 2025-01-31 02:51:44 +01:00
f252f9248a
The following type conversions was done: - Changed byte to uchar - Changed gptr to uchar* - Change my_string to char * - Change my_size_t to size_t - Change size_s to size_t Removed declaration of byte, gptr, my_string, my_size_t and size_s. Following function parameter changes was done: - All string functions in mysys/strings was changed to use size_t instead of uint for string lengths. - All read()/write() functions changed to use size_t (including vio). - All protocoll functions changed to use size_t instead of uint - Functions that used a pointer to a string length was changed to use size_t* - Changed malloc(), free() and related functions from using gptr to use void * as this requires fewer casts in the code and is more in line with how the standard functions work. - Added extra length argument to dirname_part() to return the length of the created string. - Changed (at least) following functions to take uchar* as argument: - db_dump() - my_net_write() - net_write_command() - net_store_data() - DBUG_DUMP() - decimal2bin() & bin2decimal() - Changed my_compress() and my_uncompress() to use size_t. Changed one argument to my_uncompress() from a pointer to a value as we only return one value (makes function easier to use). - Changed type of 'pack_data' argument to packfrm() to avoid casts. - Changed in readfrm() and writefrom(), ha_discover and handler::discover() the type for argument 'frmdata' to uchar** to avoid casts. - Changed most Field functions to use uchar* instead of char* (reduced a lot of casts). - Changed field->val_xxx(xxx, new_ptr) to take const pointers. Other changes: - Removed a lot of not needed casts - Added a few new cast required by other changes - Added some cast to my_multi_malloc() arguments for safety (as string lengths needs to be uint, not size_t). - Fixed all calls to hash-get-key functions to use size_t*. (Needed to be done explicitely as this conflict was often hided by casting the function to hash_get_key). - Changed some buffers to memory regions to uchar* to avoid casts. - Changed some string lengths from uint to size_t. - Changed field->ptr to be uchar* instead of char*. This allowed us to get rid of a lot of casts. - Some changes from true -> TRUE, false -> FALSE, unsigned char -> uchar - Include zlib.h in some files as we needed declaration of crc32() - Changed MY_FILE_ERROR to be (size_t) -1. - Changed many variables to hold the result of my_read() / my_write() to be size_t. This was needed to properly detect errors (which are returned as (size_t) -1). - Removed some very old VMS code - Changed packfrm()/unpackfrm() to not be depending on uint size (portability fix) - Removed windows specific code to restore cursor position as this causes slowdown on windows and we should not mix read() and pread() calls anyway as this is not thread safe. Updated function comment to reflect this. Changed function that depended on original behavior of my_pwrite() to itself restore the cursor position (one such case). - Added some missing checking of return value of malloc(). - Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid 'long' overflow. - Changed type of table_def::m_size from my_size_t to ulong to reflect that m_size is the number of elements in the array, not a string/memory length. - Moved THD::max_row_length() to table.cc (as it's not depending on THD). Inlined max_row_length_blob() into this function. - More function comments - Fixed some compiler warnings when compiled without partitions. - Removed setting of LEX_STRING() arguments in declaration (portability fix). - Some trivial indentation/variable name changes. - Some trivial code simplifications: - Replaced some calls to alloc_root + memcpy to use strmake_root()/strdup_root(). - Changed some calls from memdup() to strmake() (Safety fix) - Simpler loops in client-simple.c BitKeeper/etc/ignore: added libmysqld/ha_ndbcluster_cond.cc --- added debian/defs.mk debian/control client/completion_hash.cc: Remove not needed casts client/my_readline.h: Remove some old types client/mysql.cc: Simplify types client/mysql_upgrade.c: Remove some old types Update call to dirname_part client/mysqladmin.cc: Remove some old types client/mysqlbinlog.cc: Remove some old types Change some buffers to be uchar to avoid casts client/mysqlcheck.c: Remove some old types client/mysqldump.c: Remove some old types Remove some not needed casts Change some string lengths to size_t client/mysqlimport.c: Remove some old types client/mysqlshow.c: Remove some old types client/mysqlslap.c: Remove some old types Remove some not needed casts client/mysqltest.c: Removed some old types Removed some not needed casts Updated hash-get-key function arguments Updated parameters to dirname_part() client/readline.cc: Removed some old types Removed some not needed casts Changed some string lengths to use size_t client/sql_string.cc: Removed some old types dbug/dbug.c: Removed some old types Changed some string lengths to use size_t Changed some prototypes to avoid casts extra/comp_err.c: Removed some old types extra/innochecksum.c: Removed some old types extra/my_print_defaults.c: Removed some old types extra/mysql_waitpid.c: Removed some old types extra/perror.c: Removed some old types extra/replace.c: Removed some old types Updated parameters to dirname_part() extra/resolve_stack_dump.c: Removed some old types extra/resolveip.c: Removed some old types include/config-win.h: Removed some old types include/decimal.h: Changed binary strings to be uchar* instead of char* include/ft_global.h: Removed some old types include/hash.h: Removed some old types include/heap.h: Removed some old types Changed records_under_level to be 'ulong' instead of 'uint' to clarify usage of variable include/keycache.h: Removed some old types include/m_ctype.h: Removed some old types Changed some string lengths to use size_t Changed character length functions to return uint unsigned char -> uchar include/m_string.h: Removed some old types Changed some string lengths to use size_t include/my_alloc.h: Changed some string lengths to use size_t include/my_base.h: Removed some old types include/my_dbug.h: Removed some old types Changed some string lengths to use size_t Changed db_dump() to take uchar * as argument for memory to reduce number of casts in usage include/my_getopt.h: Removed some old types include/my_global.h: Removed old types: my_size_t -> size_t byte -> uchar gptr -> uchar * include/my_list.h: Removed some old types include/my_nosys.h: Removed some old types include/my_pthread.h: Removed some old types include/my_sys.h: Removed some old types Changed MY_FILE_ERROR to be in line with new definitions of my_write()/my_read() Changed some string lengths to use size_t my_malloc() / my_free() now uses void * Updated parameters to dirname_part() & my_uncompress() include/my_tree.h: Removed some old types include/my_trie.h: Removed some old types include/my_user.h: Changed some string lengths to use size_t include/my_vle.h: Removed some old types include/my_xml.h: Removed some old types Changed some string lengths to use size_t include/myisam.h: Removed some old types include/myisammrg.h: Removed some old types include/mysql.h: Removed some old types Changed byte streams to use uchar* instead of char* include/mysql_com.h: Removed some old types Changed some string lengths to use size_t Changed some buffers to be uchar* to avoid casts include/queues.h: Removed some old types include/sql_common.h: Removed some old types include/sslopt-longopts.h: Removed some old types include/violite.h: Removed some old types Changed some string lengths to use size_t libmysql/client_settings.h: Removed some old types libmysql/libmysql.c: Removed some old types libmysql/manager.c: Removed some old types libmysqld/emb_qcache.cc: Removed some old types libmysqld/emb_qcache.h: Removed some old types libmysqld/lib_sql.cc: Removed some old types Removed some not needed casts Changed some buffers to be uchar* to avoid casts true -> TRUE, false -> FALSE mysys/array.c: Removed some old types mysys/charset.c: Changed some string lengths to use size_t mysys/checksum.c: Include zlib to get definition for crc32 Removed some old types mysys/default.c: Removed some old types Changed some string lengths to use size_t mysys/default_modify.c: Changed some string lengths to use size_t Removed some not needed casts mysys/hash.c: Removed some old types Changed some string lengths to use size_t Note: Prototype of hash_key() has changed which may cause problems if client uses hash_init() with a cast for the hash-get-key function. hash_element now takes 'ulong' as the index type (cleanup) mysys/list.c: Removed some old types mysys/mf_cache.c: Changed some string lengths to use size_t mysys/mf_dirname.c: Removed some old types Changed some string lengths to use size_t Added argument to dirname_part() to avoid calculation of length for 'to' mysys/mf_fn_ext.c: Removed some old types Updated parameters to dirname_part() mysys/mf_format.c: Removed some old types Changed some string lengths to use size_t mysys/mf_getdate.c: Removed some old types mysys/mf_iocache.c: Removed some old types Changed some string lengths to use size_t Changed calculation of 'max_length' to be done the same way in all functions mysys/mf_iocache2.c: Removed some old types Changed some string lengths to use size_t Clean up comments Removed not needed indentation mysys/mf_keycache.c: Removed some old types mysys/mf_keycaches.c: Removed some old types mysys/mf_loadpath.c: Removed some old types mysys/mf_pack.c: Removed some old types Changed some string lengths to use size_t Removed some not needed casts Removed very old VMS code Updated parameters to dirname_part() Use result of dirnam_part() to remove call to strcat() mysys/mf_path.c: Removed some old types mysys/mf_radix.c: Removed some old types mysys/mf_same.c: Removed some old types mysys/mf_sort.c: Removed some old types mysys/mf_soundex.c: Removed some old types mysys/mf_strip.c: Removed some old types mysys/mf_tempdir.c: Removed some old types mysys/mf_unixpath.c: Removed some old types mysys/mf_wfile.c: Removed some old types mysys/mulalloc.c: Removed some old types mysys/my_alloc.c: Removed some old types Changed some string lengths to use size_t Use void* as type for allocated memory area Removed some not needed casts Changed argument 'Size' to 'length' according coding guidelines mysys/my_chsize.c: Changed some buffers to be uchar* to avoid casts mysys/my_compress.c: More comments Removed some old types Changed string lengths to use size_t Changed arguments to my_uncompress() to make them easier to understand Changed packfrm()/unpackfrm() to not be depending on uint size (portability fix) Changed type of 'pack_data' argument to packfrm() to avoid casts. mysys/my_conio.c: Changed some string lengths to use size_t mysys/my_create.c: Removed some old types mysys/my_div.c: Removed some old types mysys/my_error.c: Removed some old types mysys/my_fopen.c: Removed some old types mysys/my_fstream.c: Removed some old types Changed some string lengths to use size_t writen -> written mysys/my_getopt.c: Removed some old types mysys/my_getwd.c: Removed some old types More comments mysys/my_init.c: Removed some old types mysys/my_largepage.c: Removed some old types Changed some string lengths to use size_t mysys/my_lib.c: Removed some old types mysys/my_lockmem.c: Removed some old types mysys/my_malloc.c: Removed some old types Changed malloc(), free() and related functions to use void * Changed all functions to use size_t mysys/my_memmem.c: Indentation cleanup mysys/my_once.c: Removed some old types Changed malloc(), free() and related functions to use void * mysys/my_open.c: Removed some old types mysys/my_pread.c: Removed some old types Changed all functions to use size_t Added comment for how my_pread() / my_pwrite() are supposed to work. Removed windows specific code to restore cursor position as this causes slowdown on windows and we should not mix read() and pread() calls anyway as this is not thread safe. (If we ever would really need this, it should be enabled only with a flag argument) mysys/my_quick.c: Removed some old types Changed all functions to use size_t mysys/my_read.c: Removed some old types Changed all functions to use size_t mysys/my_realloc.c: Removed some old types Use void* as type for allocated memory area Changed all functions to use size_t mysys/my_static.c: Removed some old types mysys/my_static.h: Removed some old types mysys/my_vle.c: Removed some old types mysys/my_wincond.c: Removed some old types mysys/my_windac.c: Removed some old types mysys/my_write.c: Removed some old types Changed all functions to use size_t mysys/ptr_cmp.c: Removed some old types Changed all functions to use size_t mysys/queues.c: Removed some old types mysys/safemalloc.c: Removed some old types Changed malloc(), free() and related functions to use void * Changed all functions to use size_t mysys/string.c: Removed some old types Changed all functions to use size_t mysys/testhash.c: Removed some old types mysys/thr_alarm.c: Removed some old types mysys/thr_lock.c: Removed some old types mysys/tree.c: Removed some old types mysys/trie.c: Removed some old types mysys/typelib.c: Removed some old types plugin/daemon_example/daemon_example.cc: Removed some old types regex/reginit.c: Removed some old types server-tools/instance-manager/buffer.cc: Changed some string lengths to use size_t Changed buffer to be of type uchar* server-tools/instance-manager/buffer.h: Changed some string lengths to use size_t Changed buffer to be of type uchar* server-tools/instance-manager/commands.cc: Removed some old types Changed some string lengths to use size_t Changed buffer to be of type uchar* server-tools/instance-manager/instance_map.cc: Removed some old types Changed some string lengths to use size_t Changed buffer to be of type uchar* server-tools/instance-manager/instance_options.cc: Changed buffer to be of type uchar* Replaced alloc_root + strcpy() with strdup_root() server-tools/instance-manager/mysql_connection.cc: Changed buffer to be of type uchar* server-tools/instance-manager/options.cc: Removed some old types server-tools/instance-manager/parse.cc: Changed some string lengths to use size_t server-tools/instance-manager/parse.h: Removed some old types Changed some string lengths to use size_t server-tools/instance-manager/protocol.cc: Changed some buffers to be uchar* to avoid casts Changed some string lengths to use size_t server-tools/instance-manager/protocol.h: Changed some string lengths to use size_t server-tools/instance-manager/user_map.cc: Removed some old types Changed some string lengths to use size_t sql/derror.cc: Removed some old types Changed some buffers to be uchar* to avoid casts Changed some string lengths to use size_t sql/discover.cc: Changed in readfrm() and writefrom() the type for argument 'frmdata' to uchar** to avoid casts Changed some string lengths to use size_t Changed some buffers to be uchar* to avoid casts sql/event_data_objects.cc: Removed some old types Added missing casts for alloc() and sprintf() sql/event_db_repository.cc: Changed some buffers to be uchar* to avoid casts Added missing casts for sprintf() sql/event_queue.cc: Removed some old types sql/field.cc: Removed some old types Changed memory buffers to be uchar* Changed some string lengths to use size_t Removed a lot of casts Safety fix in Field_blob::val_decimal() to not access zero pointer sql/field.h: Removed some old types Changed memory buffers to be uchar* (except of store() as this would have caused too many other changes). Changed some string lengths to use size_t Removed some not needed casts Changed val_xxx(xxx, new_ptr) to take const pointers sql/field_conv.cc: Removed some old types Added casts required because memory area pointers are now uchar* sql/filesort.cc: Initalize variable that was used unitialized in error conditions sql/gen_lex_hash.cc: Removed some old types Changed memory buffers to be uchar* Changed some string lengths to use size_t Removed a lot of casts Safety fix in Field_blob::val_decimal() to not access zero pointer sql/gstream.h: Added required cast sql/ha_ndbcluster.cc: Removed some old types Updated hash-get-key function arguments Changed some buffers to be uchar* to avoid casts Added required casts Removed some not needed casts sql/ha_ndbcluster.h: Removed some old types sql/ha_ndbcluster_binlog.cc: Removed some old types Changed some buffers to be uchar* to avoid casts Replaced sql_alloc() + memcpy() + set end 0 with sql_strmake() Changed some string lengths to use size_t Added missing casts for alloc() and sprintf() sql/ha_ndbcluster_binlog.h: Removed some old types sql/ha_ndbcluster_cond.cc: Removed some old types Removed some not needed casts sql/ha_ndbcluster_cond.h: Removed some old types sql/ha_partition.cc: Removed some old types Changed prototype for change_partition() to avoid casts sql/ha_partition.h: Removed some old types sql/handler.cc: Removed some old types Changed some string lengths to use size_t sql/handler.h: Removed some old types Changed some string lengths to use size_t Changed type for 'frmblob' parameter for discover() and ha_discover() to get fewer casts sql/hash_filo.h: Removed some old types Changed all functions to use size_t sql/hostname.cc: Removed some old types sql/item.cc: Removed some old types Changed some string lengths to use size_t Use strmake() instead of memdup() to create a null terminated string. Updated calls to new Field() sql/item.h: Removed some old types Changed malloc(), free() and related functions to use void * Changed some buffers to be uchar* to avoid casts sql/item_cmpfunc.cc: Removed some old types Changed some buffers to be uchar* to avoid casts sql/item_cmpfunc.h: Removed some old types sql/item_create.cc: Removed some old types sql/item_func.cc: Removed some old types Changed some buffers to be uchar* to avoid casts Removed some not needed casts Added test for failing alloc() in init_result_field() Remove old confusing comment Fixed compiler warning sql/item_func.h: Removed some old types sql/item_row.cc: Removed some old types sql/item_row.h: Removed some old types sql/item_strfunc.cc: Include zlib (needed becasue we call crc32) Removed some old types sql/item_strfunc.h: Removed some old types Changed some types to match new function prototypes sql/item_subselect.cc: Removed some old types sql/item_subselect.h: Removed some old types sql/item_sum.cc: Removed some old types Changed some buffers to be uchar* to avoid casts Removed some not needed casts sql/item_sum.h: Removed some old types sql/item_timefunc.cc: Removed some old types Changed some string lengths to use size_t sql/item_timefunc.h: Removed some old types sql/item_xmlfunc.cc: Changed some string lengths to use size_t sql/item_xmlfunc.h: Removed some old types sql/key.cc: Removed some old types Removed some not needed casts sql/lock.cc: Removed some old types Added some cast to my_multi_malloc() arguments for safety sql/log.cc: Removed some old types Changed some string lengths to use size_t Changed some buffers to be uchar* to avoid casts Changed usage of pwrite() to not assume it holds the cursor position for the file Made usage of my_read() safer sql/log_event.cc: Removed some old types Added checking of return value of malloc() in pack_info() Changed some buffers to be uchar* to avoid casts Removed some 'const' to avoid casts Added missing casts for alloc() and sprintf() Added required casts Removed some not needed casts Added some cast to my_multi_malloc() arguments for safety sql/log_event.h: Removed some old types Changed some buffers to be uchar* to avoid casts sql/log_event_old.cc: Changed some buffers to be uchar* to avoid casts Removed some not needed casts sql/log_event_old.h: Changed some buffers to be uchar* to avoid casts sql/mf_iocache.cc: Removed some old types sql/my_decimal.cc: Changed memory area to use uchar* sql/my_decimal.h: Changed memory area to use uchar* sql/mysql_priv.h: Removed some old types Changed malloc(), free() and related functions to use void * Changed some string lengths to use size_t Changed definition of MOD_PAD_CHAR_TO_FULL_LENGTH to avoid long overflow Changed some buffers to be uchar* to avoid casts sql/mysqld.cc: Removed some old types sql/net_serv.cc: Removed some old types Changed some string lengths to use size_t Changed some buffers to be uchar* to avoid casts Ensure that vio_read()/vio_write() return values are stored in a size_t variable Removed some not needed casts sql/opt_range.cc: Removed some old types Changed some buffers to be uchar* to avoid casts Removed some not needed casts sql/opt_range.h: Removed some old types Changed some buffers to be uchar* to avoid casts sql/opt_sum.cc: Removed some old types Removed some not needed casts sql/parse_file.cc: Removed some old types Changed some string lengths to use size_t Changed alloc_root + memcpy + set end 0 -> strmake_root() sql/parse_file.h: Removed some old types sql/partition_info.cc: Removed some old types Added missing casts for alloc() Changed some buffers to be uchar* to avoid casts sql/partition_info.h: Changed some buffers to be uchar* to avoid casts sql/protocol.cc: Removed some old types Changed some buffers to be uchar* to avoid casts Removed some not needed casts sql/protocol.h: Removed some old types Changed some buffers to be uchar* to avoid casts Changed some string lengths to use size_t sql/records.cc: Removed some old types sql/repl_failsafe.cc: Removed some old types Changed some string lengths to use size_t Added required casts sql/rpl_filter.cc: Removed some old types Updated hash-get-key function arguments Changed some string lengths to use size_t sql/rpl_filter.h: Changed some string lengths to use size_t sql/rpl_injector.h: Removed some old types sql/rpl_record.cc: Removed some old types Removed some not needed casts Changed some buffers to be uchar* to avoid casts sql/rpl_record.h: Removed some old types Changed some buffers to be uchar* to avoid casts sql/rpl_record_old.cc: Removed some old types Changed some buffers to be uchar* to avoid casts Removed some not needed casts sql/rpl_record_old.h: Removed some old types Changed some buffers to be uchar* to avoid cast sql/rpl_rli.cc: Removed some old types sql/rpl_tblmap.cc: Removed some old types sql/rpl_tblmap.h: Removed some old types sql/rpl_utility.cc: Removed some old types sql/rpl_utility.h: Removed some old types Changed type of m_size from my_size_t to ulong to reflect that m_size is the number of elements in the array, not a string/memory length sql/set_var.cc: Removed some old types Updated parameters to dirname_part() sql/set_var.h: Removed some old types sql/slave.cc: Removed some old types Changed some string lengths to use size_t sql/slave.h: Removed some old types sql/sp.cc: Removed some old types Added missing casts for printf() sql/sp.h: Removed some old types Updated hash-get-key function arguments sql/sp_cache.cc: Removed some old types Added missing casts for printf() Updated hash-get-key function arguments sql/sp_head.cc: Removed some old types Added missing casts for alloc() and printf() Added required casts Updated hash-get-key function arguments sql/sp_head.h: Removed some old types sql/sp_pcontext.cc: Removed some old types sql/sp_pcontext.h: Removed some old types sql/sql_acl.cc: Removed some old types Changed some string lengths to use size_t Changed some buffers to be uchar* to avoid casts Removed some not needed casts Added required casts sql/sql_analyse.cc: Changed some buffers to be uchar* to avoid casts sql/sql_analyse.h: Changed some buffers to be uchar* to avoid casts sql/sql_array.h: Removed some old types sql/sql_base.cc: Removed some old types Updated hash-get-key function arguments sql/sql_binlog.cc: Removed some old types Added missing casts for printf() sql/sql_cache.cc: Removed some old types Updated hash-get-key function arguments Removed some not needed casts Changed some string lengths to use size_t sql/sql_cache.h: Removed some old types Removed reference to not existing function cache_key() Updated hash-get-key function arguments sql/sql_class.cc: Removed some old types Updated hash-get-key function arguments Added missing casts for alloc() Updated hash-get-key function arguments Moved THD::max_row_length() to table.cc (as it's not depending on THD) Removed some not needed casts sql/sql_class.h: Removed some old types Changed malloc(), free() and related functions to use void * Removed some not needed casts Changed some string lengths to use size_t Moved max_row_length and max_row_length_blob() to table.cc, as they are not depending on THD sql/sql_connect.cc: Removed some old types Added required casts sql/sql_db.cc: Removed some old types Removed some not needed casts Added some cast to my_multi_malloc() arguments for safety Added missing casts for alloc() sql/sql_delete.cc: Removed some old types sql/sql_handler.cc: Removed some old types Updated hash-get-key function arguments Added some cast to my_multi_malloc() arguments for safety sql/sql_help.cc: Removed some old types Changed some buffers to be uchar* to avoid casts Removed some not needed casts sql/sql_insert.cc: Removed some old types Added missing casts for alloc() and printf() sql/sql_lex.cc: Removed some old types sql/sql_lex.h: Removed some old types Removed some not needed casts sql/sql_list.h: Removed some old types Removed some not needed casts sql/sql_load.cc: Removed some old types Removed compiler warning sql/sql_manager.cc: Removed some old types sql/sql_map.cc: Removed some old types sql/sql_map.h: Removed some old types sql/sql_olap.cc: Removed some old types sql/sql_parse.cc: Removed some old types Trivial move of code lines to make things more readable Changed some string lengths to use size_t Added missing casts for alloc() sql/sql_partition.cc: Removed some old types Removed compiler warnings about not used functions Changed some buffers to be uchar* to avoid casts Removed some not needed casts sql/sql_partition.h: Removed some old types Changed some buffers to be uchar* to avoid casts sql/sql_plugin.cc: Removed some old types Added missing casts for alloc() Updated hash-get-key function arguments sql/sql_prepare.cc: Removed some old types Changed some buffers to be uchar* to avoid casts Added missing casts for alloc() and printf() sql-common/client.c: Removed some old types Changed some memory areas to use uchar* sql-common/my_user.c: Changed some string lengths to use size_t sql-common/pack.c: Changed some buffers to be uchar* to avoid casts sql/sql_repl.cc: Added required casts Changed some buffers to be uchar* to avoid casts Changed some string lengths to use size_t sql/sql_select.cc: Removed some old types Changed some buffers to be uchar* to avoid casts Removed some old types sql/sql_select.h: Removed some old types Changed some buffers to be uchar* to avoid casts sql/sql_servers.cc: Removed some old types Updated hash-get-key function arguments sql/sql_show.cc: Removed some old types Added missing casts for alloc() Removed some not needed casts sql/sql_string.cc: Removed some old types Added required casts sql/sql_table.cc: Removed some old types Removed compiler warning about not used variable Changed some buffers to be uchar* to avoid casts Removed some not needed casts sql/sql_test.cc: Removed some old types sql/sql_trigger.cc: Removed some old types Added missing casts for alloc() sql/sql_udf.cc: Removed some old types Updated hash-get-key function arguments sql/sql_union.cc: Removed some old types sql/sql_update.cc: Removed some old types Removed some not needed casts sql/sql_view.cc: Removed some old types sql/sql_yacc.yy: Removed some old types Changed some string lengths to use size_t Added missing casts for alloc() sql/stacktrace.c: Removed some old types sql/stacktrace.h: Removed some old types sql/structs.h: Removed some old types sql/table.cc: Removed some old types Updated hash-get-key function arguments Changed some buffers to be uchar* to avoid casts Removed setting of LEX_STRING() arguments in declaration Added required casts More function comments Moved max_row_length() here from sql_class.cc/sql_class.h sql/table.h: Removed some old types Changed some string lengths to use size_t sql/thr_malloc.cc: Use void* as type for allocated memory area Changed all functions to use size_t sql/tzfile.h: Changed some buffers to be uchar* to avoid casts sql/tztime.cc: Changed some buffers to be uchar* to avoid casts Updated hash-get-key function arguments Added missing casts for alloc() Removed some not needed casts sql/uniques.cc: Removed some old types Removed some not needed casts sql/unireg.cc: Removed some old types Changed some buffers to be uchar* to avoid casts Removed some not needed casts Added missing casts for alloc() storage/archive/archive_reader.c: Removed some old types storage/archive/azio.c: Removed some old types Removed some not needed casts storage/archive/ha_archive.cc: Removed some old types Changed type for 'frmblob' in archive_discover() to match handler Updated hash-get-key function arguments Removed some not needed casts storage/archive/ha_archive.h: Removed some old types storage/blackhole/ha_blackhole.cc: Removed some old types storage/blackhole/ha_blackhole.h: Removed some old types storage/csv/ha_tina.cc: Removed some old types Updated hash-get-key function arguments Changed some buffers to be uchar* to avoid casts storage/csv/ha_tina.h: Removed some old types Removed some not needed casts storage/csv/transparent_file.cc: Removed some old types Changed type of 'bytes_read' to be able to detect read errors Fixed indentation storage/csv/transparent_file.h: Removed some old types storage/example/ha_example.cc: Removed some old types Updated hash-get-key function arguments storage/example/ha_example.h: Removed some old types storage/federated/ha_federated.cc: Removed some old types Updated hash-get-key function arguments Removed some not needed casts storage/federated/ha_federated.h: Removed some old types storage/heap/_check.c: Changed some buffers to be uchar* to avoid casts storage/heap/_rectest.c: Removed some old types storage/heap/ha_heap.cc: Removed some old types storage/heap/ha_heap.h: Removed some old types storage/heap/heapdef.h: Removed some old types storage/heap/hp_block.c: Removed some old types Changed some string lengths to use size_t storage/heap/hp_clear.c: Removed some old types storage/heap/hp_close.c: Removed some old types storage/heap/hp_create.c: Removed some old types storage/heap/hp_delete.c: Removed some old types storage/heap/hp_hash.c: Removed some old types storage/heap/hp_info.c: Removed some old types storage/heap/hp_open.c: Removed some old types storage/heap/hp_rfirst.c: Removed some old types storage/heap/hp_rkey.c: Removed some old types storage/heap/hp_rlast.c: Removed some old types storage/heap/hp_rnext.c: Removed some old types storage/heap/hp_rprev.c: Removed some old types storage/heap/hp_rrnd.c: Removed some old types storage/heap/hp_rsame.c: Removed some old types storage/heap/hp_scan.c: Removed some old types storage/heap/hp_test1.c: Removed some old types storage/heap/hp_test2.c: Removed some old types storage/heap/hp_update.c: Removed some old types storage/heap/hp_write.c: Removed some old types Changed some string lengths to use size_t storage/innobase/handler/ha_innodb.cc: Removed some old types Updated hash-get-key function arguments Added missing casts for alloc() and printf() Removed some not needed casts storage/innobase/handler/ha_innodb.h: Removed some old types storage/myisam/ft_boolean_search.c: Removed some old types storage/myisam/ft_nlq_search.c: Removed some old types storage/myisam/ft_parser.c: Removed some old types Changed some buffers to be uchar* to avoid casts storage/myisam/ft_static.c: Removed some old types storage/myisam/ft_stopwords.c: Removed some old types storage/myisam/ft_update.c: Removed some old types Changed some buffers to be uchar* to avoid casts storage/myisam/ftdefs.h: Removed some old types Changed some buffers to be uchar* to avoid casts storage/myisam/fulltext.h: Removed some old types storage/myisam/ha_myisam.cc: Removed some old types storage/myisam/ha_myisam.h: Removed some old types storage/myisam/mi_cache.c: Removed some old types Changed some buffers to be uchar* to avoid casts storage/myisam/mi_check.c: Removed some old types storage/myisam/mi_checksum.c: Removed some old types storage/myisam/mi_close.c: Removed some old types storage/myisam/mi_create.c: Removed some old types storage/myisam/mi_delete.c: Removed some old types storage/myisam/mi_delete_all.c: Removed some old types storage/myisam/mi_dynrec.c: Removed some old types storage/myisam/mi_extra.c: Removed some old types storage/myisam/mi_key.c: Removed some old types storage/myisam/mi_locking.c: Removed some old types storage/myisam/mi_log.c: Removed some old types storage/myisam/mi_open.c: Removed some old types Removed some not needed casts Check argument of my_write()/my_pwrite() in functions returning int Added casting of string lengths to size_t storage/myisam/mi_packrec.c: Removed some old types Changed some buffers to be uchar* to avoid casts storage/myisam/mi_page.c: Removed some old types storage/myisam/mi_preload.c: Removed some old types storage/myisam/mi_range.c: Removed some old types storage/myisam/mi_rfirst.c: Removed some old types storage/myisam/mi_rkey.c: Removed some old types storage/myisam/mi_rlast.c: Removed some old types storage/myisam/mi_rnext.c: Removed some old types storage/myisam/mi_rnext_same.c: Removed some old types storage/myisam/mi_rprev.c: Removed some old types storage/myisam/mi_rrnd.c: Removed some old types storage/myisam/mi_rsame.c: Removed some old types storage/myisam/mi_rsamepos.c: Removed some old types storage/myisam/mi_scan.c: Removed some old types storage/myisam/mi_search.c: Removed some old types storage/myisam/mi_static.c: Removed some old types storage/myisam/mi_statrec.c: Removed some old types storage/myisam/mi_test1.c: Removed some old types storage/myisam/mi_test2.c: Removed some old types storage/myisam/mi_test3.c: Removed some old types storage/myisam/mi_unique.c: Removed some old types storage/myisam/mi_update.c: Removed some old types storage/myisam/mi_write.c: Removed some old types storage/myisam/myisam_ftdump.c: Removed some old types storage/myisam/myisamchk.c: Removed some old types storage/myisam/myisamdef.h: Removed some old types storage/myisam/myisamlog.c: Removed some old types Indentation fix storage/myisam/myisampack.c: Removed some old types storage/myisam/rt_index.c: Removed some old types storage/myisam/rt_split.c: Removed some old types storage/myisam/sort.c: Removed some old types storage/myisam/sp_defs.h: Removed some old types storage/myisam/sp_key.c: Removed some old types storage/myisammrg/ha_myisammrg.cc: Removed some old types storage/myisammrg/ha_myisammrg.h: Removed some old types storage/myisammrg/myrg_close.c: Removed some old types storage/myisammrg/myrg_def.h: Removed some old types storage/myisammrg/myrg_delete.c: Removed some old types storage/myisammrg/myrg_open.c: Removed some old types Updated parameters to dirname_part() storage/myisammrg/myrg_queue.c: Removed some old types storage/myisammrg/myrg_rfirst.c: Removed some old types storage/myisammrg/myrg_rkey.c: Removed some old types storage/myisammrg/myrg_rlast.c: Removed some old types storage/myisammrg/myrg_rnext.c: Removed some old types storage/myisammrg/myrg_rnext_same.c: Removed some old types storage/myisammrg/myrg_rprev.c: Removed some old types storage/myisammrg/myrg_rrnd.c: Removed some old types storage/myisammrg/myrg_rsame.c: Removed some old types storage/myisammrg/myrg_update.c: Removed some old types storage/myisammrg/myrg_write.c: Removed some old types storage/ndb/include/util/ndb_opts.h: Removed some old types storage/ndb/src/cw/cpcd/main.cpp: Removed some old types storage/ndb/src/kernel/vm/Configuration.cpp: Removed some old types storage/ndb/src/mgmclient/main.cpp: Removed some old types storage/ndb/src/mgmsrv/InitConfigFileParser.cpp: Removed some old types Removed old disabled code storage/ndb/src/mgmsrv/main.cpp: Removed some old types storage/ndb/src/ndbapi/NdbBlob.cpp: Removed some old types storage/ndb/src/ndbapi/NdbOperationDefine.cpp: Removed not used variable storage/ndb/src/ndbapi/NdbOperationInt.cpp: Added required casts storage/ndb/src/ndbapi/NdbScanOperation.cpp: Added required casts storage/ndb/tools/delete_all.cpp: Removed some old types storage/ndb/tools/desc.cpp: Removed some old types storage/ndb/tools/drop_index.cpp: Removed some old types storage/ndb/tools/drop_tab.cpp: Removed some old types storage/ndb/tools/listTables.cpp: Removed some old types storage/ndb/tools/ndb_config.cpp: Removed some old types storage/ndb/tools/restore/consumer_restore.cpp: Changed some buffers to be uchar* to avoid casts with new defintion of packfrm() storage/ndb/tools/restore/restore_main.cpp: Removed some old types storage/ndb/tools/select_all.cpp: Removed some old types storage/ndb/tools/select_count.cpp: Removed some old types storage/ndb/tools/waiter.cpp: Removed some old types strings/bchange.c: Changed function to use uchar * and size_t strings/bcmp.c: Changed function to use uchar * and size_t strings/bmove512.c: Changed function to use uchar * and size_t strings/bmove_upp.c: Changed function to use uchar * and size_t strings/ctype-big5.c: Changed functions to use size_t Changed character length functions to return uint strings/ctype-bin.c: Changed functions to use size_t strings/ctype-cp932.c: Changed functions to use size_t Changed character length functions to return uint strings/ctype-czech.c: Fixed indentation Changed functions to use size_t strings/ctype-euc_kr.c: Changed functions to use size_t Changed character length functions to return uint strings/ctype-eucjpms.c: Changed functions to use size_t Changed character length functions to return uint unsigned char -> uchar strings/ctype-gb2312.c: Changed functions to use size_t Changed character length functions to return uint strings/ctype-gbk.c: Changed functions to use size_t Changed character length functions to return uint strings/ctype-latin1.c: Changed functions to use size_t Changed character length functions to return uint unsigned char -> uchar strings/ctype-mb.c: Changed functions to use size_t Changed character length functions to return uint strings/ctype-simple.c: Changed functions to use size_t Simpler loops for caseup/casedown unsigned int -> uint unsigned char -> uchar strings/ctype-sjis.c: Changed functions to use size_t Changed character length functions to return uint strings/ctype-tis620.c: Changed functions to use size_t Changed character length functions to return uint unsigned char -> uchar strings/ctype-uca.c: Changed functions to use size_t unsigned char -> uchar strings/ctype-ucs2.c: Moved inclusion of stdarg.h to other includes usigned char -> uchar Changed functions to use size_t Changed character length functions to return uint strings/ctype-ujis.c: Changed functions to use size_t Changed character length functions to return uint unsigned char -> uchar strings/ctype-utf8.c: Changed functions to use size_t unsigned char -> uchar Indentation fixes strings/ctype-win1250ch.c: Indentation fixes Changed functions to use size_t strings/ctype.c: Changed functions to use size_t strings/decimal.c: Changed type for memory argument to uchar * strings/do_ctype.c: Indentation fixes strings/my_strtoll10.c: unsigned char -> uchar strings/my_vsnprintf.c: Changed functions to use size_t strings/r_strinstr.c: Removed some old types Changed functions to use size_t strings/str_test.c: Removed some old types strings/strappend.c: Changed functions to use size_t strings/strcont.c: Removed some old types strings/strfill.c: Removed some old types strings/strinstr.c: Changed functions to use size_t strings/strlen.c: Changed functions to use size_t strings/strmake.c: Changed functions to use size_t strings/strnlen.c: Changed functions to use size_t strings/strnmov.c: Changed functions to use size_t strings/strto.c: unsigned char -> uchar strings/strtod.c: Changed functions to use size_t strings/strxnmov.c: Changed functions to use size_t strings/xml.c: Changed functions to use size_t Indentation fixes tests/mysql_client_test.c: Removed some old types tests/thread_test.c: Removed some old types vio/test-ssl.c: Removed some old types vio/test-sslclient.c: Removed some old types vio/test-sslserver.c: Removed some old types vio/vio.c: Removed some old types vio/vio_priv.h: Removed some old types Changed vio_read()/vio_write() to work with size_t vio/viosocket.c: Changed vio_read()/vio_write() to work with size_t Indentation fixes vio/viossl.c: Changed vio_read()/vio_write() to work with size_t Indentation fixes vio/viosslfactories.c: Removed some old types vio/viotest-ssl.c: Removed some old types win/README: More explanations
1046 lines
33 KiB
C
1046 lines
33 KiB
C
/* Copyright (C) 2000-2006 MySQL 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 */
|
|
|
|
/* Write a row to a MyISAM table */
|
|
|
|
#include "fulltext.h"
|
|
#include "rt_index.h"
|
|
|
|
#define MAX_POINTER_LENGTH 8
|
|
|
|
/* Functions declared in this file */
|
|
|
|
static int w_search(MI_INFO *info,MI_KEYDEF *keyinfo,
|
|
uint comp_flag, uchar *key,
|
|
uint key_length, my_off_t pos, uchar *father_buff,
|
|
uchar *father_keypos, my_off_t father_page,
|
|
my_bool insert_last);
|
|
static int _mi_balance_page(MI_INFO *info,MI_KEYDEF *keyinfo,uchar *key,
|
|
uchar *curr_buff,uchar *father_buff,
|
|
uchar *father_keypos,my_off_t father_page);
|
|
static uchar *_mi_find_last_pos(MI_KEYDEF *keyinfo, uchar *page,
|
|
uchar *key, uint *return_key_length,
|
|
uchar **after_key);
|
|
int _mi_ck_write_tree(register MI_INFO *info, uint keynr,uchar *key,
|
|
uint key_length);
|
|
int _mi_ck_write_btree(register MI_INFO *info, uint keynr,uchar *key,
|
|
uint key_length);
|
|
|
|
/* Write new record to database */
|
|
|
|
int mi_write(MI_INFO *info, uchar *record)
|
|
{
|
|
MYISAM_SHARE *share=info->s;
|
|
uint i;
|
|
int save_errno;
|
|
my_off_t filepos;
|
|
uchar *buff;
|
|
my_bool lock_tree= share->concurrent_insert;
|
|
DBUG_ENTER("mi_write");
|
|
DBUG_PRINT("enter",("isam: %d data: %d",info->s->kfile,info->dfile));
|
|
|
|
DBUG_EXECUTE_IF("myisam_pretend_crashed_table_on_usage",
|
|
mi_print_error(info->s, HA_ERR_CRASHED);
|
|
DBUG_RETURN(my_errno= HA_ERR_CRASHED););
|
|
if (share->options & HA_OPTION_READ_ONLY_DATA)
|
|
{
|
|
DBUG_RETURN(my_errno=EACCES);
|
|
}
|
|
if (_mi_readinfo(info,F_WRLCK,1))
|
|
DBUG_RETURN(my_errno);
|
|
dont_break(); /* Dont allow SIGHUP or SIGINT */
|
|
#if !defined(NO_LOCKING) && defined(USE_RECORD_LOCK)
|
|
if (!info->locked && my_lock(info->dfile,F_WRLCK,0L,F_TO_EOF,
|
|
MYF(MY_SEEK_NOT_DONE) | info->lock_wait))
|
|
goto err;
|
|
#endif
|
|
filepos= ((share->state.dellink != HA_OFFSET_ERROR &&
|
|
!info->append_insert_at_end) ?
|
|
share->state.dellink :
|
|
info->state->data_file_length);
|
|
|
|
if (share->base.reloc == (ha_rows) 1 &&
|
|
share->base.records == (ha_rows) 1 &&
|
|
info->state->records == (ha_rows) 1)
|
|
{ /* System file */
|
|
my_errno=HA_ERR_RECORD_FILE_FULL;
|
|
goto err2;
|
|
}
|
|
if (info->state->key_file_length >= share->base.margin_key_file_length)
|
|
{
|
|
my_errno=HA_ERR_INDEX_FILE_FULL;
|
|
goto err2;
|
|
}
|
|
if (_mi_mark_file_changed(info))
|
|
goto err2;
|
|
|
|
/* Calculate and check all unique constraints */
|
|
for (i=0 ; i < share->state.header.uniques ; i++)
|
|
{
|
|
if (mi_check_unique(info,share->uniqueinfo+i,record,
|
|
mi_unique_hash(share->uniqueinfo+i,record),
|
|
HA_OFFSET_ERROR))
|
|
goto err2;
|
|
}
|
|
|
|
/* Write all keys to indextree */
|
|
|
|
buff=info->lastkey2;
|
|
for (i=0 ; i < share->base.keys ; i++)
|
|
{
|
|
if (mi_is_key_active(share->state.key_map, i))
|
|
{
|
|
bool local_lock_tree= (lock_tree &&
|
|
!(info->bulk_insert &&
|
|
is_tree_inited(&info->bulk_insert[i])));
|
|
if (local_lock_tree)
|
|
{
|
|
rw_wrlock(&share->key_root_lock[i]);
|
|
share->keyinfo[i].version++;
|
|
}
|
|
if (share->keyinfo[i].flag & HA_FULLTEXT )
|
|
{
|
|
if (_mi_ft_add(info,i,(char*) buff,record,filepos))
|
|
{
|
|
if (local_lock_tree)
|
|
rw_unlock(&share->key_root_lock[i]);
|
|
DBUG_PRINT("error",("Got error: %d on write",my_errno));
|
|
goto err;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
if (share->keyinfo[i].ck_insert(info,i,buff,
|
|
_mi_make_key(info,i,buff,record,filepos)))
|
|
{
|
|
if (local_lock_tree)
|
|
rw_unlock(&share->key_root_lock[i]);
|
|
DBUG_PRINT("error",("Got error: %d on write",my_errno));
|
|
goto err;
|
|
}
|
|
}
|
|
|
|
/* The above changed info->lastkey2. Inform mi_rnext_same(). */
|
|
info->update&= ~HA_STATE_RNEXT_SAME;
|
|
|
|
if (local_lock_tree)
|
|
rw_unlock(&share->key_root_lock[i]);
|
|
}
|
|
}
|
|
if (share->calc_checksum)
|
|
info->checksum=(*share->calc_checksum)(info,record);
|
|
if (!(info->opt_flag & OPT_NO_ROWS))
|
|
{
|
|
if ((*share->write_record)(info,record))
|
|
goto err;
|
|
info->state->checksum+=info->checksum;
|
|
}
|
|
if (share->base.auto_key)
|
|
set_if_bigger(info->s->state.auto_increment,
|
|
retrieve_auto_increment(info, record));
|
|
info->update= (HA_STATE_CHANGED | HA_STATE_AKTIV | HA_STATE_WRITTEN |
|
|
HA_STATE_ROW_CHANGED);
|
|
info->state->records++;
|
|
info->lastpos=filepos;
|
|
myisam_log_record(MI_LOG_WRITE,info,record,filepos,0);
|
|
VOID(_mi_writeinfo(info, WRITEINFO_UPDATE_KEYFILE));
|
|
if (info->invalidator != 0)
|
|
{
|
|
DBUG_PRINT("info", ("invalidator... '%s' (update)", info->filename));
|
|
(*info->invalidator)(info->filename);
|
|
info->invalidator=0;
|
|
}
|
|
|
|
/*
|
|
Update status of the table. We need to do so after each row write
|
|
for the log tables, as we want the new row to become visible to
|
|
other threads as soon as possible. We don't lock mutex here
|
|
(as it is required by pthread memory visibility rules) as (1) it's
|
|
not critical to use outdated share->is_log_table value (2) locking
|
|
mutex here for every write is too expensive.
|
|
*/
|
|
if (share->is_log_table)
|
|
mi_update_status((void*) info);
|
|
|
|
allow_break(); /* Allow SIGHUP & SIGINT */
|
|
DBUG_RETURN(0);
|
|
|
|
err:
|
|
save_errno=my_errno;
|
|
if (my_errno == HA_ERR_FOUND_DUPP_KEY || my_errno == HA_ERR_RECORD_FILE_FULL ||
|
|
my_errno == HA_ERR_NULL_IN_SPATIAL || my_errno == HA_ERR_OUT_OF_MEM)
|
|
{
|
|
if (info->bulk_insert)
|
|
{
|
|
uint j;
|
|
for (j=0 ; j < share->base.keys ; j++)
|
|
mi_flush_bulk_insert(info, j);
|
|
}
|
|
info->errkey= (int) i;
|
|
while ( i-- > 0)
|
|
{
|
|
if (mi_is_key_active(share->state.key_map, i))
|
|
{
|
|
bool local_lock_tree= (lock_tree &&
|
|
!(info->bulk_insert &&
|
|
is_tree_inited(&info->bulk_insert[i])));
|
|
if (local_lock_tree)
|
|
rw_wrlock(&share->key_root_lock[i]);
|
|
if (share->keyinfo[i].flag & HA_FULLTEXT)
|
|
{
|
|
if (_mi_ft_del(info,i,(char*) buff,record,filepos))
|
|
{
|
|
if (local_lock_tree)
|
|
rw_unlock(&share->key_root_lock[i]);
|
|
break;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
uint key_length=_mi_make_key(info,i,buff,record,filepos);
|
|
if (_mi_ck_delete(info,i,buff,key_length))
|
|
{
|
|
if (local_lock_tree)
|
|
rw_unlock(&share->key_root_lock[i]);
|
|
break;
|
|
}
|
|
}
|
|
if (local_lock_tree)
|
|
rw_unlock(&share->key_root_lock[i]);
|
|
}
|
|
}
|
|
}
|
|
else
|
|
{
|
|
mi_print_error(info->s, HA_ERR_CRASHED);
|
|
mi_mark_crashed(info);
|
|
}
|
|
info->update= (HA_STATE_CHANGED | HA_STATE_WRITTEN | HA_STATE_ROW_CHANGED);
|
|
my_errno=save_errno;
|
|
err2:
|
|
save_errno=my_errno;
|
|
myisam_log_record(MI_LOG_WRITE,info,record,filepos,my_errno);
|
|
VOID(_mi_writeinfo(info,WRITEINFO_UPDATE_KEYFILE));
|
|
allow_break(); /* Allow SIGHUP & SIGINT */
|
|
DBUG_RETURN(my_errno=save_errno);
|
|
} /* mi_write */
|
|
|
|
|
|
/* Write one key to btree */
|
|
|
|
int _mi_ck_write(MI_INFO *info, uint keynr, uchar *key, uint key_length)
|
|
{
|
|
DBUG_ENTER("_mi_ck_write");
|
|
|
|
if (info->bulk_insert && is_tree_inited(&info->bulk_insert[keynr]))
|
|
{
|
|
DBUG_RETURN(_mi_ck_write_tree(info, keynr, key, key_length));
|
|
}
|
|
else
|
|
{
|
|
DBUG_RETURN(_mi_ck_write_btree(info, keynr, key, key_length));
|
|
}
|
|
} /* _mi_ck_write */
|
|
|
|
|
|
/**********************************************************************
|
|
* Normal insert code *
|
|
**********************************************************************/
|
|
|
|
int _mi_ck_write_btree(register MI_INFO *info, uint keynr, uchar *key,
|
|
uint key_length)
|
|
{
|
|
int error;
|
|
uint comp_flag;
|
|
MI_KEYDEF *keyinfo=info->s->keyinfo+keynr;
|
|
my_off_t *root=&info->s->state.key_root[keynr];
|
|
DBUG_ENTER("_mi_ck_write_btree");
|
|
|
|
if (keyinfo->flag & HA_SORT_ALLOWS_SAME)
|
|
comp_flag=SEARCH_BIGGER; /* Put after same key */
|
|
else if (keyinfo->flag & (HA_NOSAME|HA_FULLTEXT))
|
|
{
|
|
comp_flag=SEARCH_FIND | SEARCH_UPDATE; /* No duplicates */
|
|
if (keyinfo->flag & HA_NULL_ARE_EQUAL)
|
|
comp_flag|= SEARCH_NULL_ARE_EQUAL;
|
|
}
|
|
else
|
|
comp_flag=SEARCH_SAME; /* Keys in rec-pos order */
|
|
|
|
error=_mi_ck_real_write_btree(info, keyinfo, key, key_length,
|
|
root, comp_flag);
|
|
if (info->ft1_to_ft2)
|
|
{
|
|
if (!error)
|
|
error= _mi_ft_convert_to_ft2(info, keynr, key);
|
|
delete_dynamic(info->ft1_to_ft2);
|
|
my_free((uchar*)info->ft1_to_ft2, MYF(0));
|
|
info->ft1_to_ft2=0;
|
|
}
|
|
DBUG_RETURN(error);
|
|
} /* _mi_ck_write_btree */
|
|
|
|
int _mi_ck_real_write_btree(MI_INFO *info, MI_KEYDEF *keyinfo,
|
|
uchar *key, uint key_length, my_off_t *root, uint comp_flag)
|
|
{
|
|
int error;
|
|
DBUG_ENTER("_mi_ck_real_write_btree");
|
|
/* key_length parameter is used only if comp_flag is SEARCH_FIND */
|
|
if (*root == HA_OFFSET_ERROR ||
|
|
(error=w_search(info, keyinfo, comp_flag, key, key_length,
|
|
*root, (uchar *) 0, (uchar*) 0,
|
|
(my_off_t) 0, 1)) > 0)
|
|
error=_mi_enlarge_root(info,keyinfo,key,root);
|
|
DBUG_RETURN(error);
|
|
} /* _mi_ck_real_write_btree */
|
|
|
|
|
|
/* Make a new root with key as only pointer */
|
|
|
|
int _mi_enlarge_root(MI_INFO *info, MI_KEYDEF *keyinfo, uchar *key,
|
|
my_off_t *root)
|
|
{
|
|
uint t_length,nod_flag;
|
|
MI_KEY_PARAM s_temp;
|
|
MYISAM_SHARE *share=info->s;
|
|
DBUG_ENTER("_mi_enlarge_root");
|
|
|
|
nod_flag= (*root != HA_OFFSET_ERROR) ? share->base.key_reflength : 0;
|
|
_mi_kpointer(info,info->buff+2,*root); /* if nod */
|
|
t_length=(*keyinfo->pack_key)(keyinfo,nod_flag,(uchar*) 0,
|
|
(uchar*) 0, (uchar*) 0, key,&s_temp);
|
|
mi_putint(info->buff,t_length+2+nod_flag,nod_flag);
|
|
(*keyinfo->store_key)(keyinfo,info->buff+2+nod_flag,&s_temp);
|
|
info->buff_used=info->page_changed=1; /* info->buff is used */
|
|
if ((*root= _mi_new(info,keyinfo,DFLT_INIT_HITS)) == HA_OFFSET_ERROR ||
|
|
_mi_write_keypage(info,keyinfo,*root,DFLT_INIT_HITS,info->buff))
|
|
DBUG_RETURN(-1);
|
|
DBUG_RETURN(0);
|
|
} /* _mi_enlarge_root */
|
|
|
|
|
|
/*
|
|
Search after a position for a key and store it there
|
|
Returns -1 = error
|
|
0 = ok
|
|
1 = key should be stored in higher tree
|
|
*/
|
|
|
|
static int w_search(register MI_INFO *info, register MI_KEYDEF *keyinfo,
|
|
uint comp_flag, uchar *key, uint key_length, my_off_t page,
|
|
uchar *father_buff, uchar *father_keypos,
|
|
my_off_t father_page, my_bool insert_last)
|
|
{
|
|
int error,flag;
|
|
uint nod_flag, search_key_length;
|
|
uchar *temp_buff,*keypos;
|
|
uchar keybuff[MI_MAX_KEY_BUFF];
|
|
my_bool was_last_key;
|
|
my_off_t next_page, dupp_key_pos;
|
|
DBUG_ENTER("w_search");
|
|
DBUG_PRINT("enter",("page: %ld", (long) page));
|
|
|
|
search_key_length= (comp_flag & SEARCH_FIND) ? key_length : USE_WHOLE_KEY;
|
|
if (!(temp_buff= (uchar*) my_alloca((uint) keyinfo->block_length+
|
|
MI_MAX_KEY_BUFF*2)))
|
|
DBUG_RETURN(-1);
|
|
if (!_mi_fetch_keypage(info,keyinfo,page,DFLT_INIT_HITS,temp_buff,0))
|
|
goto err;
|
|
|
|
flag=(*keyinfo->bin_search)(info,keyinfo,temp_buff,key,search_key_length,
|
|
comp_flag, &keypos, keybuff, &was_last_key);
|
|
nod_flag=mi_test_if_nod(temp_buff);
|
|
if (flag == 0)
|
|
{
|
|
uint tmp_key_length;
|
|
/* get position to record with duplicated key */
|
|
tmp_key_length=(*keyinfo->get_key)(keyinfo,nod_flag,&keypos,keybuff);
|
|
if (tmp_key_length)
|
|
dupp_key_pos=_mi_dpos(info,0,keybuff+tmp_key_length);
|
|
else
|
|
dupp_key_pos= HA_OFFSET_ERROR;
|
|
|
|
if (keyinfo->flag & HA_FULLTEXT)
|
|
{
|
|
uint off;
|
|
int subkeys;
|
|
|
|
get_key_full_length_rdonly(off, keybuff);
|
|
subkeys=ft_sintXkorr(keybuff+off);
|
|
comp_flag=SEARCH_SAME;
|
|
if (subkeys >= 0)
|
|
{
|
|
/* normal word, one-level tree structure */
|
|
flag=(*keyinfo->bin_search)(info, keyinfo, temp_buff, key,
|
|
USE_WHOLE_KEY, comp_flag,
|
|
&keypos, keybuff, &was_last_key);
|
|
}
|
|
else
|
|
{
|
|
/* popular word. two-level tree. going down */
|
|
my_off_t root=dupp_key_pos;
|
|
keyinfo=&info->s->ft2_keyinfo;
|
|
get_key_full_length_rdonly(off, key);
|
|
key+=off;
|
|
keypos-=keyinfo->keylength+nod_flag; /* we'll modify key entry 'in vivo' */
|
|
error=_mi_ck_real_write_btree(info, keyinfo, key, 0,
|
|
&root, comp_flag);
|
|
_mi_dpointer(info, keypos+HA_FT_WLEN, root);
|
|
subkeys--; /* should there be underflow protection ? */
|
|
DBUG_ASSERT(subkeys < 0);
|
|
ft_intXstore(keypos, subkeys);
|
|
if (!error)
|
|
error=_mi_write_keypage(info,keyinfo,page,DFLT_INIT_HITS,temp_buff);
|
|
my_afree((uchar*) temp_buff);
|
|
DBUG_RETURN(error);
|
|
}
|
|
}
|
|
else /* not HA_FULLTEXT, normal HA_NOSAME key */
|
|
{
|
|
info->dupp_key_pos= dupp_key_pos;
|
|
my_afree((uchar*) temp_buff);
|
|
my_errno=HA_ERR_FOUND_DUPP_KEY;
|
|
DBUG_RETURN(-1);
|
|
}
|
|
}
|
|
if (flag == MI_FOUND_WRONG_KEY)
|
|
DBUG_RETURN(-1);
|
|
if (!was_last_key)
|
|
insert_last=0;
|
|
next_page=_mi_kpos(nod_flag,keypos);
|
|
if (next_page == HA_OFFSET_ERROR ||
|
|
(error=w_search(info, keyinfo, comp_flag, key, key_length, next_page,
|
|
temp_buff, keypos, page, insert_last)) >0)
|
|
{
|
|
error=_mi_insert(info,keyinfo,key,temp_buff,keypos,keybuff,father_buff,
|
|
father_keypos,father_page, insert_last);
|
|
if (_mi_write_keypage(info,keyinfo,page,DFLT_INIT_HITS,temp_buff))
|
|
goto err;
|
|
}
|
|
my_afree((uchar*) temp_buff);
|
|
DBUG_RETURN(error);
|
|
err:
|
|
my_afree((uchar*) temp_buff);
|
|
DBUG_PRINT("exit",("Error: %d",my_errno));
|
|
DBUG_RETURN (-1);
|
|
} /* w_search */
|
|
|
|
|
|
/*
|
|
Insert new key.
|
|
|
|
SYNOPSIS
|
|
_mi_insert()
|
|
info Open table information.
|
|
keyinfo Key definition information.
|
|
key New key.
|
|
anc_buff Key page (beginning).
|
|
key_pos Position in key page where to insert.
|
|
key_buff Copy of previous key.
|
|
father_buff parent key page for balancing.
|
|
father_key_pos position in parent key page for balancing.
|
|
father_page position of parent key page in file.
|
|
insert_last If to append at end of page.
|
|
|
|
DESCRIPTION
|
|
Insert new key at right of key_pos.
|
|
|
|
RETURN
|
|
2 if key contains key to upper level.
|
|
0 OK.
|
|
< 0 Error.
|
|
*/
|
|
|
|
int _mi_insert(register MI_INFO *info, register MI_KEYDEF *keyinfo,
|
|
uchar *key, uchar *anc_buff, uchar *key_pos, uchar *key_buff,
|
|
uchar *father_buff, uchar *father_key_pos, my_off_t father_page,
|
|
my_bool insert_last)
|
|
{
|
|
uint a_length,nod_flag;
|
|
int t_length;
|
|
uchar *endpos, *prev_key;
|
|
MI_KEY_PARAM s_temp;
|
|
DBUG_ENTER("_mi_insert");
|
|
DBUG_PRINT("enter",("key_pos: 0x%lx", (long) key_pos));
|
|
DBUG_EXECUTE("key",_mi_print_key(DBUG_FILE,keyinfo->seg,key,USE_WHOLE_KEY););
|
|
|
|
nod_flag=mi_test_if_nod(anc_buff);
|
|
a_length=mi_getint(anc_buff);
|
|
endpos= anc_buff+ a_length;
|
|
prev_key=(key_pos == anc_buff+2+nod_flag ? (uchar*) 0 : key_buff);
|
|
t_length=(*keyinfo->pack_key)(keyinfo,nod_flag,
|
|
(key_pos == endpos ? (uchar*) 0 : key_pos),
|
|
prev_key, prev_key,
|
|
key,&s_temp);
|
|
#ifndef DBUG_OFF
|
|
if (key_pos != anc_buff+2+nod_flag && (keyinfo->flag &
|
|
(HA_BINARY_PACK_KEY | HA_PACK_KEY)))
|
|
{
|
|
DBUG_DUMP("prev_key",(uchar*) key_buff,_mi_keylength(keyinfo,key_buff));
|
|
}
|
|
if (keyinfo->flag & HA_PACK_KEY)
|
|
{
|
|
DBUG_PRINT("test",("t_length: %d ref_len: %d",
|
|
t_length,s_temp.ref_length));
|
|
DBUG_PRINT("test",("n_ref_len: %d n_length: %d key_pos: 0x%lx",
|
|
s_temp.n_ref_length,s_temp.n_length, (long) s_temp.key));
|
|
}
|
|
#endif
|
|
if (t_length > 0)
|
|
{
|
|
if (t_length >= keyinfo->maxlength*2+MAX_POINTER_LENGTH)
|
|
{
|
|
mi_print_error(info->s, HA_ERR_CRASHED);
|
|
my_errno=HA_ERR_CRASHED;
|
|
DBUG_RETURN(-1);
|
|
}
|
|
bmove_upp((uchar*) endpos+t_length,(uchar*) endpos,(uint) (endpos-key_pos));
|
|
}
|
|
else
|
|
{
|
|
if (-t_length >= keyinfo->maxlength*2+MAX_POINTER_LENGTH)
|
|
{
|
|
mi_print_error(info->s, HA_ERR_CRASHED);
|
|
my_errno=HA_ERR_CRASHED;
|
|
DBUG_RETURN(-1);
|
|
}
|
|
bmove(key_pos,key_pos-t_length,(uint) (endpos-key_pos)+t_length);
|
|
}
|
|
(*keyinfo->store_key)(keyinfo,key_pos,&s_temp);
|
|
a_length+=t_length;
|
|
mi_putint(anc_buff,a_length,nod_flag);
|
|
if (a_length <= keyinfo->block_length)
|
|
{
|
|
if (keyinfo->block_length - a_length < 32 &&
|
|
keyinfo->flag & HA_FULLTEXT && key_pos == endpos &&
|
|
info->s->base.key_reflength <= info->s->base.rec_reflength &&
|
|
info->s->options & (HA_OPTION_PACK_RECORD | HA_OPTION_COMPRESS_RECORD))
|
|
{
|
|
/*
|
|
Normal word. One-level tree. Page is almost full.
|
|
Let's consider converting.
|
|
We'll compare 'key' and the first key at anc_buff
|
|
*/
|
|
uchar *a=key, *b=anc_buff+2+nod_flag;
|
|
uint alen, blen, ft2len=info->s->ft2_keyinfo.keylength;
|
|
/* the very first key on the page is always unpacked */
|
|
DBUG_ASSERT((*b & 128) == 0);
|
|
#if HA_FT_MAXLEN >= 127
|
|
blen= mi_uint2korr(b); b+=2;
|
|
#else
|
|
blen= *b++;
|
|
#endif
|
|
get_key_length(alen,a);
|
|
DBUG_ASSERT(info->ft1_to_ft2==0);
|
|
if (alen == blen &&
|
|
mi_compare_text(keyinfo->seg->charset, a, alen, b, blen, 0, 0)==0)
|
|
{
|
|
/* yup. converting */
|
|
info->ft1_to_ft2=(DYNAMIC_ARRAY *)
|
|
my_malloc(sizeof(DYNAMIC_ARRAY), MYF(MY_WME));
|
|
my_init_dynamic_array(info->ft1_to_ft2, ft2len, 300, 50);
|
|
|
|
/*
|
|
now, adding all keys from the page to dynarray
|
|
if the page is a leaf (if not keys will be deleted later)
|
|
*/
|
|
if (!nod_flag)
|
|
{
|
|
/* let's leave the first key on the page, though, because
|
|
we cannot easily dispatch an empty page here */
|
|
b+=blen+ft2len+2;
|
|
for (a=anc_buff+a_length ; b < a ; b+=ft2len+2)
|
|
insert_dynamic(info->ft1_to_ft2, (char*) b);
|
|
|
|
/* fixing the page's length - it contains only one key now */
|
|
mi_putint(anc_buff,2+blen+ft2len+2,0);
|
|
}
|
|
/* the rest will be done when we're back from recursion */
|
|
}
|
|
}
|
|
DBUG_RETURN(0); /* There is room on page */
|
|
}
|
|
/* Page is full */
|
|
if (nod_flag)
|
|
insert_last=0;
|
|
if (!(keyinfo->flag & (HA_VAR_LENGTH_KEY | HA_BINARY_PACK_KEY)) &&
|
|
father_buff && !insert_last)
|
|
DBUG_RETURN(_mi_balance_page(info,keyinfo,key,anc_buff,father_buff,
|
|
father_key_pos,father_page));
|
|
DBUG_RETURN(_mi_split_page(info,keyinfo,key,anc_buff,key_buff, insert_last));
|
|
} /* _mi_insert */
|
|
|
|
|
|
/* split a full page in two and assign emerging item to key */
|
|
|
|
int _mi_split_page(register MI_INFO *info, register MI_KEYDEF *keyinfo,
|
|
uchar *key, uchar *buff, uchar *key_buff,
|
|
my_bool insert_last_key)
|
|
{
|
|
uint length,a_length,key_ref_length,t_length,nod_flag,key_length;
|
|
uchar *key_pos,*pos, *after_key;
|
|
my_off_t new_pos;
|
|
MI_KEY_PARAM s_temp;
|
|
DBUG_ENTER("mi_split_page");
|
|
LINT_INIT(after_key);
|
|
DBUG_DUMP("buff",(uchar*) buff,mi_getint(buff));
|
|
|
|
if (info->s->keyinfo+info->lastinx == keyinfo)
|
|
info->page_changed=1; /* Info->buff is used */
|
|
info->buff_used=1;
|
|
nod_flag=mi_test_if_nod(buff);
|
|
key_ref_length=2+nod_flag;
|
|
if (insert_last_key)
|
|
key_pos=_mi_find_last_pos(keyinfo,buff,key_buff, &key_length, &after_key);
|
|
else
|
|
key_pos=_mi_find_half_pos(nod_flag,keyinfo,buff,key_buff, &key_length,
|
|
&after_key);
|
|
if (!key_pos)
|
|
DBUG_RETURN(-1);
|
|
|
|
length=(uint) (key_pos-buff);
|
|
a_length=mi_getint(buff);
|
|
mi_putint(buff,length,nod_flag);
|
|
|
|
key_pos=after_key;
|
|
if (nod_flag)
|
|
{
|
|
DBUG_PRINT("test",("Splitting nod"));
|
|
pos=key_pos-nod_flag;
|
|
memcpy((uchar*) info->buff+2,(uchar*) pos,(size_t) nod_flag);
|
|
}
|
|
|
|
/* Move middle item to key and pointer to new page */
|
|
if ((new_pos=_mi_new(info,keyinfo,DFLT_INIT_HITS)) == HA_OFFSET_ERROR)
|
|
DBUG_RETURN(-1);
|
|
_mi_kpointer(info,_mi_move_key(keyinfo,key,key_buff),new_pos);
|
|
|
|
/* Store new page */
|
|
if (!(*keyinfo->get_key)(keyinfo,nod_flag,&key_pos,key_buff))
|
|
DBUG_RETURN(-1);
|
|
|
|
t_length=(*keyinfo->pack_key)(keyinfo,nod_flag,(uchar *) 0,
|
|
(uchar*) 0, (uchar*) 0,
|
|
key_buff, &s_temp);
|
|
length=(uint) ((buff+a_length)-key_pos);
|
|
memcpy((uchar*) info->buff+key_ref_length+t_length,(uchar*) key_pos,
|
|
(size_t) length);
|
|
(*keyinfo->store_key)(keyinfo,info->buff+key_ref_length,&s_temp);
|
|
mi_putint(info->buff,length+t_length+key_ref_length,nod_flag);
|
|
|
|
if (_mi_write_keypage(info,keyinfo,new_pos,DFLT_INIT_HITS,info->buff))
|
|
DBUG_RETURN(-1);
|
|
DBUG_DUMP("key",(uchar*) key,_mi_keylength(keyinfo,key));
|
|
DBUG_RETURN(2); /* Middle key up */
|
|
} /* _mi_split_page */
|
|
|
|
|
|
/*
|
|
Calculate how to much to move to split a page in two
|
|
Returns pointer to start of key.
|
|
key will contain the key.
|
|
return_key_length will contain the length of key
|
|
after_key will contain the position to where the next key starts
|
|
*/
|
|
|
|
uchar *_mi_find_half_pos(uint nod_flag, MI_KEYDEF *keyinfo, uchar *page,
|
|
uchar *key, uint *return_key_length,
|
|
uchar **after_key)
|
|
{
|
|
uint keys,length,key_ref_length;
|
|
uchar *end,*lastpos;
|
|
DBUG_ENTER("_mi_find_half_pos");
|
|
|
|
key_ref_length=2+nod_flag;
|
|
length=mi_getint(page)-key_ref_length;
|
|
page+=key_ref_length;
|
|
if (!(keyinfo->flag &
|
|
(HA_PACK_KEY | HA_SPACE_PACK_USED | HA_VAR_LENGTH_KEY |
|
|
HA_BINARY_PACK_KEY)))
|
|
{
|
|
key_ref_length=keyinfo->keylength+nod_flag;
|
|
keys=length/(key_ref_length*2);
|
|
*return_key_length=keyinfo->keylength;
|
|
end=page+keys*key_ref_length;
|
|
*after_key=end+key_ref_length;
|
|
memcpy(key,end,key_ref_length);
|
|
DBUG_RETURN(end);
|
|
}
|
|
|
|
end=page+length/2-key_ref_length; /* This is aprox. half */
|
|
*key='\0';
|
|
do
|
|
{
|
|
lastpos=page;
|
|
if (!(length=(*keyinfo->get_key)(keyinfo,nod_flag,&page,key)))
|
|
DBUG_RETURN(0);
|
|
} while (page < end);
|
|
*return_key_length=length;
|
|
*after_key=page;
|
|
DBUG_PRINT("exit",("returns: 0x%lx page: 0x%lx half: 0x%lx",
|
|
(long) lastpos, (long) page, (long) end));
|
|
DBUG_RETURN(lastpos);
|
|
} /* _mi_find_half_pos */
|
|
|
|
|
|
/*
|
|
Split buffer at last key
|
|
Returns pointer to the start of the key before the last key
|
|
key will contain the last key
|
|
*/
|
|
|
|
static uchar *_mi_find_last_pos(MI_KEYDEF *keyinfo, uchar *page,
|
|
uchar *key, uint *return_key_length,
|
|
uchar **after_key)
|
|
{
|
|
uint keys,length,last_length,key_ref_length;
|
|
uchar *end,*lastpos,*prevpos;
|
|
uchar key_buff[MI_MAX_KEY_BUFF];
|
|
DBUG_ENTER("_mi_find_last_pos");
|
|
|
|
key_ref_length=2;
|
|
length=mi_getint(page)-key_ref_length;
|
|
page+=key_ref_length;
|
|
if (!(keyinfo->flag &
|
|
(HA_PACK_KEY | HA_SPACE_PACK_USED | HA_VAR_LENGTH_KEY |
|
|
HA_BINARY_PACK_KEY)))
|
|
{
|
|
keys=length/keyinfo->keylength-2;
|
|
*return_key_length=length=keyinfo->keylength;
|
|
end=page+keys*length;
|
|
*after_key=end+length;
|
|
memcpy(key,end,length);
|
|
DBUG_RETURN(end);
|
|
}
|
|
|
|
LINT_INIT(prevpos);
|
|
LINT_INIT(last_length);
|
|
end=page+length-key_ref_length;
|
|
*key='\0';
|
|
length=0;
|
|
lastpos=page;
|
|
while (page < end)
|
|
{
|
|
prevpos=lastpos; lastpos=page;
|
|
last_length=length;
|
|
memcpy(key, key_buff, length); /* previous key */
|
|
if (!(length=(*keyinfo->get_key)(keyinfo,0,&page,key_buff)))
|
|
{
|
|
mi_print_error(keyinfo->share, HA_ERR_CRASHED);
|
|
my_errno=HA_ERR_CRASHED;
|
|
DBUG_RETURN(0);
|
|
}
|
|
}
|
|
*return_key_length=last_length;
|
|
*after_key=lastpos;
|
|
DBUG_PRINT("exit",("returns: 0x%lx page: 0x%lx end: 0x%lx",
|
|
(long) prevpos,(long) page,(long) end));
|
|
DBUG_RETURN(prevpos);
|
|
} /* _mi_find_last_pos */
|
|
|
|
|
|
/* Balance page with not packed keys with page on right/left */
|
|
/* returns 0 if balance was done */
|
|
|
|
static int _mi_balance_page(register MI_INFO *info, MI_KEYDEF *keyinfo,
|
|
uchar *key, uchar *curr_buff, uchar *father_buff,
|
|
uchar *father_key_pos, my_off_t father_page)
|
|
{
|
|
my_bool right;
|
|
uint k_length,father_length,father_keylength,nod_flag,curr_keylength,
|
|
right_length,left_length,new_right_length,new_left_length,extra_length,
|
|
length,keys;
|
|
uchar *pos,*buff,*extra_buff;
|
|
my_off_t next_page,new_pos;
|
|
uchar tmp_part_key[MI_MAX_KEY_BUFF];
|
|
DBUG_ENTER("_mi_balance_page");
|
|
|
|
k_length=keyinfo->keylength;
|
|
father_length=mi_getint(father_buff);
|
|
father_keylength=k_length+info->s->base.key_reflength;
|
|
nod_flag=mi_test_if_nod(curr_buff);
|
|
curr_keylength=k_length+nod_flag;
|
|
info->page_changed=1;
|
|
|
|
if ((father_key_pos != father_buff+father_length &&
|
|
(info->state->records & 1)) ||
|
|
father_key_pos == father_buff+2+info->s->base.key_reflength)
|
|
{
|
|
right=1;
|
|
next_page= _mi_kpos(info->s->base.key_reflength,
|
|
father_key_pos+father_keylength);
|
|
buff=info->buff;
|
|
DBUG_PRINT("test",("use right page: %lu", (ulong) next_page));
|
|
}
|
|
else
|
|
{
|
|
right=0;
|
|
father_key_pos-=father_keylength;
|
|
next_page= _mi_kpos(info->s->base.key_reflength,father_key_pos);
|
|
/* Fix that curr_buff is to left */
|
|
buff=curr_buff; curr_buff=info->buff;
|
|
DBUG_PRINT("test",("use left page: %lu", (ulong) next_page));
|
|
} /* father_key_pos ptr to parting key */
|
|
|
|
if (!_mi_fetch_keypage(info,keyinfo,next_page,DFLT_INIT_HITS,info->buff,0))
|
|
goto err;
|
|
DBUG_DUMP("next",(uchar*) info->buff,mi_getint(info->buff));
|
|
|
|
/* Test if there is room to share keys */
|
|
|
|
left_length=mi_getint(curr_buff);
|
|
right_length=mi_getint(buff);
|
|
keys=(left_length+right_length-4-nod_flag*2)/curr_keylength;
|
|
|
|
if ((right ? right_length : left_length) + curr_keylength <=
|
|
keyinfo->block_length)
|
|
{ /* Merge buffs */
|
|
new_left_length=2+nod_flag+(keys/2)*curr_keylength;
|
|
new_right_length=2+nod_flag+((keys+1)/2)*curr_keylength;
|
|
mi_putint(curr_buff,new_left_length,nod_flag);
|
|
mi_putint(buff,new_right_length,nod_flag);
|
|
|
|
if (left_length < new_left_length)
|
|
{ /* Move keys buff -> leaf */
|
|
pos=curr_buff+left_length;
|
|
memcpy((uchar*) pos,(uchar*) father_key_pos, (size_t) k_length);
|
|
memcpy((uchar*) pos+k_length, (uchar*) buff+2,
|
|
(size_t) (length=new_left_length - left_length - k_length));
|
|
pos=buff+2+length;
|
|
memcpy((uchar*) father_key_pos,(uchar*) pos,(size_t) k_length);
|
|
bmove((uchar*) buff+2,(uchar*) pos+k_length,new_right_length);
|
|
}
|
|
else
|
|
{ /* Move keys -> buff */
|
|
|
|
bmove_upp((uchar*) buff+new_right_length,(uchar*) buff+right_length,
|
|
right_length-2);
|
|
length=new_right_length-right_length-k_length;
|
|
memcpy((uchar*) buff+2+length,father_key_pos,(size_t) k_length);
|
|
pos=curr_buff+new_left_length;
|
|
memcpy((uchar*) father_key_pos,(uchar*) pos,(size_t) k_length);
|
|
memcpy((uchar*) buff+2,(uchar*) pos+k_length,(size_t) length);
|
|
}
|
|
|
|
if (_mi_write_keypage(info,keyinfo,next_page,DFLT_INIT_HITS,info->buff) ||
|
|
_mi_write_keypage(info,keyinfo,father_page,DFLT_INIT_HITS,father_buff))
|
|
goto err;
|
|
DBUG_RETURN(0);
|
|
}
|
|
|
|
/* curr_buff[] and buff[] are full, lets split and make new nod */
|
|
|
|
extra_buff=info->buff+info->s->base.max_key_block_length;
|
|
new_left_length=new_right_length=2+nod_flag+(keys+1)/3*curr_keylength;
|
|
if (keys == 5) /* Too few keys to balance */
|
|
new_left_length-=curr_keylength;
|
|
extra_length=nod_flag+left_length+right_length-
|
|
new_left_length-new_right_length-curr_keylength;
|
|
DBUG_PRINT("info",("left_length: %d right_length: %d new_left_length: %d new_right_length: %d extra_length: %d",
|
|
left_length, right_length,
|
|
new_left_length, new_right_length,
|
|
extra_length));
|
|
mi_putint(curr_buff,new_left_length,nod_flag);
|
|
mi_putint(buff,new_right_length,nod_flag);
|
|
mi_putint(extra_buff,extra_length+2,nod_flag);
|
|
|
|
/* move first largest keys to new page */
|
|
pos=buff+right_length-extra_length;
|
|
memcpy((uchar*) extra_buff+2,pos,(size_t) extra_length);
|
|
/* Save new parting key */
|
|
memcpy(tmp_part_key, pos-k_length,k_length);
|
|
/* Make place for new keys */
|
|
bmove_upp((uchar*) buff+new_right_length,(uchar*) pos-k_length,
|
|
right_length-extra_length-k_length-2);
|
|
/* Copy keys from left page */
|
|
pos= curr_buff+new_left_length;
|
|
memcpy((uchar*) buff+2,(uchar*) pos+k_length,
|
|
(size_t) (length=left_length-new_left_length-k_length));
|
|
/* Copy old parting key */
|
|
memcpy((uchar*) buff+2+length,father_key_pos,(size_t) k_length);
|
|
|
|
/* Move new parting keys up to caller */
|
|
memcpy((uchar*) (right ? key : father_key_pos),pos,(size_t) k_length);
|
|
memcpy((uchar*) (right ? father_key_pos : key),tmp_part_key, k_length);
|
|
|
|
if ((new_pos=_mi_new(info,keyinfo,DFLT_INIT_HITS)) == HA_OFFSET_ERROR)
|
|
goto err;
|
|
_mi_kpointer(info,key+k_length,new_pos);
|
|
if (_mi_write_keypage(info,keyinfo,(right ? new_pos : next_page),
|
|
DFLT_INIT_HITS,info->buff) ||
|
|
_mi_write_keypage(info,keyinfo,(right ? next_page : new_pos),
|
|
DFLT_INIT_HITS,extra_buff))
|
|
goto err;
|
|
|
|
DBUG_RETURN(1); /* Middle key up */
|
|
|
|
err:
|
|
DBUG_RETURN(-1);
|
|
} /* _mi_balance_page */
|
|
|
|
/**********************************************************************
|
|
* Bulk insert code *
|
|
**********************************************************************/
|
|
|
|
typedef struct {
|
|
MI_INFO *info;
|
|
uint keynr;
|
|
} bulk_insert_param;
|
|
|
|
int _mi_ck_write_tree(register MI_INFO *info, uint keynr, uchar *key,
|
|
uint key_length)
|
|
{
|
|
int error;
|
|
DBUG_ENTER("_mi_ck_write_tree");
|
|
|
|
error= tree_insert(&info->bulk_insert[keynr], key,
|
|
key_length + info->s->rec_reflength,
|
|
info->bulk_insert[keynr].custom_arg) ? 0 : HA_ERR_OUT_OF_MEM ;
|
|
|
|
DBUG_RETURN(error);
|
|
} /* _mi_ck_write_tree */
|
|
|
|
|
|
/* typeof(_mi_keys_compare)=qsort_cmp2 */
|
|
|
|
static int keys_compare(bulk_insert_param *param, uchar *key1, uchar *key2)
|
|
{
|
|
uint not_used[2];
|
|
return ha_key_cmp(param->info->s->keyinfo[param->keynr].seg,
|
|
key1, key2, USE_WHOLE_KEY, SEARCH_SAME,
|
|
not_used);
|
|
}
|
|
|
|
|
|
static int keys_free(uchar *key, TREE_FREE mode, bulk_insert_param *param)
|
|
{
|
|
/*
|
|
Probably I can use info->lastkey here, but I'm not sure,
|
|
and to be safe I'd better use local lastkey.
|
|
*/
|
|
uchar lastkey[MI_MAX_KEY_BUFF];
|
|
uint keylen;
|
|
MI_KEYDEF *keyinfo;
|
|
|
|
switch (mode) {
|
|
case free_init:
|
|
if (param->info->s->concurrent_insert)
|
|
{
|
|
rw_wrlock(¶m->info->s->key_root_lock[param->keynr]);
|
|
param->info->s->keyinfo[param->keynr].version++;
|
|
}
|
|
return 0;
|
|
case free_free:
|
|
keyinfo=param->info->s->keyinfo+param->keynr;
|
|
keylen=_mi_keylength(keyinfo, key);
|
|
memcpy(lastkey, key, keylen);
|
|
return _mi_ck_write_btree(param->info,param->keynr,lastkey,
|
|
keylen - param->info->s->rec_reflength);
|
|
case free_end:
|
|
if (param->info->s->concurrent_insert)
|
|
rw_unlock(¶m->info->s->key_root_lock[param->keynr]);
|
|
return 0;
|
|
}
|
|
return -1;
|
|
}
|
|
|
|
|
|
int mi_init_bulk_insert(MI_INFO *info, ulong cache_size, ha_rows rows)
|
|
{
|
|
MYISAM_SHARE *share=info->s;
|
|
MI_KEYDEF *key=share->keyinfo;
|
|
bulk_insert_param *params;
|
|
uint i, num_keys, total_keylength;
|
|
ulonglong key_map;
|
|
DBUG_ENTER("_mi_init_bulk_insert");
|
|
DBUG_PRINT("enter",("cache_size: %lu", cache_size));
|
|
|
|
DBUG_ASSERT(!info->bulk_insert &&
|
|
(!rows || rows >= MI_MIN_ROWS_TO_USE_BULK_INSERT));
|
|
|
|
mi_clear_all_keys_active(key_map);
|
|
for (i=total_keylength=num_keys=0 ; i < share->base.keys ; i++)
|
|
{
|
|
if (! (key[i].flag & HA_NOSAME) && (share->base.auto_key != i + 1) &&
|
|
mi_is_key_active(share->state.key_map, i))
|
|
{
|
|
num_keys++;
|
|
mi_set_key_active(key_map, i);
|
|
total_keylength+=key[i].maxlength+TREE_ELEMENT_EXTRA_SIZE;
|
|
}
|
|
}
|
|
|
|
if (num_keys==0 ||
|
|
num_keys * MI_MIN_SIZE_BULK_INSERT_TREE > cache_size)
|
|
DBUG_RETURN(0);
|
|
|
|
if (rows && rows*total_keylength < cache_size)
|
|
cache_size=rows;
|
|
else
|
|
cache_size/=total_keylength*16;
|
|
|
|
info->bulk_insert=(TREE *)
|
|
my_malloc((sizeof(TREE)*share->base.keys+
|
|
sizeof(bulk_insert_param)*num_keys),MYF(0));
|
|
|
|
if (!info->bulk_insert)
|
|
DBUG_RETURN(HA_ERR_OUT_OF_MEM);
|
|
|
|
params=(bulk_insert_param *)(info->bulk_insert+share->base.keys);
|
|
for (i=0 ; i < share->base.keys ; i++)
|
|
{
|
|
if (mi_is_key_active(key_map, i))
|
|
{
|
|
params->info=info;
|
|
params->keynr=i;
|
|
/* Only allocate a 16'th of the buffer at a time */
|
|
init_tree(&info->bulk_insert[i],
|
|
cache_size * key[i].maxlength,
|
|
cache_size * key[i].maxlength, 0,
|
|
(qsort_cmp2)keys_compare, 0,
|
|
(tree_element_free) keys_free, (void *)params++);
|
|
}
|
|
else
|
|
info->bulk_insert[i].root=0;
|
|
}
|
|
|
|
DBUG_RETURN(0);
|
|
}
|
|
|
|
void mi_flush_bulk_insert(MI_INFO *info, uint inx)
|
|
{
|
|
if (info->bulk_insert)
|
|
{
|
|
if (is_tree_inited(&info->bulk_insert[inx]))
|
|
reset_tree(&info->bulk_insert[inx]);
|
|
}
|
|
}
|
|
|
|
void mi_end_bulk_insert(MI_INFO *info)
|
|
{
|
|
if (info->bulk_insert)
|
|
{
|
|
uint i;
|
|
for (i=0 ; i < info->s->base.keys ; i++)
|
|
{
|
|
if (is_tree_inited(& info->bulk_insert[i]))
|
|
{
|
|
delete_tree(& info->bulk_insert[i]);
|
|
}
|
|
}
|
|
my_free((void *)info->bulk_insert, MYF(0));
|
|
info->bulk_insert=0;
|
|
}
|
|
}
|