mirror of
https://github.com/MariaDB/server.git
synced 2025-01-19 13:32:33 +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
653 lines
21 KiB
C++
653 lines
21 KiB
C++
/* Copyright (C) 2001 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 */
|
|
|
|
/*
|
|
Function to handle quick removal of duplicates
|
|
This code is used when doing multi-table deletes to find the rows in
|
|
reference tables that needs to be deleted.
|
|
|
|
The basic idea is as follows:
|
|
|
|
Store first all strings in a binary tree, ignoring duplicates.
|
|
When the tree uses more memory than 'max_heap_table_size',
|
|
write the tree (in sorted order) out to disk and start with a new tree.
|
|
When all data has been generated, merge the trees (removing any found
|
|
duplicates).
|
|
|
|
The unique entries will be returned in sort order, to ensure that we do the
|
|
deletes in disk order.
|
|
*/
|
|
|
|
#include "mysql_priv.h"
|
|
#include "sql_sort.h"
|
|
|
|
|
|
int unique_write_to_file(uchar* key, element_count count, Unique *unique)
|
|
{
|
|
/*
|
|
Use unique->size (size of element stored in the tree) and not
|
|
unique->tree.size_of_element. The latter is different from unique->size
|
|
when tree implementation chooses to store pointer to key in TREE_ELEMENT
|
|
(instead of storing the element itself there)
|
|
*/
|
|
return my_b_write(&unique->file, key, unique->size) ? 1 : 0;
|
|
}
|
|
|
|
int unique_write_to_ptrs(uchar* key, element_count count, Unique *unique)
|
|
{
|
|
memcpy(unique->record_pointers, key, unique->size);
|
|
unique->record_pointers+=unique->size;
|
|
return 0;
|
|
}
|
|
|
|
Unique::Unique(qsort_cmp2 comp_func, void * comp_func_fixed_arg,
|
|
uint size_arg, ulonglong max_in_memory_size_arg)
|
|
:max_in_memory_size(max_in_memory_size_arg), size(size_arg), elements(0)
|
|
{
|
|
my_b_clear(&file);
|
|
init_tree(&tree, (ulong) (max_in_memory_size / 16), 0, size, comp_func, 0,
|
|
NULL, comp_func_fixed_arg);
|
|
/* If the following fail's the next add will also fail */
|
|
my_init_dynamic_array(&file_ptrs, sizeof(BUFFPEK), 16, 16);
|
|
/*
|
|
If you change the following, change it in get_max_elements function, too.
|
|
*/
|
|
max_elements= (ulong) (max_in_memory_size /
|
|
ALIGN_SIZE(sizeof(TREE_ELEMENT)+size));
|
|
VOID(open_cached_file(&file, mysql_tmpdir,TEMP_PREFIX, DISK_BUFFER_SIZE,
|
|
MYF(MY_WME)));
|
|
}
|
|
|
|
|
|
/*
|
|
Calculate log2(n!)
|
|
|
|
NOTES
|
|
Stirling's approximate formula is used:
|
|
|
|
n! ~= sqrt(2*M_PI*n) * (n/M_E)^n
|
|
|
|
Derivation of formula used for calculations is as follows:
|
|
|
|
log2(n!) = log(n!)/log(2) = log(sqrt(2*M_PI*n)*(n/M_E)^n) / log(2) =
|
|
|
|
= (log(2*M_PI*n)/2 + n*log(n/M_E)) / log(2).
|
|
*/
|
|
|
|
inline double log2_n_fact(double x)
|
|
{
|
|
return (log(2*M_PI*x)/2 + x*log(x/M_E)) / M_LN2;
|
|
}
|
|
|
|
|
|
/*
|
|
Calculate cost of merge_buffers function call for given sequence of
|
|
input stream lengths and store the number of rows in result stream in *last.
|
|
|
|
SYNOPSIS
|
|
get_merge_buffers_cost()
|
|
buff_elems Array of #s of elements in buffers
|
|
elem_size Size of element stored in buffer
|
|
first Pointer to first merged element size
|
|
last Pointer to last merged element size
|
|
|
|
RETURN
|
|
Cost of merge_buffers operation in disk seeks.
|
|
|
|
NOTES
|
|
It is assumed that no rows are eliminated during merge.
|
|
The cost is calculated as
|
|
|
|
cost(read_and_write) + cost(merge_comparisons).
|
|
|
|
All bytes in the sequences is read and written back during merge so cost
|
|
of disk io is 2*elem_size*total_buf_elems/IO_SIZE (2 is for read + write)
|
|
|
|
For comparisons cost calculations we assume that all merged sequences have
|
|
the same length, so each of total_buf_size elements will be added to a sort
|
|
heap with (n_buffers-1) elements. This gives the comparison cost:
|
|
|
|
total_buf_elems* log2(n_buffers) / TIME_FOR_COMPARE_ROWID;
|
|
*/
|
|
|
|
static double get_merge_buffers_cost(uint *buff_elems, uint elem_size,
|
|
uint *first, uint *last)
|
|
{
|
|
uint total_buf_elems= 0;
|
|
for (uint *pbuf= first; pbuf <= last; pbuf++)
|
|
total_buf_elems+= *pbuf;
|
|
*last= total_buf_elems;
|
|
|
|
int n_buffers= last - first + 1;
|
|
|
|
/* Using log2(n)=log(n)/log(2) formula */
|
|
return 2*((double)total_buf_elems*elem_size) / IO_SIZE +
|
|
total_buf_elems*log((double) n_buffers) / (TIME_FOR_COMPARE_ROWID * M_LN2);
|
|
}
|
|
|
|
|
|
/*
|
|
Calculate cost of merging buffers into one in Unique::get, i.e. calculate
|
|
how long (in terms of disk seeks) the two calls
|
|
merge_many_buffs(...);
|
|
merge_buffers(...);
|
|
will take.
|
|
|
|
SYNOPSIS
|
|
get_merge_many_buffs_cost()
|
|
buffer buffer space for temporary data, at least
|
|
Unique::get_cost_calc_buff_size bytes
|
|
maxbuffer # of full buffers
|
|
max_n_elems # of elements in first maxbuffer buffers
|
|
last_n_elems # of elements in last buffer
|
|
elem_size size of buffer element
|
|
|
|
NOTES
|
|
maxbuffer+1 buffers are merged, where first maxbuffer buffers contain
|
|
max_n_elems elements each and last buffer contains last_n_elems elements.
|
|
|
|
The current implementation does a dumb simulation of merge_many_buffs
|
|
function actions.
|
|
|
|
RETURN
|
|
Cost of merge in disk seeks.
|
|
*/
|
|
|
|
static double get_merge_many_buffs_cost(uint *buffer,
|
|
uint maxbuffer, uint max_n_elems,
|
|
uint last_n_elems, int elem_size)
|
|
{
|
|
register int i;
|
|
double total_cost= 0.0;
|
|
uint *buff_elems= buffer; /* #s of elements in each of merged sequences */
|
|
|
|
/*
|
|
Set initial state: first maxbuffer sequences contain max_n_elems elements
|
|
each, last sequence contains last_n_elems elements.
|
|
*/
|
|
for (i = 0; i < (int)maxbuffer; i++)
|
|
buff_elems[i]= max_n_elems;
|
|
buff_elems[maxbuffer]= last_n_elems;
|
|
|
|
/*
|
|
Do it exactly as merge_many_buff function does, calling
|
|
get_merge_buffers_cost to get cost of merge_buffers.
|
|
*/
|
|
if (maxbuffer >= MERGEBUFF2)
|
|
{
|
|
while (maxbuffer >= MERGEBUFF2)
|
|
{
|
|
uint lastbuff= 0;
|
|
for (i = 0; i <= (int) maxbuffer - MERGEBUFF*3/2; i += MERGEBUFF)
|
|
{
|
|
total_cost+=get_merge_buffers_cost(buff_elems, elem_size,
|
|
buff_elems + i,
|
|
buff_elems + i + MERGEBUFF-1);
|
|
lastbuff++;
|
|
}
|
|
total_cost+=get_merge_buffers_cost(buff_elems, elem_size,
|
|
buff_elems + i,
|
|
buff_elems + maxbuffer);
|
|
maxbuffer= lastbuff;
|
|
}
|
|
}
|
|
|
|
/* Simulate final merge_buff call. */
|
|
total_cost += get_merge_buffers_cost(buff_elems, elem_size,
|
|
buff_elems, buff_elems + maxbuffer);
|
|
return total_cost;
|
|
}
|
|
|
|
|
|
/*
|
|
Calculate cost of using Unique for processing nkeys elements of size
|
|
key_size using max_in_memory_size memory.
|
|
|
|
SYNOPSIS
|
|
Unique::get_use_cost()
|
|
buffer space for temporary data, use Unique::get_cost_calc_buff_size
|
|
to get # bytes needed.
|
|
nkeys #of elements in Unique
|
|
key_size size of each elements in bytes
|
|
max_in_memory_size amount of memory Unique will be allowed to use
|
|
|
|
RETURN
|
|
Cost in disk seeks.
|
|
|
|
NOTES
|
|
cost(using_unqiue) =
|
|
cost(create_trees) + (see #1)
|
|
cost(merge) + (see #2)
|
|
cost(read_result) (see #3)
|
|
|
|
1. Cost of trees creation
|
|
For each Unique::put operation there will be 2*log2(n+1) elements
|
|
comparisons, where n runs from 1 tree_size (we assume that all added
|
|
elements are different). Together this gives:
|
|
|
|
n_compares = 2*(log2(2) + log2(3) + ... + log2(N+1)) = 2*log2((N+1)!)
|
|
|
|
then cost(tree_creation) = n_compares*ROWID_COMPARE_COST;
|
|
|
|
Total cost of creating trees:
|
|
(n_trees - 1)*max_size_tree_cost + non_max_size_tree_cost.
|
|
|
|
Approximate value of log2(N!) is calculated by log2_n_fact function.
|
|
|
|
2. Cost of merging.
|
|
If only one tree is created by Unique no merging will be necessary.
|
|
Otherwise, we model execution of merge_many_buff function and count
|
|
#of merges. (The reason behind this is that number of buffers is small,
|
|
while size of buffers is big and we don't want to loose precision with
|
|
O(x)-style formula)
|
|
|
|
3. If only one tree is created by Unique no disk io will happen.
|
|
Otherwise, ceil(key_len*n_keys) disk seeks are necessary. We assume
|
|
these will be random seeks.
|
|
*/
|
|
|
|
double Unique::get_use_cost(uint *buffer, uint nkeys, uint key_size,
|
|
ulonglong max_in_memory_size)
|
|
{
|
|
ulong max_elements_in_tree;
|
|
ulong last_tree_elems;
|
|
int n_full_trees; /* number of trees in unique - 1 */
|
|
double result;
|
|
|
|
max_elements_in_tree= ((ulong) max_in_memory_size /
|
|
ALIGN_SIZE(sizeof(TREE_ELEMENT)+key_size));
|
|
|
|
n_full_trees= nkeys / max_elements_in_tree;
|
|
last_tree_elems= nkeys % max_elements_in_tree;
|
|
|
|
/* Calculate cost of creating trees */
|
|
result= 2*log2_n_fact(last_tree_elems + 1.0);
|
|
if (n_full_trees)
|
|
result+= n_full_trees * log2_n_fact(max_elements_in_tree + 1.0);
|
|
result /= TIME_FOR_COMPARE_ROWID;
|
|
|
|
DBUG_PRINT("info",("unique trees sizes: %u=%u*%lu + %lu", nkeys,
|
|
n_full_trees, n_full_trees?max_elements_in_tree:0,
|
|
last_tree_elems));
|
|
|
|
if (!n_full_trees)
|
|
return result;
|
|
|
|
/*
|
|
There is more then one tree and merging is necessary.
|
|
First, add cost of writing all trees to disk, assuming that all disk
|
|
writes are sequential.
|
|
*/
|
|
result += DISK_SEEK_BASE_COST * n_full_trees *
|
|
ceil(((double) key_size)*max_elements_in_tree / IO_SIZE);
|
|
result += DISK_SEEK_BASE_COST * ceil(((double) key_size)*last_tree_elems / IO_SIZE);
|
|
|
|
/* Cost of merge */
|
|
double merge_cost= get_merge_many_buffs_cost(buffer, n_full_trees,
|
|
max_elements_in_tree,
|
|
last_tree_elems, key_size);
|
|
if (merge_cost < 0.0)
|
|
return merge_cost;
|
|
|
|
result += merge_cost;
|
|
/*
|
|
Add cost of reading the resulting sequence, assuming there were no
|
|
duplicate elements.
|
|
*/
|
|
result += ceil((double)key_size*nkeys/IO_SIZE);
|
|
|
|
return result;
|
|
}
|
|
|
|
Unique::~Unique()
|
|
{
|
|
close_cached_file(&file);
|
|
delete_tree(&tree);
|
|
delete_dynamic(&file_ptrs);
|
|
}
|
|
|
|
|
|
/* Write tree to disk; clear tree */
|
|
bool Unique::flush()
|
|
{
|
|
BUFFPEK file_ptr;
|
|
elements+= tree.elements_in_tree;
|
|
file_ptr.count=tree.elements_in_tree;
|
|
file_ptr.file_pos=my_b_tell(&file);
|
|
|
|
if (tree_walk(&tree, (tree_walk_action) unique_write_to_file,
|
|
(void*) this, left_root_right) ||
|
|
insert_dynamic(&file_ptrs, (uchar*) &file_ptr))
|
|
return 1;
|
|
delete_tree(&tree);
|
|
return 0;
|
|
}
|
|
|
|
|
|
/*
|
|
Clear the tree and the file.
|
|
You must call reset() if you want to reuse Unique after walk().
|
|
*/
|
|
|
|
void
|
|
Unique::reset()
|
|
{
|
|
reset_tree(&tree);
|
|
/*
|
|
If elements != 0, some trees were stored in the file (see how
|
|
flush() works). Note, that we can not count on my_b_tell(&file) == 0
|
|
here, because it can return 0 right after walk(), and walk() does not
|
|
reset any Unique member.
|
|
*/
|
|
if (elements)
|
|
{
|
|
reset_dynamic(&file_ptrs);
|
|
reinit_io_cache(&file, WRITE_CACHE, 0L, 0, 1);
|
|
}
|
|
elements= 0;
|
|
}
|
|
|
|
/*
|
|
The comparison function, passed to queue_init() in merge_walk() must
|
|
use comparison function of Uniques::tree, but compare members of struct
|
|
BUFFPEK.
|
|
*/
|
|
|
|
struct BUFFPEK_COMPARE_CONTEXT
|
|
{
|
|
qsort_cmp2 key_compare;
|
|
void *key_compare_arg;
|
|
};
|
|
|
|
C_MODE_START
|
|
|
|
static int buffpek_compare(void *arg, uchar *key_ptr1, uchar *key_ptr2)
|
|
{
|
|
BUFFPEK_COMPARE_CONTEXT *ctx= (BUFFPEK_COMPARE_CONTEXT *) arg;
|
|
return ctx->key_compare(ctx->key_compare_arg,
|
|
*((uchar **) key_ptr1), *((uchar **)key_ptr2));
|
|
}
|
|
|
|
C_MODE_END
|
|
|
|
|
|
/*
|
|
DESCRIPTION
|
|
|
|
Function is very similar to merge_buffers, but instead of writing sorted
|
|
unique keys to the output file, it invokes walk_action for each key.
|
|
This saves I/O if you need to pass through all unique keys only once.
|
|
|
|
SYNOPSIS
|
|
merge_walk()
|
|
All params are 'IN' (but see comment for begin, end):
|
|
merge_buffer buffer to perform cached piece-by-piece loading
|
|
of trees; initially the buffer is empty
|
|
merge_buffer_size size of merge_buffer. Must be aligned with
|
|
key_length
|
|
key_length size of tree element; key_length * (end - begin)
|
|
must be less or equal than merge_buffer_size.
|
|
begin pointer to BUFFPEK struct for the first tree.
|
|
end pointer to BUFFPEK struct for the last tree;
|
|
end > begin and [begin, end) form a consecutive
|
|
range. BUFFPEKs structs in that range are used and
|
|
overwritten in merge_walk().
|
|
walk_action element visitor. Action is called for each unique
|
|
key.
|
|
walk_action_arg argument to walk action. Passed to it on each call.
|
|
compare elements comparison function
|
|
compare_arg comparison function argument
|
|
file file with all trees dumped. Trees in the file
|
|
must contain sorted unique values. Cache must be
|
|
initialized in read mode.
|
|
RETURN VALUE
|
|
0 ok
|
|
<> 0 error
|
|
*/
|
|
|
|
static bool merge_walk(uchar *merge_buffer, ulong merge_buffer_size,
|
|
uint key_length, BUFFPEK *begin, BUFFPEK *end,
|
|
tree_walk_action walk_action, void *walk_action_arg,
|
|
qsort_cmp2 compare, void *compare_arg,
|
|
IO_CACHE *file)
|
|
{
|
|
BUFFPEK_COMPARE_CONTEXT compare_context = { compare, compare_arg };
|
|
QUEUE queue;
|
|
if (end <= begin ||
|
|
merge_buffer_size < (ulong) (key_length * (end - begin + 1)) ||
|
|
init_queue(&queue, (uint) (end - begin), offsetof(BUFFPEK, key), 0,
|
|
buffpek_compare, &compare_context))
|
|
return 1;
|
|
/* we need space for one key when a piece of merge buffer is re-read */
|
|
merge_buffer_size-= key_length;
|
|
uchar *save_key_buff= merge_buffer + merge_buffer_size;
|
|
uint max_key_count_per_piece= (uint) (merge_buffer_size/(end-begin) /
|
|
key_length);
|
|
/* if piece_size is aligned reuse_freed_buffer will always hit */
|
|
uint piece_size= max_key_count_per_piece * key_length;
|
|
uint bytes_read; /* to hold return value of read_to_buffer */
|
|
BUFFPEK *top;
|
|
int res= 1;
|
|
/*
|
|
Invariant: queue must contain top element from each tree, until a tree
|
|
is not completely walked through.
|
|
Here we're forcing the invariant, inserting one element from each tree
|
|
to the queue.
|
|
*/
|
|
for (top= begin; top != end; ++top)
|
|
{
|
|
top->base= merge_buffer + (top - begin) * piece_size;
|
|
top->max_keys= max_key_count_per_piece;
|
|
bytes_read= read_to_buffer(file, top, key_length);
|
|
if (bytes_read == (uint) (-1))
|
|
goto end;
|
|
DBUG_ASSERT(bytes_read);
|
|
queue_insert(&queue, (uchar *) top);
|
|
}
|
|
top= (BUFFPEK *) queue_top(&queue);
|
|
while (queue.elements > 1)
|
|
{
|
|
/*
|
|
Every iteration one element is removed from the queue, and one is
|
|
inserted by the rules of the invariant. If two adjacent elements on
|
|
the top of the queue are not equal, biggest one is unique, because all
|
|
elements in each tree are unique. Action is applied only to unique
|
|
elements.
|
|
*/
|
|
void *old_key= top->key;
|
|
/*
|
|
read next key from the cache or from the file and push it to the
|
|
queue; this gives new top.
|
|
*/
|
|
top->key+= key_length;
|
|
if (--top->mem_count)
|
|
queue_replaced(&queue);
|
|
else /* next piece should be read */
|
|
{
|
|
/* save old_key not to overwrite it in read_to_buffer */
|
|
memcpy(save_key_buff, old_key, key_length);
|
|
old_key= save_key_buff;
|
|
bytes_read= read_to_buffer(file, top, key_length);
|
|
if (bytes_read == (uint) (-1))
|
|
goto end;
|
|
else if (bytes_read > 0) /* top->key, top->mem_count are reset */
|
|
queue_replaced(&queue); /* in read_to_buffer */
|
|
else
|
|
{
|
|
/*
|
|
Tree for old 'top' element is empty: remove it from the queue and
|
|
give all its memory to the nearest tree.
|
|
*/
|
|
queue_remove(&queue, 0);
|
|
reuse_freed_buff(&queue, top, key_length);
|
|
}
|
|
}
|
|
top= (BUFFPEK *) queue_top(&queue);
|
|
/* new top has been obtained; if old top is unique, apply the action */
|
|
if (compare(compare_arg, old_key, top->key))
|
|
{
|
|
if (walk_action(old_key, 1, walk_action_arg))
|
|
goto end;
|
|
}
|
|
}
|
|
/*
|
|
Applying walk_action to the tail of the last tree: this is safe because
|
|
either we had only one tree in the beginning, either we work with the
|
|
last tree in the queue.
|
|
*/
|
|
do
|
|
{
|
|
do
|
|
{
|
|
if (walk_action(top->key, 1, walk_action_arg))
|
|
goto end;
|
|
top->key+= key_length;
|
|
}
|
|
while (--top->mem_count);
|
|
bytes_read= read_to_buffer(file, top, key_length);
|
|
if (bytes_read == (uint) (-1))
|
|
goto end;
|
|
}
|
|
while (bytes_read);
|
|
res= 0;
|
|
end:
|
|
delete_queue(&queue);
|
|
return res;
|
|
}
|
|
|
|
|
|
/*
|
|
DESCRIPTION
|
|
Walks consecutively through all unique elements:
|
|
if all elements are in memory, then it simply invokes 'tree_walk', else
|
|
all flushed trees are loaded to memory piece-by-piece, pieces are
|
|
sorted, and action is called for each unique value.
|
|
Note: so as merging resets file_ptrs state, this method can change
|
|
internal Unique state to undefined: if you want to reuse Unique after
|
|
walk() you must call reset() first!
|
|
SYNOPSIS
|
|
Unique:walk()
|
|
All params are 'IN':
|
|
action function-visitor, typed in include/my_tree.h
|
|
function is called for each unique element
|
|
arg argument for visitor, which is passed to it on each call
|
|
RETURN VALUE
|
|
0 OK
|
|
<> 0 error
|
|
*/
|
|
|
|
bool Unique::walk(tree_walk_action action, void *walk_action_arg)
|
|
{
|
|
int res;
|
|
uchar *merge_buffer;
|
|
|
|
if (elements == 0) /* the whole tree is in memory */
|
|
return tree_walk(&tree, action, walk_action_arg, left_root_right);
|
|
|
|
/* flush current tree to the file to have some memory for merge buffer */
|
|
if (flush())
|
|
return 1;
|
|
if (flush_io_cache(&file) || reinit_io_cache(&file, READ_CACHE, 0L, 0, 0))
|
|
return 1;
|
|
if (!(merge_buffer= (uchar *) my_malloc((ulong) max_in_memory_size, MYF(0))))
|
|
return 1;
|
|
res= merge_walk(merge_buffer, (ulong) max_in_memory_size, size,
|
|
(BUFFPEK *) file_ptrs.buffer,
|
|
(BUFFPEK *) file_ptrs.buffer + file_ptrs.elements,
|
|
action, walk_action_arg,
|
|
tree.compare, tree.custom_arg, &file);
|
|
my_free((char*) merge_buffer, MYF(0));
|
|
return res;
|
|
}
|
|
|
|
/*
|
|
Modify the TABLE element so that when one calls init_records()
|
|
the rows will be read in priority order.
|
|
*/
|
|
|
|
bool Unique::get(TABLE *table)
|
|
{
|
|
SORTPARAM sort_param;
|
|
table->sort.found_records=elements+tree.elements_in_tree;
|
|
|
|
if (my_b_tell(&file) == 0)
|
|
{
|
|
/* Whole tree is in memory; Don't use disk if you don't need to */
|
|
if ((record_pointers=table->sort.record_pointers= (uchar*)
|
|
my_malloc(size * tree.elements_in_tree, MYF(0))))
|
|
{
|
|
(void) tree_walk(&tree, (tree_walk_action) unique_write_to_ptrs,
|
|
this, left_root_right);
|
|
return 0;
|
|
}
|
|
}
|
|
/* Not enough memory; Save the result to file && free memory used by tree */
|
|
if (flush())
|
|
return 1;
|
|
|
|
IO_CACHE *outfile=table->sort.io_cache;
|
|
BUFFPEK *file_ptr= (BUFFPEK*) file_ptrs.buffer;
|
|
uint maxbuffer= file_ptrs.elements - 1;
|
|
uchar *sort_buffer;
|
|
my_off_t save_pos;
|
|
bool error=1;
|
|
|
|
/* Open cached file if it isn't open */
|
|
outfile=table->sort.io_cache=(IO_CACHE*) my_malloc(sizeof(IO_CACHE),
|
|
MYF(MY_ZEROFILL));
|
|
|
|
if (!outfile || ! my_b_inited(outfile) &&
|
|
open_cached_file(outfile,mysql_tmpdir,TEMP_PREFIX,READ_RECORD_BUFFER,
|
|
MYF(MY_WME)))
|
|
return 1;
|
|
reinit_io_cache(outfile,WRITE_CACHE,0L,0,0);
|
|
|
|
bzero((char*) &sort_param,sizeof(sort_param));
|
|
sort_param.max_rows= elements;
|
|
sort_param.sort_form=table;
|
|
sort_param.rec_length= sort_param.sort_length= sort_param.ref_length=
|
|
size;
|
|
sort_param.keys= (uint) (max_in_memory_size / sort_param.sort_length);
|
|
sort_param.not_killable=1;
|
|
|
|
if (!(sort_buffer=(uchar*) my_malloc((sort_param.keys+1) *
|
|
sort_param.sort_length,
|
|
MYF(0))))
|
|
return 1;
|
|
sort_param.unique_buff= sort_buffer+(sort_param.keys*
|
|
sort_param.sort_length);
|
|
|
|
/* Merge the buffers to one file, removing duplicates */
|
|
if (merge_many_buff(&sort_param,sort_buffer,file_ptr,&maxbuffer,&file))
|
|
goto err;
|
|
if (flush_io_cache(&file) ||
|
|
reinit_io_cache(&file,READ_CACHE,0L,0,0))
|
|
goto err;
|
|
if (merge_buffers(&sort_param, &file, outfile, sort_buffer, file_ptr,
|
|
file_ptr, file_ptr+maxbuffer,0))
|
|
goto err;
|
|
error=0;
|
|
err:
|
|
x_free(sort_buffer);
|
|
if (flush_io_cache(outfile))
|
|
error=1;
|
|
|
|
/* Setup io_cache for reading */
|
|
save_pos=outfile->pos_in_file;
|
|
if (reinit_io_cache(outfile,READ_CACHE,0L,0,0))
|
|
error=1;
|
|
outfile->end_of_file=save_pos;
|
|
return error;
|
|
}
|