mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +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
614 lines
18 KiB
C++
614 lines
18 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 */
|
|
|
|
|
|
/* Functions for easy reading of records, possible through a cache */
|
|
|
|
#include "mysql_priv.h"
|
|
|
|
static int rr_quick(READ_RECORD *info);
|
|
int rr_sequential(READ_RECORD *info);
|
|
static int rr_from_tempfile(READ_RECORD *info);
|
|
static int rr_unpack_from_tempfile(READ_RECORD *info);
|
|
static int rr_unpack_from_buffer(READ_RECORD *info);
|
|
static int rr_from_pointers(READ_RECORD *info);
|
|
static int rr_from_cache(READ_RECORD *info);
|
|
static int init_rr_cache(THD *thd, READ_RECORD *info);
|
|
static int rr_cmp(uchar *a,uchar *b);
|
|
static int rr_index_first(READ_RECORD *info);
|
|
static int rr_index(READ_RECORD *info);
|
|
|
|
|
|
/*
|
|
Initialize READ_RECORD structure to perform full index scan
|
|
|
|
SYNOPSIS
|
|
init_read_record_idx()
|
|
info READ_RECORD structure to initialize.
|
|
thd Thread handle
|
|
table Table to be accessed
|
|
print_error If true, call table->file->print_error() if an error
|
|
occurs (except for end-of-records error)
|
|
idx index to scan
|
|
|
|
DESCRIPTION
|
|
Initialize READ_RECORD structure to perform full index scan (in forward
|
|
direction) using read_record.read_record() interface.
|
|
|
|
This function has been added at late stage and is used only by
|
|
UPDATE/DELETE. Other statements perform index scans using
|
|
join_read_first/next functions.
|
|
*/
|
|
|
|
void init_read_record_idx(READ_RECORD *info, THD *thd, TABLE *table,
|
|
bool print_error, uint idx)
|
|
{
|
|
bzero((char*) info,sizeof(*info));
|
|
info->table= table;
|
|
info->file= table->file;
|
|
info->record= table->record[0];
|
|
info->print_error= print_error;
|
|
|
|
table->status=0; /* And it's always found */
|
|
if (!table->file->inited)
|
|
table->file->ha_index_init(idx, 1);
|
|
/* read_record will be changed to rr_index in rr_index_first */
|
|
info->read_record= rr_index_first;
|
|
}
|
|
|
|
|
|
/*
|
|
init_read_record is used to scan by using a number of different methods.
|
|
Which method to use is set-up in this call so that later calls to
|
|
the info->read_record will call the appropriate method using a function
|
|
pointer.
|
|
|
|
There are five methods that relate completely to the sort function
|
|
filesort. The result of a filesort is retrieved using read_record
|
|
calls. The other two methods are used for normal table access.
|
|
|
|
The filesort will produce references to the records sorted, these
|
|
references can be stored in memory or in a temporary file.
|
|
|
|
The temporary file is normally used when the references doesn't fit into
|
|
a properly sized memory buffer. For most small queries the references
|
|
are stored in the memory buffer.
|
|
|
|
The temporary file is also used when performing an update where a key is
|
|
modified.
|
|
|
|
Methods used when ref's are in memory (using rr_from_pointers):
|
|
rr_unpack_from_buffer:
|
|
----------------------
|
|
This method is used when table->sort.addon_field is allocated.
|
|
This is allocated for most SELECT queries not involving any BLOB's.
|
|
In this case the records are fetched from a memory buffer.
|
|
rr_from_pointers:
|
|
-----------------
|
|
Used when the above is not true, UPDATE, DELETE and so forth and
|
|
SELECT's involving BLOB's. It is also used when the addon_field
|
|
buffer is not allocated due to that its size was bigger than the
|
|
session variable max_length_for_sort_data.
|
|
In this case the record data is fetched from the handler using the
|
|
saved reference using the rnd_pos handler call.
|
|
|
|
Methods used when ref's are in a temporary file (using rr_from_tempfile)
|
|
rr_unpack_from_tempfile:
|
|
------------------------
|
|
Same as rr_unpack_from_buffer except that references are fetched from
|
|
temporary file. Should obviously not really happen other than in
|
|
strange configurations.
|
|
|
|
rr_from_tempfile:
|
|
-----------------
|
|
Same as rr_from_pointers except that references are fetched from
|
|
temporary file instead of from
|
|
rr_from_cache:
|
|
--------------
|
|
This is a special variant of rr_from_tempfile that can be used for
|
|
handlers that is not using the HA_FAST_KEY_READ table flag. Instead
|
|
of reading the references one by one from the temporary file it reads
|
|
a set of them, sorts them and reads all of them into a buffer which
|
|
is then used for a number of subsequent calls to rr_from_cache.
|
|
It is only used for SELECT queries and a number of other conditions
|
|
on table size.
|
|
|
|
All other accesses use either index access methods (rr_quick) or a full
|
|
table scan (rr_sequential).
|
|
rr_quick:
|
|
---------
|
|
rr_quick uses one of the QUICK_SELECT classes in opt_range.cc to
|
|
perform an index scan. There are loads of functionality hidden
|
|
in these quick classes. It handles all index scans of various kinds.
|
|
rr_sequential:
|
|
--------------
|
|
This is the most basic access method of a table using rnd_init,
|
|
rnd_next and rnd_end. No indexes are used.
|
|
*/
|
|
void init_read_record(READ_RECORD *info,THD *thd, TABLE *table,
|
|
SQL_SELECT *select,
|
|
int use_record_cache, bool print_error)
|
|
{
|
|
IO_CACHE *tempfile;
|
|
DBUG_ENTER("init_read_record");
|
|
|
|
bzero((char*) info,sizeof(*info));
|
|
info->thd=thd;
|
|
info->table=table;
|
|
info->file= table->file;
|
|
info->forms= &info->table; /* Only one table */
|
|
|
|
if (table->s->tmp_table == NON_TRANSACTIONAL_TMP_TABLE &&
|
|
!table->sort.addon_field)
|
|
VOID(table->file->extra(HA_EXTRA_MMAP));
|
|
|
|
if (table->sort.addon_field)
|
|
{
|
|
info->rec_buf= table->sort.addon_buf;
|
|
info->ref_length= table->sort.addon_length;
|
|
}
|
|
else
|
|
{
|
|
info->record= table->record[0];
|
|
info->ref_length= table->file->ref_length;
|
|
}
|
|
info->select=select;
|
|
info->print_error=print_error;
|
|
info->ignore_not_found_rows= 0;
|
|
table->status=0; /* And it's always found */
|
|
|
|
if (select && my_b_inited(&select->file))
|
|
tempfile= &select->file;
|
|
else
|
|
tempfile= table->sort.io_cache;
|
|
if (tempfile && my_b_inited(tempfile)) // Test if ref-records was used
|
|
{
|
|
DBUG_PRINT("info",("using rr_from_tempfile"));
|
|
info->read_record= (table->sort.addon_field ?
|
|
rr_unpack_from_tempfile : rr_from_tempfile);
|
|
info->io_cache=tempfile;
|
|
reinit_io_cache(info->io_cache,READ_CACHE,0L,0,0);
|
|
info->ref_pos=table->file->ref;
|
|
if (!table->file->inited)
|
|
table->file->ha_rnd_init(0);
|
|
|
|
/*
|
|
table->sort.addon_field is checked because if we use addon fields,
|
|
it doesn't make sense to use cache - we don't read from the table
|
|
and table->sort.io_cache is read sequentially
|
|
*/
|
|
if (!table->sort.addon_field &&
|
|
! (specialflag & SPECIAL_SAFE_MODE) &&
|
|
thd->variables.read_rnd_buff_size &&
|
|
!(table->file->ha_table_flags() & HA_FAST_KEY_READ) &&
|
|
(table->db_stat & HA_READ_ONLY ||
|
|
table->reginfo.lock_type <= TL_READ_NO_INSERT) &&
|
|
(ulonglong) table->s->reclength* (table->file->stats.records+
|
|
table->file->stats.deleted) >
|
|
(ulonglong) MIN_FILE_LENGTH_TO_USE_ROW_CACHE &&
|
|
info->io_cache->end_of_file/info->ref_length * table->s->reclength >
|
|
(my_off_t) MIN_ROWS_TO_USE_TABLE_CACHE &&
|
|
!table->s->blob_fields &&
|
|
info->ref_length <= MAX_REFLENGTH)
|
|
{
|
|
if (! init_rr_cache(thd, info))
|
|
{
|
|
DBUG_PRINT("info",("using rr_from_cache"));
|
|
info->read_record=rr_from_cache;
|
|
}
|
|
}
|
|
}
|
|
else if (select && select->quick)
|
|
{
|
|
DBUG_PRINT("info",("using rr_quick"));
|
|
info->read_record=rr_quick;
|
|
}
|
|
else if (table->sort.record_pointers)
|
|
{
|
|
DBUG_PRINT("info",("using record_pointers"));
|
|
table->file->ha_rnd_init(0);
|
|
info->cache_pos=table->sort.record_pointers;
|
|
info->cache_end=info->cache_pos+
|
|
table->sort.found_records*info->ref_length;
|
|
info->read_record= (table->sort.addon_field ?
|
|
rr_unpack_from_buffer : rr_from_pointers);
|
|
}
|
|
else
|
|
{
|
|
DBUG_PRINT("info",("using rr_sequential"));
|
|
info->read_record=rr_sequential;
|
|
table->file->ha_rnd_init(1);
|
|
/* We can use record cache if we don't update dynamic length tables */
|
|
if (!table->no_cache &&
|
|
(use_record_cache > 0 ||
|
|
(int) table->reginfo.lock_type <= (int) TL_READ_HIGH_PRIORITY ||
|
|
!(table->s->db_options_in_use & HA_OPTION_PACK_RECORD) ||
|
|
(use_record_cache < 0 &&
|
|
!(table->file->ha_table_flags() & HA_NOT_DELETE_WITH_CACHE))))
|
|
VOID(table->file->extra_opt(HA_EXTRA_CACHE,
|
|
thd->variables.read_buff_size));
|
|
}
|
|
/* Condition pushdown to storage engine */
|
|
if (thd->variables.engine_condition_pushdown &&
|
|
select && select->cond &&
|
|
(select->cond->used_tables() & table->map) &&
|
|
!table->file->pushed_cond)
|
|
table->file->cond_push(select->cond);
|
|
|
|
DBUG_VOID_RETURN;
|
|
} /* init_read_record */
|
|
|
|
|
|
|
|
void end_read_record(READ_RECORD *info)
|
|
{ /* free cache if used */
|
|
if (info->cache)
|
|
{
|
|
my_free_lock((char*) info->cache,MYF(0));
|
|
info->cache=0;
|
|
}
|
|
if (info->table)
|
|
{
|
|
filesort_free_buffers(info->table,0);
|
|
(void) info->file->extra(HA_EXTRA_NO_CACHE);
|
|
if (info->read_record != rr_quick) // otherwise quick_range does it
|
|
(void) info->file->ha_index_or_rnd_end();
|
|
info->table=0;
|
|
}
|
|
}
|
|
|
|
static int rr_handle_error(READ_RECORD *info, int error)
|
|
{
|
|
if (error == HA_ERR_END_OF_FILE)
|
|
error= -1;
|
|
else
|
|
{
|
|
if (info->print_error)
|
|
info->table->file->print_error(error, MYF(0));
|
|
if (error < 0) // Fix negative BDB errno
|
|
error= 1;
|
|
}
|
|
return error;
|
|
}
|
|
|
|
|
|
/* Read a record from head-database */
|
|
|
|
static int rr_quick(READ_RECORD *info)
|
|
{
|
|
int tmp;
|
|
while ((tmp= info->select->quick->get_next()))
|
|
{
|
|
if (info->thd->killed)
|
|
{
|
|
my_error(ER_SERVER_SHUTDOWN, MYF(0));
|
|
return 1;
|
|
}
|
|
if (tmp != HA_ERR_RECORD_DELETED)
|
|
{
|
|
tmp= rr_handle_error(info, tmp);
|
|
break;
|
|
}
|
|
}
|
|
return tmp;
|
|
}
|
|
|
|
|
|
/*
|
|
Reads first row in an index scan
|
|
|
|
SYNOPSIS
|
|
rr_index_first()
|
|
info Scan info
|
|
|
|
RETURN
|
|
0 Ok
|
|
-1 End of records
|
|
1 Error
|
|
*/
|
|
|
|
|
|
static int rr_index_first(READ_RECORD *info)
|
|
{
|
|
int tmp= info->file->index_first(info->record);
|
|
info->read_record= rr_index;
|
|
if (tmp)
|
|
tmp= rr_handle_error(info, tmp);
|
|
return tmp;
|
|
}
|
|
|
|
|
|
/*
|
|
Reads index sequentially after first row
|
|
|
|
SYNOPSIS
|
|
rr_index()
|
|
info Scan info
|
|
|
|
DESCRIPTION
|
|
Read the next index record (in forward direction) and translate return
|
|
value.
|
|
|
|
RETURN
|
|
0 Ok
|
|
-1 End of records
|
|
1 Error
|
|
*/
|
|
|
|
|
|
static int rr_index(READ_RECORD *info)
|
|
{
|
|
int tmp= info->file->index_next(info->record);
|
|
if (tmp)
|
|
tmp= rr_handle_error(info, tmp);
|
|
return tmp;
|
|
}
|
|
|
|
|
|
int rr_sequential(READ_RECORD *info)
|
|
{
|
|
int tmp;
|
|
while ((tmp=info->file->rnd_next(info->record)))
|
|
{
|
|
if (info->thd->killed)
|
|
{
|
|
info->thd->send_kill_message();
|
|
return 1;
|
|
}
|
|
/*
|
|
rnd_next can return RECORD_DELETED for MyISAM when one thread is
|
|
reading and another deleting without locks.
|
|
*/
|
|
if (tmp != HA_ERR_RECORD_DELETED)
|
|
{
|
|
tmp= rr_handle_error(info, tmp);
|
|
break;
|
|
}
|
|
}
|
|
return tmp;
|
|
}
|
|
|
|
|
|
static int rr_from_tempfile(READ_RECORD *info)
|
|
{
|
|
int tmp;
|
|
for (;;)
|
|
{
|
|
if (my_b_read(info->io_cache,info->ref_pos,info->ref_length))
|
|
return -1; /* End of file */
|
|
if (!(tmp=info->file->rnd_pos(info->record,info->ref_pos)))
|
|
break;
|
|
/* The following is extremely unlikely to happen */
|
|
if (tmp == HA_ERR_RECORD_DELETED ||
|
|
(tmp == HA_ERR_KEY_NOT_FOUND && info->ignore_not_found_rows))
|
|
continue;
|
|
tmp= rr_handle_error(info, tmp);
|
|
break;
|
|
}
|
|
return tmp;
|
|
} /* rr_from_tempfile */
|
|
|
|
|
|
/*
|
|
Read a result set record from a temporary file after sorting
|
|
|
|
SYNOPSIS
|
|
rr_unpack_from_tempfile()
|
|
info Reference to the context including record descriptors
|
|
|
|
DESCRIPTION
|
|
The function first reads the next sorted record from the temporary file.
|
|
into a buffer. If a success it calls a callback function that unpacks
|
|
the fields values use in the result set from this buffer into their
|
|
positions in the regular record buffer.
|
|
|
|
RETURN
|
|
0 - Record successfully read.
|
|
-1 - There is no record to be read anymore.
|
|
*/
|
|
|
|
static int rr_unpack_from_tempfile(READ_RECORD *info)
|
|
{
|
|
if (my_b_read(info->io_cache, info->rec_buf, info->ref_length))
|
|
return -1;
|
|
TABLE *table= info->table;
|
|
(*table->sort.unpack)(table->sort.addon_field, info->rec_buf);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int rr_from_pointers(READ_RECORD *info)
|
|
{
|
|
int tmp;
|
|
uchar *cache_pos;
|
|
|
|
for (;;)
|
|
{
|
|
if (info->cache_pos == info->cache_end)
|
|
return -1; /* End of file */
|
|
cache_pos= info->cache_pos;
|
|
info->cache_pos+= info->ref_length;
|
|
|
|
if (!(tmp=info->file->rnd_pos(info->record,cache_pos)))
|
|
break;
|
|
|
|
/* The following is extremely unlikely to happen */
|
|
if (tmp == HA_ERR_RECORD_DELETED ||
|
|
(tmp == HA_ERR_KEY_NOT_FOUND && info->ignore_not_found_rows))
|
|
continue;
|
|
tmp= rr_handle_error(info, tmp);
|
|
break;
|
|
}
|
|
return tmp;
|
|
}
|
|
|
|
/*
|
|
Read a result set record from a buffer after sorting
|
|
|
|
SYNOPSIS
|
|
rr_unpack_from_buffer()
|
|
info Reference to the context including record descriptors
|
|
|
|
DESCRIPTION
|
|
The function first reads the next sorted record from the sort buffer.
|
|
If a success it calls a callback function that unpacks
|
|
the fields values use in the result set from this buffer into their
|
|
positions in the regular record buffer.
|
|
|
|
RETURN
|
|
0 - Record successfully read.
|
|
-1 - There is no record to be read anymore.
|
|
*/
|
|
|
|
static int rr_unpack_from_buffer(READ_RECORD *info)
|
|
{
|
|
if (info->cache_pos == info->cache_end)
|
|
return -1; /* End of buffer */
|
|
TABLE *table= info->table;
|
|
(*table->sort.unpack)(table->sort.addon_field, info->cache_pos);
|
|
info->cache_pos+= info->ref_length;
|
|
|
|
return 0;
|
|
}
|
|
/* cacheing of records from a database */
|
|
|
|
static int init_rr_cache(THD *thd, READ_RECORD *info)
|
|
{
|
|
uint rec_cache_size;
|
|
DBUG_ENTER("init_rr_cache");
|
|
|
|
info->struct_length= 3+MAX_REFLENGTH;
|
|
info->reclength= ALIGN_SIZE(info->table->s->reclength+1);
|
|
if (info->reclength < info->struct_length)
|
|
info->reclength= ALIGN_SIZE(info->struct_length);
|
|
|
|
info->error_offset= info->table->s->reclength;
|
|
info->cache_records= (thd->variables.read_rnd_buff_size /
|
|
(info->reclength+info->struct_length));
|
|
rec_cache_size= info->cache_records*info->reclength;
|
|
info->rec_cache_size= info->cache_records*info->ref_length;
|
|
|
|
// We have to allocate one more byte to use uint3korr (see comments for it)
|
|
if (info->cache_records <= 2 ||
|
|
!(info->cache=(uchar*) my_malloc_lock(rec_cache_size+info->cache_records*
|
|
info->struct_length+1,
|
|
MYF(0))))
|
|
DBUG_RETURN(1);
|
|
#ifdef HAVE_purify
|
|
// Avoid warnings in qsort
|
|
bzero(info->cache,rec_cache_size+info->cache_records* info->struct_length+1);
|
|
#endif
|
|
DBUG_PRINT("info",("Allocated buffert for %d records",info->cache_records));
|
|
info->read_positions=info->cache+rec_cache_size;
|
|
info->cache_pos=info->cache_end=info->cache;
|
|
DBUG_RETURN(0);
|
|
} /* init_rr_cache */
|
|
|
|
|
|
static int rr_from_cache(READ_RECORD *info)
|
|
{
|
|
reg1 uint i;
|
|
ulong length;
|
|
my_off_t rest_of_file;
|
|
int16 error;
|
|
uchar *position,*ref_position,*record_pos;
|
|
ulong record;
|
|
|
|
for (;;)
|
|
{
|
|
if (info->cache_pos != info->cache_end)
|
|
{
|
|
if (info->cache_pos[info->error_offset])
|
|
{
|
|
shortget(error,info->cache_pos);
|
|
if (info->print_error)
|
|
info->table->file->print_error(error,MYF(0));
|
|
}
|
|
else
|
|
{
|
|
error=0;
|
|
memcpy(info->record,info->cache_pos,
|
|
(size_t) info->table->s->reclength);
|
|
}
|
|
info->cache_pos+=info->reclength;
|
|
return ((int) error);
|
|
}
|
|
length=info->rec_cache_size;
|
|
rest_of_file=info->io_cache->end_of_file - my_b_tell(info->io_cache);
|
|
if ((my_off_t) length > rest_of_file)
|
|
length= (ulong) rest_of_file;
|
|
if (!length || my_b_read(info->io_cache,info->cache,length))
|
|
{
|
|
DBUG_PRINT("info",("Found end of file"));
|
|
return -1; /* End of file */
|
|
}
|
|
|
|
length/=info->ref_length;
|
|
position=info->cache;
|
|
ref_position=info->read_positions;
|
|
for (i=0 ; i < length ; i++,position+=info->ref_length)
|
|
{
|
|
memcpy(ref_position,position,(size_t) info->ref_length);
|
|
ref_position+=MAX_REFLENGTH;
|
|
int3store(ref_position,(long) i);
|
|
ref_position+=3;
|
|
}
|
|
qsort(info->read_positions,length,info->struct_length,(qsort_cmp) rr_cmp);
|
|
|
|
position=info->read_positions;
|
|
for (i=0 ; i < length ; i++)
|
|
{
|
|
memcpy(info->ref_pos,position,(size_t) info->ref_length);
|
|
position+=MAX_REFLENGTH;
|
|
record=uint3korr(position);
|
|
position+=3;
|
|
record_pos=info->cache+record*info->reclength;
|
|
if ((error=(int16) info->file->rnd_pos(record_pos,info->ref_pos)))
|
|
{
|
|
record_pos[info->error_offset]=1;
|
|
shortstore(record_pos,error);
|
|
DBUG_PRINT("error",("Got error: %d:%d when reading row",
|
|
my_errno, error));
|
|
}
|
|
else
|
|
record_pos[info->error_offset]=0;
|
|
}
|
|
info->cache_end=(info->cache_pos=info->cache)+length*info->reclength;
|
|
}
|
|
} /* rr_from_cache */
|
|
|
|
|
|
static int rr_cmp(uchar *a,uchar *b)
|
|
{
|
|
if (a[0] != b[0])
|
|
return (int) a[0] - (int) b[0];
|
|
if (a[1] != b[1])
|
|
return (int) a[1] - (int) b[1];
|
|
if (a[2] != b[2])
|
|
return (int) a[2] - (int) b[2];
|
|
#if MAX_REFLENGTH == 4
|
|
return (int) a[3] - (int) b[3];
|
|
#else
|
|
if (a[3] != b[3])
|
|
return (int) a[3] - (int) b[3];
|
|
if (a[4] != b[4])
|
|
return (int) a[4] - (int) b[4];
|
|
if (a[5] != b[5])
|
|
return (int) a[1] - (int) b[5];
|
|
if (a[6] != b[6])
|
|
return (int) a[6] - (int) b[6];
|
|
return (int) a[7] - (int) b[7];
|
|
#endif
|
|
}
|