mirror of
https://github.com/MariaDB/server.git
synced 2025-01-22 23:04:20 +01:00
fb2ff6daf3
------------------------------------------------------------------------ r6560 | sunny | 2010-02-04 16:11:23 +0200 (Thu, 04 Feb 2010) | 7 lines Changed paths: M /branches/zip/lock/lock0lock.c branches/zip: Remove the additional check introduced in r6534 which tries to check if the joining transaction has any other transactions waiting on its locks. This optimization results in excessive deadlocks when running Sysbench with a large number of threads. The function seems to return FALSE positives. rb://250 ------------------------------------------------------------------------ r6591 | marko | 2010-02-08 10:06:39 +0200 (Mon, 08 Feb 2010) | 3 lines Changed paths: M /branches/zip/row/row0merge.c branches/zip: row_merge_drop_index(): Remove redundant condition on SYS_INDEXES.TABLE_ID. INDEX_ID must be instance-widely unique, because SYS_FIELDS is not indexed by TABLE_ID. ------------------------------------------------------------------------ r6594 | marko | 2010-02-08 12:55:04 +0200 (Mon, 08 Feb 2010) | 2 lines Changed paths: M /branches/zip/rem/rem0rec.c branches/zip: rec_get_nth_field_offs_old(): Replace if (!cond) ut_error; tests with ut_a(cond). ------------------------------------------------------------------------ r6595 | marko | 2010-02-08 13:53:02 +0200 (Mon, 08 Feb 2010) | 1 line Changed paths: M /branches/zip/include/btr0pcur.h M /branches/zip/include/btr0pcur.ic branches/zip: btr_pcur_commit(): Unused function, remove. ------------------------------------------------------------------------ r6608 | marko | 2010-02-09 11:02:37 +0200 (Tue, 09 Feb 2010) | 1 line Changed paths: M /branches/zip/handler/handler0alter.cc branches/zip: ha_innobase::add_index(): Check for !innodb_table. ------------------------------------------------------------------------ r6609 | marko | 2010-02-09 13:45:40 +0200 (Tue, 09 Feb 2010) | 1 line Changed paths: M /branches/zip/dict/dict0dict.c branches/zip: dict_field_print_low(): Add const qualifier. ------------------------------------------------------------------------ r6610 | marko | 2010-02-09 13:53:59 +0200 (Tue, 09 Feb 2010) | 17 lines Changed paths: M /branches/zip/dict/dict0boot.c M /branches/zip/include/dict0boot.h M /branches/zip/row/row0merge.c M /branches/zip/row/row0mysql.c branches/zip: When dropping temporary indexes and tables at startup, first load them to the data dictionary cache and use the normal routines for dropping tables or indexes. This should reduce the risk of bugs and also make the code compatible with the upcoming TablespaceDictionary implementation. DICT_SYS_INDEXES_NAME_FIELD: The clustered index position of SYS_INDEXES.NAME. row_merge_drop_temp_indexes(): Scan SYS_INDEXES for tables containing temporary indexes, and load the tables as needed. Invoke row_merge_drop_index() to drop the indexes. row_mysql_drop_temp_tables(): Scan SYS_TABLES for temporary tables, load them with dict_load_table() and drop them with row_drop_table_for_mysql(). rb://251, not yet reviewed ------------------------------------------------------------------------ r6611 | marko | 2010-02-09 14:28:25 +0200 (Tue, 09 Feb 2010) | 11 lines Changed paths: M /branches/zip/include/log0recv.h M /branches/zip/log/log0recv.c M /branches/zip/srv/srv0start.c branches/zip: Roll back dictionary transaction(s) before scanning *.ibd files innobase_start_or_create_for_mysql(): Roll back data dictionary transactions before scanning the *.ibd files. Then, data dictionary records can be loaded to the cache before opening the *.ibd files. recv_recovery_rollback_active(): Refactored from recv_recovery_from_checkpoint_finish(). rb://235, committing without review, because this is needed for TablespaceDictionary. ------------------------------------------------------------------------ r6612 | marko | 2010-02-09 14:32:39 +0200 (Tue, 09 Feb 2010) | 3 lines Changed paths: M /branches/zip/log/log0recv.c branches/zip: recv_recovery_rollback_active(): Drop the temporary tables and indexes after enabling sync order checks. This should not make any difference. This could have been done in r6611. ------------------------------------------------------------------------ r6614 | inaam | 2010-02-09 20:26:23 +0200 (Tue, 09 Feb 2010) | 7 lines Changed paths: M /branches/zip/srv/srv0srv.c branches/plugin rb://242 Let the master thread sleep if the amount of work to be done is calibrated as taking less than a second. Approved by: Heikki ------------------------------------------------------------------------ r6631 | marko | 2010-02-10 09:19:52 +0200 (Wed, 10 Feb 2010) | 1 line Changed paths: M /branches/zip/ChangeLog branches/zip: Document r6614 in ChangeLog. ------------------------------------------------------------------------ r6633 | marko | 2010-02-10 10:40:55 +0200 (Wed, 10 Feb 2010) | 31 lines Changed paths: M /branches/zip/ChangeLog M /branches/zip/buf/buf0buf.c M /branches/zip/lock/lock0lock.c branches/zip: Merge revisions 6538:6613 from branches/5.1: ------------------------------------------------------------------------ r6545 | jyang | 2010-02-03 03:57:32 +0200 (Wed, 03 Feb 2010) | 8 lines Changed paths: M /branches/5.1/lock/lock0lock.c branches/5.1: Fix bug #49001, "SHOW INNODB STATUS deadlock info incorrect when deadlock detection aborts". Print the correct lock owner when recursive function lock_deadlock_recursive() exceeds its maximum depth LOCK_MAX_DEPTH_IN_DEADLOCK_CHECK. rb://217, approved by Marko. ------------------------------------------------------------------------ r6613 | inaam | 2010-02-09 20:23:09 +0200 (Tue, 09 Feb 2010) | 11 lines Changed paths: M /branches/5.1/buf/buf0buf.c M /branches/5.1/buf/buf0rea.c M /branches/5.1/include/buf0rea.h branches/5.1: Fix Bug #38901 InnoDB logs error repeatedly when trying to load page into buffer pool In buf_page_get_gen() if we are unable to read a page (because of corruption or some other reason) we keep on retrying. This fills up error log with millions of entries in no time and we'd eventually run out of disk space. This patch limits the number of attempts that we make (currently set to 100) and after that we abort with a message. rb://241 Approved by: Heikki ------------------------------------------------------------------------ ------------------------------------------------------------------------ r6635 | marko | 2010-02-10 11:07:05 +0200 (Wed, 10 Feb 2010) | 4 lines Changed paths: M /branches/zip/row/row0sel.c branches/zip: Clean up after r6559. Now that btr_pcur_open_with_no_init() is a macro, do not mix preprocessor directives in the macro invocation, because it is implementation-defined whether that is going to work. ------------------------------------------------------------------------ r6639 | marko | 2010-02-10 13:11:04 +0200 (Wed, 10 Feb 2010) | 1 line Changed paths: M /branches/zip/include/trx0rseg.h M /branches/zip/trx/trx0rseg.c branches/zip: trx_rseg_create(): Unused function, remove. ------------------------------------------------------------------------ r6660 | marko | 2010-02-11 11:21:11 +0200 (Thu, 11 Feb 2010) | 7 lines Changed paths: M /branches/zip/row/row0umod.c branches/zip: Clarify the rollback of INSERT by UPDATE of delete-marked rec. row_undo_mod_remove_clust_low(): Augment the function comment. row_undo_mod_remove_clust_low(), row_undo_mod_del_mark_or_remove_sec_low(), row_undo_mod_del_mark_or_remove_sec(), row_undo_mod_upd_del_sec(): Add ut_ad(node->rec_type == TRX_UNDO_UPD_DEL_REC); ------------------------------------------------------------------------ r6672 | marko | 2010-02-11 13:01:18 +0200 (Thu, 11 Feb 2010) | 1 line Changed paths: M /branches/zip/include/que0que.h M /branches/zip/include/que0que.ic M /branches/zip/row/row0umod.c branches/zip: Introduce thr_is_recv(). ------------------------------------------------------------------------ r6673 | marko | 2010-02-11 13:09:48 +0200 (Thu, 11 Feb 2010) | 9 lines Changed paths: M /branches/zip/btr/btr0cur.c M /branches/zip/include/trx0types.h M /branches/zip/row/row0umod.c branches/zip: Relax a debug assertion about a missing BLOB. (Issue #452) When rolling back an incomplete transaction in purge, tolerate missing BLOBs also in update undo, when undoing an INSERT by updating a delete-marked record, and the delete-marked record is no longer needed. Previously, we only tolerated missing BLOBs in insert undo. This merely fixes a debug assertion; the code performed correctly without UNIV_DEBUG. rb://249 approved by Sunny Bains. ------------------------------------------------------------------------ r6674 | inaam | 2010-02-11 17:54:44 +0200 (Thu, 11 Feb 2010) | 16 lines Changed paths: M /branches/zip/include/mem0mem.h M /branches/zip/include/mem0mem.ic M /branches/zip/mem/mem0mem.c branches/zip bug# 49535 This is a backport of r4924. mem_heap_get_size() scans all allocated blocks to calculate the total size of the heap. This patch introduces a new, total_size, field in mem_block_info_struct. This field is valid only for base block (i.e.: the first block allocated for the heap) and is set to ULINT_UNDEFINED in other blocks. This considerably improves the performance of redo scan during recovery. rb://108 issue#216 Approved by: Heikki ------------------------------------------------------------------------ r6675 | marko | 2010-02-11 22:41:11 +0200 (Thu, 11 Feb 2010) | 1 line Changed paths: M /branches/zip/row/row0umod.c branches/zip: Remove bogus debug assertions introduced in r6660. ------------------------------------------------------------------------ r6707 | inaam | 2010-02-12 19:22:35 +0200 (Fri, 12 Feb 2010) | 4 lines Changed paths: M /branches/zip/ChangeLog branches/zip ChangeLog entry for r6674. ------------------------------------------------------------------------ r6712 | marko | 2010-02-16 10:05:36 +0200 (Tue, 16 Feb 2010) | 2 lines Changed paths: M /branches/zip/trx/trx0trx.c branches/zip: trx_lists_init_at_db_start(): Assert that the kernel_mutex is held by the caller. ------------------------------------------------------------------------ r6713 | sunny | 2010-02-16 10:12:17 +0200 (Tue, 16 Feb 2010) | 7 lines Changed paths: M /branches/zip/include/trx0trx.h branches/zip: Change the bit fields back to ulint. Bit fields were causing problems with concurrency on SMP systems because of word packing issues. The number of trx_t's in a system is not sufficient enough to require that we try and save a few bytes in the data structure. See rb://255 for details. ------------------------------------------------------------------------ r6714 | sunny | 2010-02-16 10:12:25 +0200 (Tue, 16 Feb 2010) | 2 lines Changed paths: M /branches/zip/include/trx0trx.h branches/zip: Update the comments and fix the whitespace issues. See rb://255 Approved by: Marko ------------------------------------------------------------------------ r6715 | sunny | 2010-02-16 10:14:21 +0200 (Tue, 16 Feb 2010) | 1 line Changed paths: M /branches/zip/include/trx0trx.h branches/zip: Fix comment. Non functional change. ------------------------------------------------------------------------ r6717 | marko | 2010-02-16 14:53:20 +0200 (Tue, 16 Feb 2010) | 2 lines Changed paths: M /branches/zip/include/log0log.ic branches/zip: log_reserve_and_write_fast(): Correct a race condition in UNIV_LOG_LSN_DEBUG. This could have caused Issue #440. ------------------------------------------------------------------------ r6718 | marko | 2010-02-16 15:06:16 +0200 (Tue, 16 Feb 2010) | 1 line Changed paths: M /branches/zip/include/trx0trx.h branches/zip: Fix a comment. ------------------------------------------------------------------------ r6723 | marko | 2010-02-17 11:48:34 +0200 (Wed, 17 Feb 2010) | 3 lines Changed paths: M /branches/zip/lock/lock0lock.c branches/zip: lock_table_other_has_incompatible(): Return an incompatible lock or NULL instead of TRUE or FALSE. Approved by Sunny over IM. ------------------------------------------------------------------------ r6724 | marko | 2010-02-17 15:52:05 +0200 (Wed, 17 Feb 2010) | 11 lines Changed paths: M /branches/zip/os/os0file.c branches/zip: Merge revisions 6613:6669 from branches/5.1: ------------------------------------------------------------------------ r6669 | jyang | 2010-02-11 12:24:19 +0200 (Thu, 11 Feb 2010) | 7 lines branches/5.1: Fix bug #50691, AIX implementation of readdir_r causes InnoDB errors. readdir_r() returns an non-NULL value in the case of reaching the end of a directory. It should not be treated as an error return. rb://238 approved by Marko ------------------------------------------------------------------------ ------------------------------------------------------------------------ r6726 | marko | 2010-02-17 18:49:21 +0200 (Wed, 17 Feb 2010) | 3 lines Changed paths: M /branches/zip/include/fil0fil.h branches/zip: FIL_PAGE_FILE_FLUSH_LSN: Note that the field is only valid for the first page of each ibdata* file, not *.ibd files. Suggested by Heikki, in connection with the LSN warning noted in Issue #341. ------------------------------------------------------------------------ r6727 | marko | 2010-02-17 18:50:20 +0200 (Wed, 17 Feb 2010) | 2 lines Changed paths: M /branches/zip/fsp/fsp0fsp.c branches/zip: fsp_init_file_page_low(): Declare the page uninitialized for Valgrind. ------------------------------------------------------------------------ r6728 | marko | 2010-02-17 18:54:04 +0200 (Wed, 17 Feb 2010) | 3 lines Changed paths: M /branches/zip/fsp/fsp0fsp.c M /branches/zip/include/univ.i branches/zip: Remove UNIV_BASIC_LOG_DEBUG. This fixes the FILE_FLUSH_LSN printouts mentioned in Issue #341. Suggested by Heikki. ------------------------------------------------------------------------ r6740 | sunny | 2010-02-18 13:44:31 +0200 (Thu, 18 Feb 2010) | 6 lines Changed paths: M /branches/zip/lock/lock0lock.c branches/zip: Don't print the entire lock bit set if the block was not found in the buffer pool. Only print the bits that are set and that information is in the lock and not in the block. See rb://256 approved by Marko. ------------------------------------------------------------------------ r6749 | vasil | 2010-02-20 18:45:41 +0200 (Sat, 20 Feb 2010) | 5 lines Changed paths: M /branches/embedded-1.0/btr/btr0btr.c M /branches/embedded-1.0/btr/btr0cur.c M /branches/embedded-1.0/btr/btr0pcur.c M /branches/embedded-1.0/buf/buf0buf.c M /branches/embedded-1.0/buf/buf0flu.c M /branches/embedded-1.0/buf/buf0lru.c M /branches/embedded-1.0/dict/dict0boot.c M /branches/embedded-1.0/dict/dict0crea.c M /branches/embedded-1.0/dict/dict0dict.c M /branches/embedded-1.0/dict/dict0load.c M /branches/embedded-1.0/fil/fil0fil.c M /branches/embedded-1.0/fsp/fsp0fsp.c M /branches/embedded-1.0/ibuf/ibuf0ibuf.c M /branches/embedded-1.0/include/btr0btr.h M /branches/embedded-1.0/include/btr0cur.h M /branches/embedded-1.0/include/btr0pcur.h M /branches/embedded-1.0/include/btr0pcur.ic M /branches/embedded-1.0/include/buf0buf.h M /branches/embedded-1.0/include/buf0buf.ic M /branches/embedded-1.0/include/dict0boot.h M /branches/embedded-1.0/include/fil0fil.h M /branches/embedded-1.0/include/lock0lock.h M /branches/embedded-1.0/include/log0log.h M /branches/embedded-1.0/include/log0log.ic M /branches/embedded-1.0/include/log0recv.h M /branches/embedded-1.0/include/mem0dbg.h M /branches/embedded-1.0/include/mem0dbg.ic M /branches/embedded-1.0/include/mem0mem.h M /branches/embedded-1.0/include/mem0mem.ic M /branches/embedded-1.0/include/os0file.h M /branches/embedded-1.0/include/os0sync.h M /branches/embedded-1.0/include/os0sync.ic M /branches/embedded-1.0/include/os0thread.h M /branches/embedded-1.0/include/que0que.h M /branches/embedded-1.0/include/que0que.ic M /branches/embedded-1.0/include/row0merge.h M /branches/embedded-1.0/include/row0prebuilt.h M /branches/embedded-1.0/include/srv0srv.h M /branches/embedded-1.0/include/sync0sync.h M /branches/embedded-1.0/include/trx0rseg.h M /branches/embedded-1.0/include/trx0sys.h M /branches/embedded-1.0/include/trx0trx.h M /branches/embedded-1.0/include/trx0types.h M /branches/embedded-1.0/include/trx0undo.h M /branches/embedded-1.0/include/trx0xa.h M /branches/embedded-1.0/include/univ.i M /branches/embedded-1.0/include/ut0vec.h M /branches/embedded-1.0/include/ut0vec.ic M /branches/embedded-1.0/lock/lock0lock.c M /branches/embedded-1.0/log/log0log.c M /branches/embedded-1.0/log/log0recv.c M /branches/embedded-1.0/mem/mem0mem.c M /branches/embedded-1.0/os/os0file.c M /branches/embedded-1.0/os/os0thread.c M /branches/embedded-1.0/page/page0page.c M /branches/embedded-1.0/rem/rem0rec.c M /branches/embedded-1.0/row/row0ins.c M /branches/embedded-1.0/row/row0merge.c M /branches/embedded-1.0/row/row0prebuilt.c M /branches/embedded-1.0/row/row0sel.c M /branches/embedded-1.0/row/row0umod.c M /branches/embedded-1.0/row/row0undo.c M /branches/embedded-1.0/row/row0upd.c M /branches/embedded-1.0/srv/srv0srv.c M /branches/embedded-1.0/srv/srv0start.c M /branches/embedded-1.0/sync/sync0sync.c M /branches/embedded-1.0/trx/trx0sys.c M /branches/embedded-1.0/trx/trx0trx.c M /branches/embedded-1.0/trx/trx0undo.c M /branches/embedded-1.0/ut/ut0mem.c M /branches/innodb+/btr/btr0btr.c M /branches/innodb+/btr/btr0cur.c M /branches/innodb+/btr/btr0pcur.c M /branches/innodb+/buf/buf0buf.c M /branches/innodb+/buf/buf0lru.c M /branches/innodb+/dict/dict0crea.c M /branches/innodb+/dict/dict0dict.c M /branches/innodb+/dict/dict0load.c M /branches/innodb+/handler/ha_innodb.cc M /branches/innodb+/handler/ha_innodb.h M /branches/innodb+/handler/handler0alter.cc M /branches/innodb+/include/btr0btr.h M /branches/innodb+/include/btr0cur.h M /branches/innodb+/include/btr0pcur.h M /branches/innodb+/include/btr0pcur.ic M /branches/innodb+/include/buf0buf.h M /branches/innodb+/include/log0log.h M /branches/innodb+/include/mem0dbg.h M /branches/innodb+/include/mem0dbg.ic M /branches/innodb+/include/os0file.h M /branches/innodb+/include/row0mysql.h M /branches/innodb+/include/srv0srv.h M /branches/innodb+/include/sync0sync.h M /branches/innodb+/include/trx0trx.h M /branches/innodb+/lock/lock0lock.c M /branches/innodb+/log/log0log.c M /branches/innodb+/log/log0recv.c M /branches/innodb+/mem/mem0dbg.c M /branches/innodb+/os/os0file.c M /branches/innodb+/page/page0page.c M /branches/innodb+/row/row0ins.c M /branches/innodb+/row/row0mysql.c M /branches/innodb+/row/row0sel.c M /branches/innodb+/srv/srv0srv.c M /branches/innodb+/srv/srv0start.c M /branches/innodb+/sync/sync0sync.c M /branches/innodb+_metrics_table/btr/btr0btr.c M /branches/innodb+_metrics_table/buf/buf0buf.c M /branches/innodb+_metrics_table/buf/buf0flu.c M /branches/innodb+_metrics_table/dict/dict0crea.c M /branches/innodb+_metrics_table/dict/dict0dict.c M /branches/innodb+_metrics_table/dict/dict0load.c M /branches/innodb+_metrics_table/handler/ha_innodb.cc M /branches/innodb+_metrics_table/handler/ha_innodb.h M /branches/innodb+_metrics_table/handler/handler0alter.cc M /branches/innodb+_metrics_table/handler/i_s.cc M /branches/innodb+_metrics_table/handler/i_s.h M /branches/innodb+_metrics_table/include/mem0dbg.h M /branches/innodb+_metrics_table/include/mem0dbg.ic M /branches/innodb+_metrics_table/include/srv0mon.h M /branches/innodb+_metrics_table/include/srv0mon.ic M /branches/innodb+_metrics_table/include/srv0srv.h M /branches/innodb+_metrics_table/lock/lock0lock.c M /branches/innodb+_metrics_table/log/log0log.c M /branches/innodb+_metrics_table/mem/mem0dbg.c M /branches/innodb+_metrics_table/os/os0file.c M /branches/innodb+_metrics_table/page/page0zip.c M /branches/innodb+_metrics_table/row/row0mysql.c M /branches/innodb+_metrics_table/row/row0purge.c M /branches/innodb+_metrics_table/row/row0sel.c M /branches/innodb+_metrics_table/srv/srv0mon.c M /branches/innodb+_metrics_table/srv/srv0srv.c M /branches/innodb+_metrics_table/sync/sync0sync.c M /branches/innodb+_metrics_table/trx/trx0roll.c M /branches/innodb+_metrics_table/trx/trx0trx.c M /branches/innodb+_persistent_stats/btr/btr0btr.c M /branches/innodb+_persistent_stats/buf/buf0buf.c M /branches/innodb+_persistent_stats/data/data0type.c M /branches/innodb+_persistent_stats/dict/dict0boot.c M /branches/innodb+_persistent_stats/dict/dict0crea.c M /branches/innodb+_persistent_stats/dict/dict0dict.c M /branches/innodb+_persistent_stats/dict/dict0load.c M /branches/innodb+_persistent_stats/dict/dict0mem.c M /branches/innodb+_persistent_stats/fil/fil0fil.c M /branches/innodb+_persistent_stats/fsp/fsp0fsp.c M /branches/innodb+_persistent_stats/handler/ha_innodb.cc M /branches/innodb+_persistent_stats/handler/ha_innodb.h M /branches/innodb+_persistent_stats/handler/handler0alter.cc M /branches/innodb+_persistent_stats/ibuf/ibuf0ibuf.c M /branches/innodb+_persistent_stats/include/btr0pcur.h M /branches/innodb+_persistent_stats/include/btr0pcur.ic M /branches/innodb+_persistent_stats/include/db0err.h M /branches/innodb+_persistent_stats/include/dict0dict.h M /branches/innodb+_persistent_stats/include/dict0mem.h M /branches/innodb+_persistent_stats/include/ha_prototypes.h M /branches/innodb+_persistent_stats/include/lock0lock.h M /branches/innodb+_persistent_stats/include/log0log.h M /branches/innodb+_persistent_stats/include/log0recv.h M /branches/innodb+_persistent_stats/include/mem0dbg.h M /branches/innodb+_persistent_stats/include/mem0dbg.ic M /branches/innodb+_persistent_stats/include/os0file.h M /branches/innodb+_persistent_stats/include/pars0pars.h M /branches/innodb+_persistent_stats/include/srv0srv.h M /branches/innodb+_persistent_stats/include/sync0sync.h M /branches/innodb+_persistent_stats/include/trx0sys.h M /branches/innodb+_persistent_stats/include/trx0trx.h M /branches/innodb+_persistent_stats/include/ut0lst.h M /branches/innodb+_persistent_stats/include/ut0ut.h M /branches/innodb+_persistent_stats/lock/lock0lock.c M /branches/innodb+_persistent_stats/log/log0log.c M /branches/innodb+_persistent_stats/log/log0recv.c M /branches/innodb+_persistent_stats/mem/mem0dbg.c M /branches/innodb+_persistent_stats/os/os0file.c M /branches/innodb+_persistent_stats/page/page0page.c M /branches/innodb+_persistent_stats/pars/pars0pars.c M /branches/innodb+_persistent_stats/row/row0merge.c M /branches/innodb+_persistent_stats/row/row0mysql.c M /branches/innodb+_persistent_stats/row/row0sel.c M /branches/innodb+_persistent_stats/row/row0umod.c M /branches/innodb+_persistent_stats/row/row0upd.c M /branches/innodb+_persistent_stats/srv/srv0srv.c M /branches/innodb+_persistent_stats/srv/srv0start.c M /branches/innodb+_persistent_stats/sync/sync0sync.c M /branches/innodb+_persistent_stats/trx/trx0i_s.c M /branches/innodb+_persistent_stats/trx/trx0sys.c M /branches/innodb+_persistent_stats/trx/trx0trx.c M /branches/innodb+_persistent_stats/ut/ut0ut.c M /branches/innofts+/handler/ha_innodb.cc M /branches/innofts+/handler/i_s.cc M /branches/innofts+/handler/i_s.h M /branches/innofts+/include/fut0fut.h M /branches/performance_schema/btr/btr0sea.c M /branches/performance_schema/buf/buf0buf.c M /branches/performance_schema/dict/dict0dict.c M /branches/performance_schema/fil/fil0fil.c M /branches/performance_schema/handler/ha_innodb.cc M /branches/performance_schema/include/srv0srv.h M /branches/performance_schema/include/sync0rw.h M /branches/performance_schema/include/sync0rw.ic M /branches/performance_schema/include/sync0sync.h M /branches/performance_schema/include/sync0sync.ic M /branches/performance_schema/include/sync0types.h M /branches/performance_schema/log/log0log.c M /branches/performance_schema/srv/srv0srv.c M /branches/performance_schema/sync/sync0rw.c M /branches/performance_schema/trx/trx0i_s.c M /branches/performance_schema/trx/trx0purge.c M /branches/plugin-2.0/buf/buf0buf.c M /branches/plugin-2.0/buf/buf0lru.c M /branches/plugin-2.0/dict/dict0boot.c M /branches/plugin-2.0/dict/dict0crea.c M /branches/plugin-2.0/dict/dict0dict.c M /branches/plugin-2.0/dict/dict0load.c M /branches/plugin-2.0/dict/dict0mem.c M /branches/plugin-2.0/fil/fil0fil.c M /branches/plugin-2.0/fsp/fsp0fsp.c M /branches/plugin-2.0/handler/ha_innodb.cc M /branches/plugin-2.0/handler/ha_innodb.h M /branches/plugin-2.0/handler/handler0alter.cc M /branches/plugin-2.0/ibuf/ibuf0ibuf.c M /branches/plugin-2.0/include/dict0mem.h M /branches/plugin-2.0/include/ha_prototypes.h M /branches/plugin-2.0/include/lock0lock.h M /branches/plugin-2.0/include/log0log.h M /branches/plugin-2.0/include/log0recv.h M /branches/plugin-2.0/include/mem0dbg.h M /branches/plugin-2.0/include/mem0dbg.ic M /branches/plugin-2.0/include/os0file.h M /branches/plugin-2.0/include/row0mysql.h M /branches/plugin-2.0/include/srv0srv.h M /branches/plugin-2.0/include/sync0sync.h M /branches/plugin-2.0/include/trx0sys.h M /branches/plugin-2.0/include/trx0trx.h M /branches/plugin-2.0/lock/lock0lock.c M /branches/plugin-2.0/log/log0log.c M /branches/plugin-2.0/log/log0recv.c M /branches/plugin-2.0/mem/mem0dbg.c M /branches/plugin-2.0/os/os0file.c M /branches/plugin-2.0/page/page0page.c M /branches/plugin-2.0/row/row0merge.c M /branches/plugin-2.0/row/row0mysql.c M /branches/plugin-2.0/row/row0sel.c M /branches/plugin-2.0/row/row0umod.c M /branches/plugin-2.0/row/row0upd.c M /branches/plugin-2.0/srv/srv0srv.c M /branches/plugin-2.0/srv/srv0start.c M /branches/plugin-2.0/sync/sync0sync.c M /branches/plugin-2.0/trx/trx0i_s.c M /branches/plugin-2.0/trx/trx0sys.c M /branches/plugin-2.0/trx/trx0trx.c M /branches/zip/btr/btr0btr.c M /branches/zip/btr/btr0cur.c M /branches/zip/btr/btr0pcur.c M /branches/zip/buf/buf0buf.c M /branches/zip/buf/buf0lru.c M /branches/zip/dict/dict0boot.c M /branches/zip/dict/dict0crea.c M /branches/zip/dict/dict0dict.c M /branches/zip/dict/dict0load.c M /branches/zip/fsp/fsp0fsp.c M /branches/zip/handler/ha_innodb.cc M /branches/zip/handler/ha_innodb.h M /branches/zip/handler/handler0alter.cc M /branches/zip/include/btr0btr.h M /branches/zip/include/btr0cur.h M /branches/zip/include/btr0pcur.h M /branches/zip/include/btr0pcur.ic M /branches/zip/include/buf0buf.h M /branches/zip/include/dict0boot.h M /branches/zip/include/fil0fil.h M /branches/zip/include/log0log.h M /branches/zip/include/log0log.ic M /branches/zip/include/log0recv.h M /branches/zip/include/mem0dbg.h M /branches/zip/include/mem0dbg.ic M /branches/zip/include/mem0mem.h M /branches/zip/include/mem0mem.ic M /branches/zip/include/os0file.h M /branches/zip/include/que0que.h M /branches/zip/include/que0que.ic M /branches/zip/include/row0mysql.h M /branches/zip/include/srv0srv.h M /branches/zip/include/sync0sync.h M /branches/zip/include/trx0rseg.h M /branches/zip/include/trx0trx.h M /branches/zip/include/trx0types.h M /branches/zip/include/univ.i M /branches/zip/lock/lock0lock.c M /branches/zip/log/log0log.c M /branches/zip/log/log0recv.c M /branches/zip/mem/mem0dbg.c M /branches/zip/mem/mem0mem.c M /branches/zip/os/os0file.c M /branches/zip/page/page0page.c M /branches/zip/rem/rem0rec.c M /branches/zip/row/row0ins.c M /branches/zip/row/row0merge.c M /branches/zip/row/row0mysql.c M /branches/zip/row/row0sel.c M /branches/zip/row/row0umod.c M /branches/zip/srv/srv0srv.c M /branches/zip/srv/srv0start.c M /branches/zip/sync/sync0sync.c M /branches/zip/trx/trx0rseg.c M /branches/zip/trx/trx0trx.c Non-functional change: update copyright year to 2010 of the files that have been modified after 2010-01-01 according to svn. for f in $(svn log -v -r{2010-01-01}:HEAD |grep "^ M " |cut -b 16- |sort -u) ; do sed -i "" -E 's/(Copyright \(c\) [0-9]{4},) [0-9]{4}, (.*Innobase Oy.+All Rights Reserved)/\1 2010, \2/' $f ; done ------------------------------------------------------------------------ r6750 | marko | 2010-02-22 08:57:23 +0200 (Mon, 22 Feb 2010) | 2 lines Changed paths: M /branches/zip/include/row0sel.h M /branches/zip/row/row0sel.c branches/zip: row_fetch_store_uint4(): Remove unused function. This was added to trunk in r435. ------------------------------------------------------------------------ r6754 | marko | 2010-02-24 10:56:43 +0200 (Wed, 24 Feb 2010) | 17 lines Changed paths: M /branches/zip/row/row0merge.c branches/zip: Allocate the merge sort buffers from a heap, not stack. The merge sort can use up to 48KiB of buffers when merging blocks. That can cause a stack overflow, especially on 64-bit systems when not building with inlined functions. This was reported as Issue #462. row_merge_dup_report(): Allocate buf and offsets from a heap. row_merge_heap_create(): Allocate space for buf[3] too. Fix bogus sizeof arithmetics that happened to work, because sizeof(ulint)==sizeof(void*). row_merge_blocks(), row_merge_blocks_copy(): Allocate buf[3] from heap. row_merge_insert_index_tuples(): Allocate buf from graph_heap. rb://258 approved and tested by Sunny Bains ------------------------------------------------------------------------ r6767 | calvin | 2010-03-01 18:16:10 +0200 (Mon, 01 Mar 2010) | 3 lines Changed paths: M /branches/zip/srv/srv0srv.c branches/zip: fix bug#51587 Non-functional change. ------------------------------------------------------------------------ r6768 | vasil | 2010-03-02 18:20:48 +0200 (Tue, 02 Mar 2010) | 5 lines Changed paths: M /branches/zip/include/btr0btr.h M /branches/zip/include/btr0btr.ic branches/zip: Add a NOTE to the comment of btr_node_ptr_get_child_page_no() to prevent mysterious bugs. ------------------------------------------------------------------------ r6770 | marko | 2010-03-03 12:52:55 +0200 (Wed, 03 Mar 2010) | 12 lines Changed paths: M /branches/zip/handler/handler0alter.cc M /branches/zip/mysql-test/innodb-index.result M /branches/zip/mysql-test/innodb-index.test M /branches/zip/mysql-test/innodb.result M /branches/zip/mysql-test/innodb.test branches/zip: Disallow duplicate index name when creating an index. This should fix Mantis Issue #461. innodb.test, innodb.result, innodb-index.test, innodb-index.result: Adjust the test result and mention that the introduced restriction has been reported as MySQL Bug #51451. innobase_check_index_keys(): Add a parameter for the InnoDB table and check that no duplicate index name is added. Report errors by my_error() instead of sql_print_error(). rb://260 approved by Sunny Bains ------------------------------------------------------------------------ r6771 | marko | 2010-03-03 14:52:43 +0200 (Wed, 03 Mar 2010) | 1 line Changed paths: M /branches/zip/ChangeLog Document r6770. ------------------------------------------------------------------------ r6773 | marko | 2010-03-03 15:31:54 +0200 (Wed, 03 Mar 2010) | 2 lines Changed paths: M /branches/zip/row/row0row.c branches/zip: row_raw_format(): Silence a GCC 4.4.2 warning of possibly uninitialized variable format_in_hex. ------------------------------------------------------------------------
1202 lines
32 KiB
C
1202 lines
32 KiB
C
/*****************************************************************************
|
|
|
|
Copyright (c) 1996, 2009, Innobase Oy. All Rights Reserved.
|
|
|
|
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
|
|
|
|
*****************************************************************************/
|
|
|
|
/**************************************************//**
|
|
@file row/row0row.c
|
|
General row routines
|
|
|
|
Created 4/20/1996 Heikki Tuuri
|
|
*******************************************************/
|
|
|
|
#include "row0row.h"
|
|
|
|
#ifdef UNIV_NONINL
|
|
#include "row0row.ic"
|
|
#endif
|
|
|
|
#include "data0type.h"
|
|
#include "dict0dict.h"
|
|
#include "btr0btr.h"
|
|
#include "ha_prototypes.h"
|
|
#include "mach0data.h"
|
|
#include "trx0rseg.h"
|
|
#include "trx0trx.h"
|
|
#include "trx0roll.h"
|
|
#include "trx0undo.h"
|
|
#include "trx0purge.h"
|
|
#include "trx0rec.h"
|
|
#include "que0que.h"
|
|
#include "row0ext.h"
|
|
#include "row0upd.h"
|
|
#include "rem0cmp.h"
|
|
#include "read0read.h"
|
|
#include "ut0mem.h"
|
|
|
|
/*********************************************************************//**
|
|
Gets the offset of trx id field, in bytes relative to the origin of
|
|
a clustered index record.
|
|
@return offset of DATA_TRX_ID */
|
|
UNIV_INTERN
|
|
ulint
|
|
row_get_trx_id_offset(
|
|
/*==================*/
|
|
const rec_t* rec __attribute__((unused)),
|
|
/*!< in: record */
|
|
dict_index_t* index, /*!< in: clustered index */
|
|
const ulint* offsets)/*!< in: rec_get_offsets(rec, index) */
|
|
{
|
|
ulint pos;
|
|
ulint offset;
|
|
ulint len;
|
|
|
|
ut_ad(dict_index_is_clust(index));
|
|
ut_ad(rec_offs_validate(rec, index, offsets));
|
|
|
|
pos = dict_index_get_sys_col_pos(index, DATA_TRX_ID);
|
|
|
|
offset = rec_get_nth_field_offs(offsets, pos, &len);
|
|
|
|
ut_ad(len == DATA_TRX_ID_LEN);
|
|
|
|
return(offset);
|
|
}
|
|
|
|
/*****************************************************************//**
|
|
When an insert or purge to a table is performed, this function builds
|
|
the entry to be inserted into or purged from an index on the table.
|
|
@return index entry which should be inserted or purged, or NULL if the
|
|
externally stored columns in the clustered index record are
|
|
unavailable and ext != NULL */
|
|
UNIV_INTERN
|
|
dtuple_t*
|
|
row_build_index_entry(
|
|
/*==================*/
|
|
const dtuple_t* row, /*!< in: row which should be
|
|
inserted or purged */
|
|
row_ext_t* ext, /*!< in: externally stored column prefixes,
|
|
or NULL */
|
|
dict_index_t* index, /*!< in: index on the table */
|
|
mem_heap_t* heap) /*!< in: memory heap from which the memory for
|
|
the index entry is allocated */
|
|
{
|
|
dtuple_t* entry;
|
|
ulint entry_len;
|
|
ulint i;
|
|
|
|
ut_ad(row && index && heap);
|
|
ut_ad(dtuple_check_typed(row));
|
|
|
|
entry_len = dict_index_get_n_fields(index);
|
|
entry = dtuple_create(heap, entry_len);
|
|
|
|
if (UNIV_UNLIKELY(index->type & DICT_UNIVERSAL)) {
|
|
dtuple_set_n_fields_cmp(entry, entry_len);
|
|
/* There may only be externally stored columns
|
|
in a clustered index B-tree of a user table. */
|
|
ut_a(!ext);
|
|
} else {
|
|
dtuple_set_n_fields_cmp(
|
|
entry, dict_index_get_n_unique_in_tree(index));
|
|
}
|
|
|
|
for (i = 0; i < entry_len; i++) {
|
|
const dict_field_t* ind_field
|
|
= dict_index_get_nth_field(index, i);
|
|
const dict_col_t* col
|
|
= ind_field->col;
|
|
ulint col_no
|
|
= dict_col_get_no(col);
|
|
dfield_t* dfield
|
|
= dtuple_get_nth_field(entry, i);
|
|
const dfield_t* dfield2
|
|
= dtuple_get_nth_field(row, col_no);
|
|
ulint len
|
|
= dfield_get_len(dfield2);
|
|
|
|
dfield_copy(dfield, dfield2);
|
|
|
|
if (dfield_is_null(dfield) || ind_field->prefix_len == 0) {
|
|
continue;
|
|
}
|
|
|
|
/* If a column prefix index, take only the prefix.
|
|
Prefix-indexed columns may be externally stored. */
|
|
ut_ad(col->ord_part);
|
|
|
|
if (UNIV_LIKELY_NULL(ext)) {
|
|
/* See if the column is stored externally. */
|
|
const byte* buf = row_ext_lookup(ext, col_no,
|
|
&len);
|
|
if (UNIV_LIKELY_NULL(buf)) {
|
|
if (UNIV_UNLIKELY(buf == field_ref_zero)) {
|
|
return(NULL);
|
|
}
|
|
dfield_set_data(dfield, buf, len);
|
|
}
|
|
} else if (dfield_is_ext(dfield)) {
|
|
ut_a(len >= BTR_EXTERN_FIELD_REF_SIZE);
|
|
len -= BTR_EXTERN_FIELD_REF_SIZE;
|
|
ut_a(ind_field->prefix_len <= len
|
|
|| dict_index_is_clust(index));
|
|
}
|
|
|
|
len = dtype_get_at_most_n_mbchars(
|
|
col->prtype, col->mbminlen, col->mbmaxlen,
|
|
ind_field->prefix_len, len, dfield_get_data(dfield));
|
|
dfield_set_len(dfield, len);
|
|
}
|
|
|
|
ut_ad(dtuple_check_typed(entry));
|
|
|
|
return(entry);
|
|
}
|
|
|
|
/*******************************************************************//**
|
|
An inverse function to row_build_index_entry. Builds a row from a
|
|
record in a clustered index.
|
|
@return own: row built; see the NOTE below! */
|
|
UNIV_INTERN
|
|
dtuple_t*
|
|
row_build(
|
|
/*======*/
|
|
ulint type, /*!< in: ROW_COPY_POINTERS or
|
|
ROW_COPY_DATA; the latter
|
|
copies also the data fields to
|
|
heap while the first only
|
|
places pointers to data fields
|
|
on the index page, and thus is
|
|
more efficient */
|
|
const dict_index_t* index, /*!< in: clustered index */
|
|
const rec_t* rec, /*!< in: record in the clustered
|
|
index; NOTE: in the case
|
|
ROW_COPY_POINTERS the data
|
|
fields in the row will point
|
|
directly into this record,
|
|
therefore, the buffer page of
|
|
this record must be at least
|
|
s-latched and the latch held
|
|
as long as the row dtuple is used! */
|
|
const ulint* offsets,/*!< in: rec_get_offsets(rec,index)
|
|
or NULL, in which case this function
|
|
will invoke rec_get_offsets() */
|
|
const dict_table_t* col_table,
|
|
/*!< in: table, to check which
|
|
externally stored columns
|
|
occur in the ordering columns
|
|
of an index, or NULL if
|
|
index->table should be
|
|
consulted instead */
|
|
row_ext_t** ext, /*!< out, own: cache of
|
|
externally stored column
|
|
prefixes, or NULL */
|
|
mem_heap_t* heap) /*!< in: memory heap from which
|
|
the memory needed is allocated */
|
|
{
|
|
dtuple_t* row;
|
|
const dict_table_t* table;
|
|
ulint n_fields;
|
|
ulint n_ext_cols;
|
|
ulint* ext_cols = NULL; /* remove warning */
|
|
ulint len;
|
|
ulint row_len;
|
|
byte* buf;
|
|
ulint i;
|
|
ulint j;
|
|
mem_heap_t* tmp_heap = NULL;
|
|
ulint offsets_[REC_OFFS_NORMAL_SIZE];
|
|
rec_offs_init(offsets_);
|
|
|
|
ut_ad(index && rec && heap);
|
|
ut_ad(dict_index_is_clust(index));
|
|
|
|
if (!offsets) {
|
|
offsets = rec_get_offsets(rec, index, offsets_,
|
|
ULINT_UNDEFINED, &tmp_heap);
|
|
} else {
|
|
ut_ad(rec_offs_validate(rec, index, offsets));
|
|
}
|
|
|
|
if (type != ROW_COPY_POINTERS) {
|
|
/* Take a copy of rec to heap */
|
|
buf = mem_heap_alloc(heap, rec_offs_size(offsets));
|
|
rec = rec_copy(buf, rec, offsets);
|
|
/* Avoid a debug assertion in rec_offs_validate(). */
|
|
rec_offs_make_valid(rec, index, (ulint*) offsets);
|
|
}
|
|
|
|
table = index->table;
|
|
row_len = dict_table_get_n_cols(table);
|
|
|
|
row = dtuple_create(heap, row_len);
|
|
|
|
dict_table_copy_types(row, table);
|
|
|
|
dtuple_set_info_bits(row, rec_get_info_bits(
|
|
rec, dict_table_is_comp(table)));
|
|
|
|
n_fields = rec_offs_n_fields(offsets);
|
|
n_ext_cols = rec_offs_n_extern(offsets);
|
|
if (n_ext_cols) {
|
|
ext_cols = mem_heap_alloc(heap, n_ext_cols * sizeof *ext_cols);
|
|
}
|
|
|
|
for (i = j = 0; i < n_fields; i++) {
|
|
dict_field_t* ind_field
|
|
= dict_index_get_nth_field(index, i);
|
|
const dict_col_t* col
|
|
= dict_field_get_col(ind_field);
|
|
ulint col_no
|
|
= dict_col_get_no(col);
|
|
dfield_t* dfield
|
|
= dtuple_get_nth_field(row, col_no);
|
|
|
|
if (ind_field->prefix_len == 0) {
|
|
|
|
const byte* field = rec_get_nth_field(
|
|
rec, offsets, i, &len);
|
|
|
|
dfield_set_data(dfield, field, len);
|
|
}
|
|
|
|
if (rec_offs_nth_extern(offsets, i)) {
|
|
dfield_set_ext(dfield);
|
|
|
|
if (UNIV_LIKELY_NULL(col_table)) {
|
|
ut_a(col_no
|
|
< dict_table_get_n_cols(col_table));
|
|
col = dict_table_get_nth_col(
|
|
col_table, col_no);
|
|
}
|
|
|
|
if (col->ord_part) {
|
|
/* We will have to fetch prefixes of
|
|
externally stored columns that are
|
|
referenced by column prefixes. */
|
|
ext_cols[j++] = col_no;
|
|
}
|
|
}
|
|
}
|
|
|
|
ut_ad(dtuple_check_typed(row));
|
|
|
|
if (j) {
|
|
*ext = row_ext_create(j, ext_cols, row,
|
|
dict_table_zip_size(index->table),
|
|
heap);
|
|
} else {
|
|
*ext = NULL;
|
|
}
|
|
|
|
if (tmp_heap) {
|
|
mem_heap_free(tmp_heap);
|
|
}
|
|
|
|
return(row);
|
|
}
|
|
|
|
/*******************************************************************//**
|
|
Converts an index record to a typed data tuple.
|
|
@return index entry built; does not set info_bits, and the data fields
|
|
in the entry will point directly to rec */
|
|
UNIV_INTERN
|
|
dtuple_t*
|
|
row_rec_to_index_entry_low(
|
|
/*=======================*/
|
|
const rec_t* rec, /*!< in: record in the index */
|
|
const dict_index_t* index, /*!< in: index */
|
|
const ulint* offsets,/*!< in: rec_get_offsets(rec, index) */
|
|
ulint* n_ext, /*!< out: number of externally
|
|
stored columns */
|
|
mem_heap_t* heap) /*!< in: memory heap from which
|
|
the memory needed is allocated */
|
|
{
|
|
dtuple_t* entry;
|
|
dfield_t* dfield;
|
|
ulint i;
|
|
const byte* field;
|
|
ulint len;
|
|
ulint rec_len;
|
|
|
|
ut_ad(rec && heap && index);
|
|
/* Because this function may be invoked by row0merge.c
|
|
on a record whose header is in different format, the check
|
|
rec_offs_validate(rec, index, offsets) must be avoided here. */
|
|
ut_ad(n_ext);
|
|
*n_ext = 0;
|
|
|
|
rec_len = rec_offs_n_fields(offsets);
|
|
|
|
entry = dtuple_create(heap, rec_len);
|
|
|
|
dtuple_set_n_fields_cmp(entry,
|
|
dict_index_get_n_unique_in_tree(index));
|
|
ut_ad(rec_len == dict_index_get_n_fields(index));
|
|
|
|
dict_index_copy_types(entry, index, rec_len);
|
|
|
|
for (i = 0; i < rec_len; i++) {
|
|
|
|
dfield = dtuple_get_nth_field(entry, i);
|
|
field = rec_get_nth_field(rec, offsets, i, &len);
|
|
|
|
dfield_set_data(dfield, field, len);
|
|
|
|
if (rec_offs_nth_extern(offsets, i)) {
|
|
dfield_set_ext(dfield);
|
|
(*n_ext)++;
|
|
}
|
|
}
|
|
|
|
ut_ad(dtuple_check_typed(entry));
|
|
|
|
return(entry);
|
|
}
|
|
|
|
/*******************************************************************//**
|
|
Converts an index record to a typed data tuple. NOTE that externally
|
|
stored (often big) fields are NOT copied to heap.
|
|
@return own: index entry built; see the NOTE below! */
|
|
UNIV_INTERN
|
|
dtuple_t*
|
|
row_rec_to_index_entry(
|
|
/*===================*/
|
|
ulint type, /*!< in: ROW_COPY_DATA, or
|
|
ROW_COPY_POINTERS: the former
|
|
copies also the data fields to
|
|
heap as the latter only places
|
|
pointers to data fields on the
|
|
index page */
|
|
const rec_t* rec, /*!< in: record in the index;
|
|
NOTE: in the case
|
|
ROW_COPY_POINTERS the data
|
|
fields in the row will point
|
|
directly into this record,
|
|
therefore, the buffer page of
|
|
this record must be at least
|
|
s-latched and the latch held
|
|
as long as the dtuple is used! */
|
|
const dict_index_t* index, /*!< in: index */
|
|
ulint* offsets,/*!< in/out: rec_get_offsets(rec) */
|
|
ulint* n_ext, /*!< out: number of externally
|
|
stored columns */
|
|
mem_heap_t* heap) /*!< in: memory heap from which
|
|
the memory needed is allocated */
|
|
{
|
|
dtuple_t* entry;
|
|
byte* buf;
|
|
|
|
ut_ad(rec && heap && index);
|
|
ut_ad(rec_offs_validate(rec, index, offsets));
|
|
|
|
if (type == ROW_COPY_DATA) {
|
|
/* Take a copy of rec to heap */
|
|
buf = mem_heap_alloc(heap, rec_offs_size(offsets));
|
|
rec = rec_copy(buf, rec, offsets);
|
|
/* Avoid a debug assertion in rec_offs_validate(). */
|
|
rec_offs_make_valid(rec, index, offsets);
|
|
}
|
|
|
|
entry = row_rec_to_index_entry_low(rec, index, offsets, n_ext, heap);
|
|
|
|
dtuple_set_info_bits(entry,
|
|
rec_get_info_bits(rec, rec_offs_comp(offsets)));
|
|
|
|
return(entry);
|
|
}
|
|
|
|
/*******************************************************************//**
|
|
Builds from a secondary index record a row reference with which we can
|
|
search the clustered index record.
|
|
@return own: row reference built; see the NOTE below! */
|
|
UNIV_INTERN
|
|
dtuple_t*
|
|
row_build_row_ref(
|
|
/*==============*/
|
|
ulint type, /*!< in: ROW_COPY_DATA, or ROW_COPY_POINTERS:
|
|
the former copies also the data fields to
|
|
heap, whereas the latter only places pointers
|
|
to data fields on the index page */
|
|
dict_index_t* index, /*!< in: secondary index */
|
|
const rec_t* rec, /*!< in: record in the index;
|
|
NOTE: in the case ROW_COPY_POINTERS
|
|
the data fields in the row will point
|
|
directly into this record, therefore,
|
|
the buffer page of this record must be
|
|
at least s-latched and the latch held
|
|
as long as the row reference is used! */
|
|
mem_heap_t* heap) /*!< in: memory heap from which the memory
|
|
needed is allocated */
|
|
{
|
|
dict_table_t* table;
|
|
dict_index_t* clust_index;
|
|
dfield_t* dfield;
|
|
dtuple_t* ref;
|
|
const byte* field;
|
|
ulint len;
|
|
ulint ref_len;
|
|
ulint pos;
|
|
byte* buf;
|
|
ulint clust_col_prefix_len;
|
|
ulint i;
|
|
mem_heap_t* tmp_heap = NULL;
|
|
ulint offsets_[REC_OFFS_NORMAL_SIZE];
|
|
ulint* offsets = offsets_;
|
|
rec_offs_init(offsets_);
|
|
|
|
ut_ad(index && rec && heap);
|
|
ut_ad(!dict_index_is_clust(index));
|
|
|
|
offsets = rec_get_offsets(rec, index, offsets,
|
|
ULINT_UNDEFINED, &tmp_heap);
|
|
/* Secondary indexes must not contain externally stored columns. */
|
|
ut_ad(!rec_offs_any_extern(offsets));
|
|
|
|
if (type == ROW_COPY_DATA) {
|
|
/* Take a copy of rec to heap */
|
|
|
|
buf = mem_heap_alloc(heap, rec_offs_size(offsets));
|
|
|
|
rec = rec_copy(buf, rec, offsets);
|
|
/* Avoid a debug assertion in rec_offs_validate(). */
|
|
rec_offs_make_valid(rec, index, offsets);
|
|
}
|
|
|
|
table = index->table;
|
|
|
|
clust_index = dict_table_get_first_index(table);
|
|
|
|
ref_len = dict_index_get_n_unique(clust_index);
|
|
|
|
ref = dtuple_create(heap, ref_len);
|
|
|
|
dict_index_copy_types(ref, clust_index, ref_len);
|
|
|
|
for (i = 0; i < ref_len; i++) {
|
|
dfield = dtuple_get_nth_field(ref, i);
|
|
|
|
pos = dict_index_get_nth_field_pos(index, clust_index, i);
|
|
|
|
ut_a(pos != ULINT_UNDEFINED);
|
|
|
|
field = rec_get_nth_field(rec, offsets, pos, &len);
|
|
|
|
dfield_set_data(dfield, field, len);
|
|
|
|
/* If the primary key contains a column prefix, then the
|
|
secondary index may contain a longer prefix of the same
|
|
column, or the full column, and we must adjust the length
|
|
accordingly. */
|
|
|
|
clust_col_prefix_len = dict_index_get_nth_field(
|
|
clust_index, i)->prefix_len;
|
|
|
|
if (clust_col_prefix_len > 0) {
|
|
if (len != UNIV_SQL_NULL) {
|
|
|
|
const dtype_t* dtype
|
|
= dfield_get_type(dfield);
|
|
|
|
dfield_set_len(dfield,
|
|
dtype_get_at_most_n_mbchars(
|
|
dtype->prtype,
|
|
dtype->mbminlen,
|
|
dtype->mbmaxlen,
|
|
clust_col_prefix_len,
|
|
len, (char*) field));
|
|
}
|
|
}
|
|
}
|
|
|
|
ut_ad(dtuple_check_typed(ref));
|
|
if (tmp_heap) {
|
|
mem_heap_free(tmp_heap);
|
|
}
|
|
|
|
return(ref);
|
|
}
|
|
|
|
/*******************************************************************//**
|
|
Builds from a secondary index record a row reference with which we can
|
|
search the clustered index record. */
|
|
UNIV_INTERN
|
|
void
|
|
row_build_row_ref_in_tuple(
|
|
/*=======================*/
|
|
dtuple_t* ref, /*!< in/out: row reference built;
|
|
see the NOTE below! */
|
|
const rec_t* rec, /*!< in: record in the index;
|
|
NOTE: the data fields in ref
|
|
will point directly into this
|
|
record, therefore, the buffer
|
|
page of this record must be at
|
|
least s-latched and the latch
|
|
held as long as the row
|
|
reference is used! */
|
|
const dict_index_t* index, /*!< in: secondary index */
|
|
ulint* offsets,/*!< in: rec_get_offsets(rec, index)
|
|
or NULL */
|
|
trx_t* trx) /*!< in: transaction */
|
|
{
|
|
const dict_index_t* clust_index;
|
|
dfield_t* dfield;
|
|
const byte* field;
|
|
ulint len;
|
|
ulint ref_len;
|
|
ulint pos;
|
|
ulint clust_col_prefix_len;
|
|
ulint i;
|
|
mem_heap_t* heap = NULL;
|
|
ulint offsets_[REC_OFFS_NORMAL_SIZE];
|
|
rec_offs_init(offsets_);
|
|
|
|
ut_a(ref);
|
|
ut_a(index);
|
|
ut_a(rec);
|
|
ut_ad(!dict_index_is_clust(index));
|
|
|
|
if (UNIV_UNLIKELY(!index->table)) {
|
|
fputs("InnoDB: table ", stderr);
|
|
notfound:
|
|
ut_print_name(stderr, trx, TRUE, index->table_name);
|
|
fputs(" for index ", stderr);
|
|
ut_print_name(stderr, trx, FALSE, index->name);
|
|
fputs(" not found\n", stderr);
|
|
ut_error;
|
|
}
|
|
|
|
clust_index = dict_table_get_first_index(index->table);
|
|
|
|
if (UNIV_UNLIKELY(!clust_index)) {
|
|
fputs("InnoDB: clust index for table ", stderr);
|
|
goto notfound;
|
|
}
|
|
|
|
if (!offsets) {
|
|
offsets = rec_get_offsets(rec, index, offsets_,
|
|
ULINT_UNDEFINED, &heap);
|
|
} else {
|
|
ut_ad(rec_offs_validate(rec, index, offsets));
|
|
}
|
|
|
|
/* Secondary indexes must not contain externally stored columns. */
|
|
ut_ad(!rec_offs_any_extern(offsets));
|
|
ref_len = dict_index_get_n_unique(clust_index);
|
|
|
|
ut_ad(ref_len == dtuple_get_n_fields(ref));
|
|
|
|
dict_index_copy_types(ref, clust_index, ref_len);
|
|
|
|
for (i = 0; i < ref_len; i++) {
|
|
dfield = dtuple_get_nth_field(ref, i);
|
|
|
|
pos = dict_index_get_nth_field_pos(index, clust_index, i);
|
|
|
|
ut_a(pos != ULINT_UNDEFINED);
|
|
|
|
field = rec_get_nth_field(rec, offsets, pos, &len);
|
|
|
|
dfield_set_data(dfield, field, len);
|
|
|
|
/* If the primary key contains a column prefix, then the
|
|
secondary index may contain a longer prefix of the same
|
|
column, or the full column, and we must adjust the length
|
|
accordingly. */
|
|
|
|
clust_col_prefix_len = dict_index_get_nth_field(
|
|
clust_index, i)->prefix_len;
|
|
|
|
if (clust_col_prefix_len > 0) {
|
|
if (len != UNIV_SQL_NULL) {
|
|
|
|
const dtype_t* dtype
|
|
= dfield_get_type(dfield);
|
|
|
|
dfield_set_len(dfield,
|
|
dtype_get_at_most_n_mbchars(
|
|
dtype->prtype,
|
|
dtype->mbminlen,
|
|
dtype->mbmaxlen,
|
|
clust_col_prefix_len,
|
|
len, (char*) field));
|
|
}
|
|
}
|
|
}
|
|
|
|
ut_ad(dtuple_check_typed(ref));
|
|
if (UNIV_LIKELY_NULL(heap)) {
|
|
mem_heap_free(heap);
|
|
}
|
|
}
|
|
|
|
/***************************************************************//**
|
|
Searches the clustered index record for a row, if we have the row reference.
|
|
@return TRUE if found */
|
|
UNIV_INTERN
|
|
ibool
|
|
row_search_on_row_ref(
|
|
/*==================*/
|
|
btr_pcur_t* pcur, /*!< out: persistent cursor, which must
|
|
be closed by the caller */
|
|
ulint mode, /*!< in: BTR_MODIFY_LEAF, ... */
|
|
const dict_table_t* table, /*!< in: table */
|
|
const dtuple_t* ref, /*!< in: row reference */
|
|
mtr_t* mtr) /*!< in/out: mtr */
|
|
{
|
|
ulint low_match;
|
|
rec_t* rec;
|
|
dict_index_t* index;
|
|
|
|
ut_ad(dtuple_check_typed(ref));
|
|
|
|
index = dict_table_get_first_index(table);
|
|
|
|
ut_a(dtuple_get_n_fields(ref) == dict_index_get_n_unique(index));
|
|
|
|
btr_pcur_open(index, ref, PAGE_CUR_LE, mode, pcur, mtr);
|
|
|
|
low_match = btr_pcur_get_low_match(pcur);
|
|
|
|
rec = btr_pcur_get_rec(pcur);
|
|
|
|
if (page_rec_is_infimum(rec)) {
|
|
|
|
return(FALSE);
|
|
}
|
|
|
|
if (low_match != dtuple_get_n_fields(ref)) {
|
|
|
|
return(FALSE);
|
|
}
|
|
|
|
return(TRUE);
|
|
}
|
|
|
|
/*********************************************************************//**
|
|
Fetches the clustered index record for a secondary index record. The latches
|
|
on the secondary index record are preserved.
|
|
@return record or NULL, if no record found */
|
|
UNIV_INTERN
|
|
rec_t*
|
|
row_get_clust_rec(
|
|
/*==============*/
|
|
ulint mode, /*!< in: BTR_MODIFY_LEAF, ... */
|
|
const rec_t* rec, /*!< in: record in a secondary index */
|
|
dict_index_t* index, /*!< in: secondary index */
|
|
dict_index_t** clust_index,/*!< out: clustered index */
|
|
mtr_t* mtr) /*!< in: mtr */
|
|
{
|
|
mem_heap_t* heap;
|
|
dtuple_t* ref;
|
|
dict_table_t* table;
|
|
btr_pcur_t pcur;
|
|
ibool found;
|
|
rec_t* clust_rec;
|
|
|
|
ut_ad(!dict_index_is_clust(index));
|
|
|
|
table = index->table;
|
|
|
|
heap = mem_heap_create(256);
|
|
|
|
ref = row_build_row_ref(ROW_COPY_POINTERS, index, rec, heap);
|
|
|
|
found = row_search_on_row_ref(&pcur, mode, table, ref, mtr);
|
|
|
|
clust_rec = found ? btr_pcur_get_rec(&pcur) : NULL;
|
|
|
|
mem_heap_free(heap);
|
|
|
|
btr_pcur_close(&pcur);
|
|
|
|
*clust_index = dict_table_get_first_index(table);
|
|
|
|
return(clust_rec);
|
|
}
|
|
|
|
/***************************************************************//**
|
|
Searches an index record.
|
|
@return whether the record was found or buffered */
|
|
UNIV_INTERN
|
|
enum row_search_result
|
|
row_search_index_entry(
|
|
/*===================*/
|
|
dict_index_t* index, /*!< in: index */
|
|
const dtuple_t* entry, /*!< in: index entry */
|
|
ulint mode, /*!< in: BTR_MODIFY_LEAF, ... */
|
|
btr_pcur_t* pcur, /*!< in/out: persistent cursor, which must
|
|
be closed by the caller */
|
|
mtr_t* mtr) /*!< in: mtr */
|
|
{
|
|
ulint n_fields;
|
|
ulint low_match;
|
|
rec_t* rec;
|
|
|
|
ut_ad(dtuple_check_typed(entry));
|
|
|
|
btr_pcur_open(index, entry, PAGE_CUR_LE, mode, pcur, mtr);
|
|
|
|
switch (btr_pcur_get_btr_cur(pcur)->flag) {
|
|
case BTR_CUR_DELETE_REF:
|
|
ut_a(mode & BTR_DELETE);
|
|
return(ROW_NOT_DELETED_REF);
|
|
|
|
case BTR_CUR_DELETE_FAILED:
|
|
ut_a(mode & BTR_DELETE);
|
|
return(ROW_NOT_DELETED);
|
|
|
|
case BTR_CUR_DEL_MARK_IBUF:
|
|
case BTR_CUR_DELETE_IBUF:
|
|
case BTR_CUR_INSERT_TO_IBUF:
|
|
return(ROW_BUFFERED);
|
|
|
|
case BTR_CUR_HASH:
|
|
case BTR_CUR_HASH_FAIL:
|
|
case BTR_CUR_BINARY:
|
|
break;
|
|
}
|
|
|
|
low_match = btr_pcur_get_low_match(pcur);
|
|
|
|
rec = btr_pcur_get_rec(pcur);
|
|
|
|
n_fields = dtuple_get_n_fields(entry);
|
|
|
|
if (page_rec_is_infimum(rec)) {
|
|
|
|
return(ROW_NOT_FOUND);
|
|
} else if (low_match != n_fields) {
|
|
|
|
return(ROW_NOT_FOUND);
|
|
}
|
|
|
|
return(ROW_FOUND);
|
|
}
|
|
|
|
#include <my_sys.h>
|
|
|
|
/*******************************************************************//**
|
|
Formats the raw data in "data" (in InnoDB on-disk format) that is of
|
|
type DATA_INT using "prtype" and writes the result to "buf".
|
|
If the data is in unknown format, then nothing is written to "buf",
|
|
0 is returned and "format_in_hex" is set to TRUE, otherwise
|
|
"format_in_hex" is left untouched.
|
|
Not more than "buf_size" bytes are written to "buf".
|
|
The result is always '\0'-terminated (provided buf_size > 0) and the
|
|
number of bytes that were written to "buf" is returned (including the
|
|
terminating '\0').
|
|
@return number of bytes that were written */
|
|
static
|
|
ulint
|
|
row_raw_format_int(
|
|
/*===============*/
|
|
const char* data, /*!< in: raw data */
|
|
ulint data_len, /*!< in: raw data length
|
|
in bytes */
|
|
ulint prtype, /*!< in: precise type */
|
|
char* buf, /*!< out: output buffer */
|
|
ulint buf_size, /*!< in: output buffer size
|
|
in bytes */
|
|
ibool* format_in_hex) /*!< out: should the data be
|
|
formated in hex */
|
|
{
|
|
ulint ret;
|
|
|
|
if (data_len <= sizeof(ullint)) {
|
|
|
|
ullint value;
|
|
ibool unsigned_type = prtype & DATA_UNSIGNED;
|
|
|
|
value = mach_read_int_type((const byte*) data,
|
|
data_len, unsigned_type);
|
|
|
|
if (unsigned_type) {
|
|
|
|
ret = ut_snprintf(buf, buf_size, "%llu",
|
|
value) + 1;
|
|
} else {
|
|
|
|
ret = ut_snprintf(buf, buf_size, "%lld",
|
|
(long long) value) + 1;
|
|
}
|
|
|
|
} else {
|
|
|
|
*format_in_hex = TRUE;
|
|
ret = 0;
|
|
}
|
|
|
|
return(ut_min(ret, buf_size));
|
|
}
|
|
|
|
/*******************************************************************//**
|
|
Formats the raw data in "data" (in InnoDB on-disk format) that is of
|
|
type DATA_(CHAR|VARCHAR|MYSQL|VARMYSQL) using "prtype" and writes the
|
|
result to "buf".
|
|
If the data is in binary format, then nothing is written to "buf",
|
|
0 is returned and "format_in_hex" is set to TRUE, otherwise
|
|
"format_in_hex" is left untouched.
|
|
Not more than "buf_size" bytes are written to "buf".
|
|
The result is always '\0'-terminated (provided buf_size > 0) and the
|
|
number of bytes that were written to "buf" is returned (including the
|
|
terminating '\0').
|
|
@return number of bytes that were written */
|
|
static
|
|
ulint
|
|
row_raw_format_str(
|
|
/*===============*/
|
|
const char* data, /*!< in: raw data */
|
|
ulint data_len, /*!< in: raw data length
|
|
in bytes */
|
|
ulint prtype, /*!< in: precise type */
|
|
char* buf, /*!< out: output buffer */
|
|
ulint buf_size, /*!< in: output buffer size
|
|
in bytes */
|
|
ibool* format_in_hex) /*!< out: should the data be
|
|
formated in hex */
|
|
{
|
|
ulint charset_coll;
|
|
|
|
if (buf_size == 0) {
|
|
|
|
return(0);
|
|
}
|
|
|
|
/* we assume system_charset_info is UTF-8 */
|
|
|
|
charset_coll = dtype_get_charset_coll(prtype);
|
|
|
|
if (UNIV_LIKELY(dtype_is_utf8(prtype))) {
|
|
|
|
return(ut_str_sql_format(data, data_len, buf, buf_size));
|
|
}
|
|
/* else */
|
|
|
|
if (charset_coll == DATA_MYSQL_BINARY_CHARSET_COLL) {
|
|
|
|
*format_in_hex = TRUE;
|
|
return(0);
|
|
}
|
|
/* else */
|
|
|
|
return(innobase_raw_format(data, data_len, charset_coll,
|
|
buf, buf_size));
|
|
}
|
|
|
|
/*******************************************************************//**
|
|
Formats the raw data in "data" (in InnoDB on-disk format) using
|
|
"dict_field" and writes the result to "buf".
|
|
Not more than "buf_size" bytes are written to "buf".
|
|
The result is always NUL-terminated (provided buf_size is positive) and the
|
|
number of bytes that were written to "buf" is returned (including the
|
|
terminating NUL).
|
|
@return number of bytes that were written */
|
|
UNIV_INTERN
|
|
ulint
|
|
row_raw_format(
|
|
/*===========*/
|
|
const char* data, /*!< in: raw data */
|
|
ulint data_len, /*!< in: raw data length
|
|
in bytes */
|
|
const dict_field_t* dict_field, /*!< in: index field */
|
|
char* buf, /*!< out: output buffer */
|
|
ulint buf_size) /*!< in: output buffer size
|
|
in bytes */
|
|
{
|
|
ulint mtype;
|
|
ulint prtype;
|
|
ulint ret;
|
|
ibool format_in_hex;
|
|
|
|
if (buf_size == 0) {
|
|
|
|
return(0);
|
|
}
|
|
|
|
if (data_len == UNIV_SQL_NULL) {
|
|
|
|
ret = ut_snprintf((char*) buf, buf_size, "NULL") + 1;
|
|
|
|
return(ut_min(ret, buf_size));
|
|
}
|
|
|
|
mtype = dict_field->col->mtype;
|
|
prtype = dict_field->col->prtype;
|
|
|
|
format_in_hex = FALSE;
|
|
|
|
switch (mtype) {
|
|
case DATA_INT:
|
|
|
|
ret = row_raw_format_int(data, data_len, prtype,
|
|
buf, buf_size, &format_in_hex);
|
|
if (format_in_hex) {
|
|
|
|
goto format_in_hex;
|
|
}
|
|
break;
|
|
case DATA_CHAR:
|
|
case DATA_VARCHAR:
|
|
case DATA_MYSQL:
|
|
case DATA_VARMYSQL:
|
|
|
|
ret = row_raw_format_str(data, data_len, prtype,
|
|
buf, buf_size, &format_in_hex);
|
|
if (format_in_hex) {
|
|
|
|
goto format_in_hex;
|
|
}
|
|
|
|
break;
|
|
/* XXX support more data types */
|
|
default:
|
|
format_in_hex:
|
|
|
|
if (UNIV_LIKELY(buf_size > 2)) {
|
|
|
|
memcpy(buf, "0x", 2);
|
|
buf += 2;
|
|
buf_size -= 2;
|
|
ret = 2 + ut_raw_to_hex(data, data_len,
|
|
buf, buf_size);
|
|
} else {
|
|
|
|
buf[0] = '\0';
|
|
ret = 1;
|
|
}
|
|
}
|
|
|
|
return(ret);
|
|
}
|
|
|
|
#ifdef UNIV_COMPILE_TEST_FUNCS
|
|
|
|
#include "ut0dbg.h"
|
|
|
|
void
|
|
test_row_raw_format_int()
|
|
{
|
|
ulint ret;
|
|
char buf[128];
|
|
ibool format_in_hex;
|
|
|
|
#define CALL_AND_TEST(data, data_len, prtype, buf, buf_size,\
|
|
ret_expected, buf_expected, format_in_hex_expected)\
|
|
do {\
|
|
ibool ok = TRUE;\
|
|
ulint i;\
|
|
memset(buf, 'x', 10);\
|
|
buf[10] = '\0';\
|
|
format_in_hex = FALSE;\
|
|
fprintf(stderr, "TESTING \"\\x");\
|
|
for (i = 0; i < data_len; i++) {\
|
|
fprintf(stderr, "%02hhX", data[i]);\
|
|
}\
|
|
fprintf(stderr, "\", %lu, %lu, %lu\n",\
|
|
(ulint) data_len, (ulint) prtype,\
|
|
(ulint) buf_size);\
|
|
ret = row_raw_format_int(data, data_len, prtype,\
|
|
buf, buf_size, &format_in_hex);\
|
|
if (ret != ret_expected) {\
|
|
fprintf(stderr, "expected ret %lu, got %lu\n",\
|
|
(ulint) ret_expected, ret);\
|
|
ok = FALSE;\
|
|
}\
|
|
if (strcmp((char*) buf, buf_expected) != 0) {\
|
|
fprintf(stderr, "expected buf \"%s\", got \"%s\"\n",\
|
|
buf_expected, buf);\
|
|
ok = FALSE;\
|
|
}\
|
|
if (format_in_hex != format_in_hex_expected) {\
|
|
fprintf(stderr, "expected format_in_hex %d, got %d\n",\
|
|
(int) format_in_hex_expected,\
|
|
(int) format_in_hex);\
|
|
ok = FALSE;\
|
|
}\
|
|
if (ok) {\
|
|
fprintf(stderr, "OK: %lu, \"%s\" %d\n\n",\
|
|
(ulint) ret, buf, (int) format_in_hex);\
|
|
} else {\
|
|
return;\
|
|
}\
|
|
} while (0)
|
|
|
|
#if 1
|
|
/* min values for signed 1-8 byte integers */
|
|
|
|
CALL_AND_TEST("\x00", 1, 0,
|
|
buf, sizeof(buf), 5, "-128", 0);
|
|
|
|
CALL_AND_TEST("\x00\x00", 2, 0,
|
|
buf, sizeof(buf), 7, "-32768", 0);
|
|
|
|
CALL_AND_TEST("\x00\x00\x00", 3, 0,
|
|
buf, sizeof(buf), 9, "-8388608", 0);
|
|
|
|
CALL_AND_TEST("\x00\x00\x00\x00", 4, 0,
|
|
buf, sizeof(buf), 12, "-2147483648", 0);
|
|
|
|
CALL_AND_TEST("\x00\x00\x00\x00\x00", 5, 0,
|
|
buf, sizeof(buf), 14, "-549755813888", 0);
|
|
|
|
CALL_AND_TEST("\x00\x00\x00\x00\x00\x00", 6, 0,
|
|
buf, sizeof(buf), 17, "-140737488355328", 0);
|
|
|
|
CALL_AND_TEST("\x00\x00\x00\x00\x00\x00\x00", 7, 0,
|
|
buf, sizeof(buf), 19, "-36028797018963968", 0);
|
|
|
|
CALL_AND_TEST("\x00\x00\x00\x00\x00\x00\x00\x00", 8, 0,
|
|
buf, sizeof(buf), 21, "-9223372036854775808", 0);
|
|
|
|
/* min values for unsigned 1-8 byte integers */
|
|
|
|
CALL_AND_TEST("\x00", 1, DATA_UNSIGNED,
|
|
buf, sizeof(buf), 2, "0", 0);
|
|
|
|
CALL_AND_TEST("\x00\x00", 2, DATA_UNSIGNED,
|
|
buf, sizeof(buf), 2, "0", 0);
|
|
|
|
CALL_AND_TEST("\x00\x00\x00", 3, DATA_UNSIGNED,
|
|
buf, sizeof(buf), 2, "0", 0);
|
|
|
|
CALL_AND_TEST("\x00\x00\x00\x00", 4, DATA_UNSIGNED,
|
|
buf, sizeof(buf), 2, "0", 0);
|
|
|
|
CALL_AND_TEST("\x00\x00\x00\x00\x00", 5, DATA_UNSIGNED,
|
|
buf, sizeof(buf), 2, "0", 0);
|
|
|
|
CALL_AND_TEST("\x00\x00\x00\x00\x00\x00", 6, DATA_UNSIGNED,
|
|
buf, sizeof(buf), 2, "0", 0);
|
|
|
|
CALL_AND_TEST("\x00\x00\x00\x00\x00\x00\x00", 7, DATA_UNSIGNED,
|
|
buf, sizeof(buf), 2, "0", 0);
|
|
|
|
CALL_AND_TEST("\x00\x00\x00\x00\x00\x00\x00\x00", 8, DATA_UNSIGNED,
|
|
buf, sizeof(buf), 2, "0", 0);
|
|
|
|
/* max values for signed 1-8 byte integers */
|
|
|
|
CALL_AND_TEST("\xFF", 1, 0,
|
|
buf, sizeof(buf), 4, "127", 0);
|
|
|
|
CALL_AND_TEST("\xFF\xFF", 2, 0,
|
|
buf, sizeof(buf), 6, "32767", 0);
|
|
|
|
CALL_AND_TEST("\xFF\xFF\xFF", 3, 0,
|
|
buf, sizeof(buf), 8, "8388607", 0);
|
|
|
|
CALL_AND_TEST("\xFF\xFF\xFF\xFF", 4, 0,
|
|
buf, sizeof(buf), 11, "2147483647", 0);
|
|
|
|
CALL_AND_TEST("\xFF\xFF\xFF\xFF\xFF", 5, 0,
|
|
buf, sizeof(buf), 13, "549755813887", 0);
|
|
|
|
CALL_AND_TEST("\xFF\xFF\xFF\xFF\xFF\xFF", 6, 0,
|
|
buf, sizeof(buf), 16, "140737488355327", 0);
|
|
|
|
CALL_AND_TEST("\xFF\xFF\xFF\xFF\xFF\xFF\xFF", 7, 0,
|
|
buf, sizeof(buf), 18, "36028797018963967", 0);
|
|
|
|
CALL_AND_TEST("\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF", 8, 0,
|
|
buf, sizeof(buf), 20, "9223372036854775807", 0);
|
|
|
|
/* max values for unsigned 1-8 byte integers */
|
|
|
|
CALL_AND_TEST("\xFF", 1, DATA_UNSIGNED,
|
|
buf, sizeof(buf), 4, "255", 0);
|
|
|
|
CALL_AND_TEST("\xFF\xFF", 2, DATA_UNSIGNED,
|
|
buf, sizeof(buf), 6, "65535", 0);
|
|
|
|
CALL_AND_TEST("\xFF\xFF\xFF", 3, DATA_UNSIGNED,
|
|
buf, sizeof(buf), 9, "16777215", 0);
|
|
|
|
CALL_AND_TEST("\xFF\xFF\xFF\xFF", 4, DATA_UNSIGNED,
|
|
buf, sizeof(buf), 11, "4294967295", 0);
|
|
|
|
CALL_AND_TEST("\xFF\xFF\xFF\xFF\xFF", 5, DATA_UNSIGNED,
|
|
buf, sizeof(buf), 14, "1099511627775", 0);
|
|
|
|
CALL_AND_TEST("\xFF\xFF\xFF\xFF\xFF\xFF", 6, DATA_UNSIGNED,
|
|
buf, sizeof(buf), 16, "281474976710655", 0);
|
|
|
|
CALL_AND_TEST("\xFF\xFF\xFF\xFF\xFF\xFF\xFF", 7, DATA_UNSIGNED,
|
|
buf, sizeof(buf), 18, "72057594037927935", 0);
|
|
|
|
CALL_AND_TEST("\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF", 8, DATA_UNSIGNED,
|
|
buf, sizeof(buf), 21, "18446744073709551615", 0);
|
|
|
|
/* some random values */
|
|
|
|
CALL_AND_TEST("\x52", 1, 0,
|
|
buf, sizeof(buf), 4, "-46", 0);
|
|
|
|
CALL_AND_TEST("\x0E", 1, DATA_UNSIGNED,
|
|
buf, sizeof(buf), 3, "14", 0);
|
|
|
|
CALL_AND_TEST("\x62\xCE", 2, 0,
|
|
buf, sizeof(buf), 6, "-7474", 0);
|
|
|
|
CALL_AND_TEST("\x29\xD6", 2, DATA_UNSIGNED,
|
|
buf, sizeof(buf), 6, "10710", 0);
|
|
|
|
CALL_AND_TEST("\x7F\xFF\x90", 3, 0,
|
|
buf, sizeof(buf), 5, "-112", 0);
|
|
|
|
CALL_AND_TEST("\x00\xA1\x16", 3, DATA_UNSIGNED,
|
|
buf, sizeof(buf), 6, "41238", 0);
|
|
|
|
CALL_AND_TEST("\x7F\xFF\xFF\xF7", 4, 0,
|
|
buf, sizeof(buf), 3, "-9", 0);
|
|
|
|
CALL_AND_TEST("\x00\x00\x00\x5C", 4, DATA_UNSIGNED,
|
|
buf, sizeof(buf), 3, "92", 0);
|
|
|
|
CALL_AND_TEST("\x7F\xFF\xFF\xFF\xFF\xFF\xDC\x63", 8, 0,
|
|
buf, sizeof(buf), 6, "-9117", 0);
|
|
|
|
CALL_AND_TEST("\x00\x00\x00\x00\x00\x01\x64\x62", 8, DATA_UNSIGNED,
|
|
buf, sizeof(buf), 6, "91234", 0);
|
|
#endif
|
|
|
|
/* speed test */
|
|
|
|
speedo_t speedo;
|
|
ulint i;
|
|
|
|
speedo_reset(&speedo);
|
|
|
|
for (i = 0; i < 1000000; i++) {
|
|
row_raw_format_int("\x23", 1,
|
|
0, buf, sizeof(buf),
|
|
&format_in_hex);
|
|
row_raw_format_int("\x23", 1,
|
|
DATA_UNSIGNED, buf, sizeof(buf),
|
|
&format_in_hex);
|
|
|
|
row_raw_format_int("\x00\x00\x00\x00\x00\x01\x64\x62", 8,
|
|
0, buf, sizeof(buf),
|
|
&format_in_hex);
|
|
row_raw_format_int("\x00\x00\x00\x00\x00\x01\x64\x62", 8,
|
|
DATA_UNSIGNED, buf, sizeof(buf),
|
|
&format_in_hex);
|
|
}
|
|
|
|
speedo_show(&speedo);
|
|
}
|
|
|
|
#endif /* UNIV_COMPILE_TEST_FUNCS */
|