mirror of
https://github.com/MariaDB/server.git
synced 2025-03-07 03:33:09 +01:00

------------------------------------------------------------------------ r5147 | marko | 2009-05-27 06:55:14 -0400 (Wed, 27 May 2009) | 1 line branches/zip: ibuf0ibuf.c: Improve a comment. ------------------------------------------------------------------------ r5149 | marko | 2009-05-27 07:46:42 -0400 (Wed, 27 May 2009) | 34 lines branches/zip: Merge revisions 4994:5148 from branches/5.1: ------------------------------------------------------------------------ r5126 | vasil | 2009-05-26 16:57:12 +0300 (Tue, 26 May 2009) | 9 lines branches/5.1: Preparation for the fix of Bug#45097 Hang during recovery, redo logs for doublewrite buffer pages Non-functional change: move FSP_* macros from fsp0fsp.h to a new file fsp0types.h. This is needed in order to be able to use FSP_EXTENT_SIZE in mtr0log.ic. ------------------------------------------------------------------------ r5127 | vasil | 2009-05-26 17:05:43 +0300 (Tue, 26 May 2009) | 9 lines branches/5.1: Preparation for the fix of Bug#45097 Hang during recovery, redo logs for doublewrite buffer pages Do not include unnecessary headers mtr0log.h and fut0lst.h in trx0sys.h and include fsp0fsp.h just before it is needed. This is needed in order to be able to use TRX_SYS_SPACE in mtr0log.ic. ------------------------------------------------------------------------ r5128 | vasil | 2009-05-26 17:26:37 +0300 (Tue, 26 May 2009) | 7 lines branches/5.1: Fix Bug#45097 Hang during recovery, redo logs for doublewrite buffer pages Do not write redo log for the pages in the doublewrite buffer. Also, do not make a dummy change to the page because this is not needed. ------------------------------------------------------------------------ ------------------------------------------------------------------------ r5169 | marko | 2009-05-28 03:21:55 -0400 (Thu, 28 May 2009) | 1 line branches/zip: mtr0mtr.h: Add Doxygen comments for the redo log entry types. ------------------------------------------------------------------------ r5176 | marko | 2009-05-28 07:14:02 -0400 (Thu, 28 May 2009) | 1 line branches/zip: Correct a debug assertion that was added in r5125. ------------------------------------------------------------------------ r5201 | marko | 2009-06-01 06:35:25 -0400 (Mon, 01 Jun 2009) | 2 lines branches/zip: Clean up some comments. Make the rec parameter of mlog_open_and_write_index() const. ------------------------------------------------------------------------ r5234 | marko | 2009-06-03 08:26:41 -0400 (Wed, 03 Jun 2009) | 44 lines branches/zip: Merge revisions 5148:5233 from branches/5.1: ------------------------------------------------------------------------ r5150 | vasil | 2009-05-27 18:56:03 +0300 (Wed, 27 May 2009) | 4 lines branches/5.1: Whitespace fixup. ------------------------------------------------------------------------ r5191 | vasil | 2009-05-30 17:46:05 +0300 (Sat, 30 May 2009) | 19 lines branches/5.1: Merge a change from MySQL (this fixes the failing innodb_mysql test): ------------------------------------------------------------ revno: 1810.3894.10 committer: Sergey Glukhov <Sergey.Glukhov@sun.com> branch nick: mysql-5.0-bugteam timestamp: Tue 2009-05-19 11:32:21 +0500 message: Bug#39793 Foreign keys not constructed when column has a '#' in a comment or default value Internal InnoDN FK parser does not recognize '\'' as quotation symbol. Suggested fix is to add '\'' symbol check for quotation condition (dict_strip_comments() function). modified: innobase/dict/dict0dict.c mysql-test/r/innodb_mysql.result mysql-test/t/innodb_mysql.test ------------------------------------------------------------------------ r5233 | marko | 2009-06-03 15:12:44 +0300 (Wed, 03 Jun 2009) | 11 lines branches/5.1: Merge the test case from r5232 from branches/5.0: ------------------------------------------------------------------------ r5232 | marko | 2009-06-03 14:31:04 +0300 (Wed, 03 Jun 2009) | 21 lines branches/5.0: Merge r3590 from branches/5.1 in order to fix Bug #40565 (Update Query Results in "1 Row Affected" But Should Be "Zero Rows"). Also, add a test case for Bug #40565. rb://128 approved by Heikki Tuuri ------------------------------------------------------------------------ ------------------------------------------------------------------------ ------------------------------------------------------------------------ r5250 | marko | 2009-06-04 02:58:23 -0400 (Thu, 04 Jun 2009) | 1 line branches/zip: Add Doxygen comments to the rest of buf0*. ------------------------------------------------------------------------ r5251 | marko | 2009-06-04 02:59:51 -0400 (Thu, 04 Jun 2009) | 1 line branches/zip: Replace <= in a function comment. ------------------------------------------------------------------------ r5253 | marko | 2009-06-04 06:37:35 -0400 (Thu, 04 Jun 2009) | 1 line branches/zip: Add missing Doxygen comments for page0zip. ------------------------------------------------------------------------ r5261 | vasil | 2009-06-05 11:13:31 -0400 (Fri, 05 Jun 2009) | 15 lines branches/zip: Fix Mantis Issue#244 fix bug in linear read ahead (no check on access pattern) The changes are: 1) Take into account access pattern when deciding whether or not to do linear read ahead. 2) Expose a knob innodb_read_ahead_factor = [0-64] default (8), dynamic, global to control linear read ahead behvior 3) Disable random read ahead. Keep the code for now. Submitted by: Inaam (rb://122) Approved by: Heikki (rb://122) ------------------------------------------------------------------------ r5262 | vasil | 2009-06-05 12:04:25 -0400 (Fri, 05 Jun 2009) | 22 lines branches/zip: Enable functionality to have multiple background io helper threads. This patch is based on percona contributions. More details about this patch will be written at: https://svn.innodb.com/innobase/MultipleBackgroundThreads The patch essentially does the following: expose following knobs: innodb_read_io_threads = [1 - 64] default 1 innodb_write_io_threads = [1 - 64] default 1 deprecate innodb_file_io_threads (this parameter was relevant only on windows) Internally it allows multiple segments for read and write IO request arrays where one thread works on one segement. Submitted by: Inaam (rb://124) Approved by: Heikki (rb://124) ------------------------------------------------------------------------ r5263 | vasil | 2009-06-05 12:19:37 -0400 (Fri, 05 Jun 2009) | 4 lines branches/zip: Whitespace cleanup. ------------------------------------------------------------------------ r5264 | vasil | 2009-06-05 12:26:58 -0400 (Fri, 05 Jun 2009) | 4 lines branches/zip: Add ChangeLog entry for r5261. ------------------------------------------------------------------------ r5265 | vasil | 2009-06-05 12:34:11 -0400 (Fri, 05 Jun 2009) | 4 lines branches/zip: Add ChangeLog entry for r5262. ------------------------------------------------------------------------ r5268 | inaam | 2009-06-08 12:18:21 -0400 (Mon, 08 Jun 2009) | 7 lines branches/zip Non functional change: Added legal notices acknowledging percona contribution to the multiple IO helper threads patch i.e.: r5262 ------------------------------------------------------------------------ r5283 | inaam | 2009-06-09 13:46:29 -0400 (Tue, 09 Jun 2009) | 9 lines branches/zip rb://130 Enable Group Commit functionality that was broken in 5.0 when distributed transactions were introduced. Reviewed by: Heikki ------------------------------------------------------------------------ r5319 | marko | 2009-06-11 04:40:33 -0400 (Thu, 11 Jun 2009) | 3 lines branches/zip: Declare os_thread_id_t as unsigned long, because ulint is wrong on Win64. Pointed out by Vladislav Vaintroub <wlad@sun.com>. ------------------------------------------------------------------------ r5320 | inaam | 2009-06-11 09:15:41 -0400 (Thu, 11 Jun 2009) | 14 lines branches/zip rb://131 This patch changes the following defaults: max_dirty_pages_pct: default from 90 to 75. max allowed from 100 to 99 additional_mem_pool_size: default from 1 to 8 MB buffer_pool_size: default from 8 to 128 MB log_buffer_size: default from 1 to 8 MB read_io_threads/write_io_threads: default from 1 to 4 The log file sizes are untouched because of upgrade issues Reviewed by: Heikki ------------------------------------------------------------------------ r5330 | marko | 2009-06-16 04:08:59 -0400 (Tue, 16 Jun 2009) | 2 lines branches/zip: buf_page_get_gen(): Reduce mutex holding time by adjusting buf_pool->n_pend_unzip while only holding buf_pool_mutex. ------------------------------------------------------------------------ r5331 | marko | 2009-06-16 05:00:48 -0400 (Tue, 16 Jun 2009) | 2 lines branches/zip: buf_page_get_zip(): Eliminate a buf_page_get_mutex() call. The function must switch on the block state anyway. ------------------------------------------------------------------------ r5332 | vasil | 2009-06-16 05:03:27 -0400 (Tue, 16 Jun 2009) | 4 lines branches/zip: Add ChangeLog entries for r5283 and r5320. ------------------------------------------------------------------------ r5333 | marko | 2009-06-16 05:27:46 -0400 (Tue, 16 Jun 2009) | 1 line branches/zip: buf_page_io_query(): Remove unused function. ------------------------------------------------------------------------ r5335 | marko | 2009-06-16 09:23:10 -0400 (Tue, 16 Jun 2009) | 2 lines branches/zip: innodb.test: Adjust the tolerance of innodb_buffer_pool_pages_total for r5320. ------------------------------------------------------------------------ r5342 | marko | 2009-06-17 06:15:32 -0400 (Wed, 17 Jun 2009) | 60 lines branches/zip: Merge revisions 5233:5341 from branches/5.1: ------------------------------------------------------------------------ r5233 | marko | 2009-06-03 15:12:44 +0300 (Wed, 03 Jun 2009) | 11 lines branches/5.1: Merge the test case from r5232 from branches/5.0: ------------------------------------------------------------------------ r5232 | marko | 2009-06-03 14:31:04 +0300 (Wed, 03 Jun 2009) | 21 lines branches/5.0: Merge r3590 from branches/5.1 in order to fix Bug #40565 (Update Query Results in "1 Row Affected" But Should Be "Zero Rows"). Also, add a test case for Bug #40565. rb://128 approved by Heikki Tuuri ------------------------------------------------------------------------ ------------------------------------------------------------------------ r5243 | sunny | 2009-06-04 03:17:14 +0300 (Thu, 04 Jun 2009) | 14 lines branches/5.1: When the InnoDB and MySQL data dictionaries go out of sync, before the bug fix we would assert on missing autoinc columns. With this fix we allow MySQL to open the table but set the next autoinc value for the column to the MAX value. This effectively disables the next value generation. INSERTs will fail with a generic AUTOINC failure. However, the user should be able to read/dump the table, set the column values explicitly, use ALTER TABLE to set the next autoinc value and/or sync the two data dictionaries to resume normal operations. Fix Bug#44030 Error: (1500) Couldn't read the MAX(ID) autoinc value from the index (PRIMARY) rb://118 ------------------------------------------------------------------------ r5252 | sunny | 2009-06-04 10:16:24 +0300 (Thu, 04 Jun 2009) | 2 lines branches/5.1: The version of the result file checked in was broken in r5243. ------------------------------------------------------------------------ r5259 | vasil | 2009-06-05 10:29:16 +0300 (Fri, 05 Jun 2009) | 7 lines branches/5.1: Remove the word "Error" from the printout because the mysqltest suite interprets it as an error and thus the innodb-autoinc test fails. Approved by: Sunny (via IM) ------------------------------------------------------------------------ r5339 | marko | 2009-06-17 11:01:37 +0300 (Wed, 17 Jun 2009) | 2 lines branches/5.1: Add missing #include "mtr0log.h" so that the code compiles with -DUNIV_MUST_NOT_INLINE. (null merge; this had already been committed in branches/zip) ------------------------------------------------------------------------ r5340 | marko | 2009-06-17 12:11:49 +0300 (Wed, 17 Jun 2009) | 4 lines branches/5.1: row_unlock_for_mysql(): When the clustered index is unknown, refuse to unlock the record. (Bug #45357, caused by the fix of Bug #39320). rb://132 approved by Sunny Bains. ------------------------------------------------------------------------ ------------------------------------------------------------------------ r5343 | vasil | 2009-06-17 08:56:12 -0400 (Wed, 17 Jun 2009) | 4 lines branches/zip: Add ChangeLog entry for r5342. ------------------------------------------------------------------------ r5344 | marko | 2009-06-17 09:03:45 -0400 (Wed, 17 Jun 2009) | 1 line branches/zip: row_merge_read_rec(): Fix a UNIV_DEBUG bug (Bug #45426) ------------------------------------------------------------------------ r5391 | marko | 2009-06-22 05:31:35 -0400 (Mon, 22 Jun 2009) | 2 lines branches/zip: buf_page_get_zip(): Fix a bogus warning about block_mutex being possibly uninitialized. ------------------------------------------------------------------------ r5392 | marko | 2009-06-22 07:58:20 -0400 (Mon, 22 Jun 2009) | 4 lines branches/zip: ha_innobase::check_if_incompatible_data(): When ROW_FORMAT=DEFAULT, do not compare to get_row_type(). Without this change, fast index creation will be disabled in recent versions of MySQL 5.1. ------------------------------------------------------------------------ r5393 | pekka | 2009-06-22 09:27:55 -0400 (Mon, 22 Jun 2009) | 4 lines branches/zip: Minor changes for Hot Backup to build correctly. (The code bracketed between #ifdef UNIV_HOTBACKUP and #endif /* UNIV_HOTBACKUP */). This change should not affect !UNIV_HOTBACKUP build. ------------------------------------------------------------------------ r5394 | pekka | 2009-06-22 09:46:34 -0400 (Mon, 22 Jun 2009) | 4 lines branches/zip: Add functions for checking the format of tablespaces for Hot Backup build (UNIV_HOTBACKUP defined). This change should not affect !UNIV_HOTBACKUP build. ------------------------------------------------------------------------ r5397 | calvin | 2009-06-23 16:59:42 -0400 (Tue, 23 Jun 2009) | 7 lines branches/zip: change the header file path. Change the header file path from ../storage/innobase/include/ to ../include/. In the planned 5.1 + plugin release, the source directory of the plugin will not be in storage/innobase. Approved by: Heikki (IM) ------------------------------------------------------------------------ r5407 | calvin | 2009-06-24 09:51:08 -0400 (Wed, 24 Jun 2009) | 4 lines branches/zip: remove relative path of header files. Suggested by Marko. ------------------------------------------------------------------------ r5412 | marko | 2009-06-25 06:27:08 -0400 (Thu, 25 Jun 2009) | 1 line branches/zip: Replace a DBUG_ASSERT with ut_a to track down Issue #290. ------------------------------------------------------------------------ r5415 | marko | 2009-06-25 06:45:57 -0400 (Thu, 25 Jun 2009) | 3 lines branches/zip: dict_index_find_cols(): Print diagnostic on name mismatch. This addresses Bug #44571 but does not fix it. rb://135 approved by Sunny Bains. ------------------------------------------------------------------------ r5417 | marko | 2009-06-25 08:20:56 -0400 (Thu, 25 Jun 2009) | 1 line branches/zip: ha_innodb.cc: Move the misplaced Doxygen @file comment. ------------------------------------------------------------------------ r5418 | marko | 2009-06-25 08:55:52 -0400 (Thu, 25 Jun 2009) | 5 lines branches/zip: Fix a race condition caused by SET GLOBAL innodb_commit_concurrency=DEFAULT. (Bug #45749) When innodb_commit_concurrency is initially set nonzero, DEFAULT would change it back to 0, triggering Bug #42101. rb://139 approved by Heikki Tuuri. ------------------------------------------------------------------------ r5423 | calvin | 2009-06-26 16:52:52 -0400 (Fri, 26 Jun 2009) | 2 lines branches/zip: Fix typos. ------------------------------------------------------------------------ r5425 | marko | 2009-06-29 04:52:30 -0400 (Mon, 29 Jun 2009) | 4 lines branches/zip: ha_innobase::add_index(), ha_innobase::final_drop_index(): Start prebuilt->trx before locking the table. This should fix Issue #293 and could fix Issue #229. Approved by Sunny (over IM). ------------------------------------------------------------------------ r5426 | marko | 2009-06-29 05:24:27 -0400 (Mon, 29 Jun 2009) | 3 lines branches/zip: buf_page_get_gen(): Fix a race condition when reading buf_fix_count. This could explain Issue #156. Tested by Michael. ------------------------------------------------------------------------ r5427 | marko | 2009-06-29 05:54:53 -0400 (Mon, 29 Jun 2009) | 5 lines branches/zip: lock_print_info_all_transactions(), buf_read_recv_pages(): Tolerate missing tablespaces (zip_size==ULINT_UNDEFINED). buf_page_get_gen(): Add ut_ad(ut_is_2pow(zip_size)). Issue #289, rb://136 approved by Sunny Bains ------------------------------------------------------------------------ r5428 | marko | 2009-06-29 07:06:29 -0400 (Mon, 29 Jun 2009) | 2 lines branches/zip: row_sel_store_mysql_rec(): Add missing pointer cast. Do not do arithmetics on void pointers. ------------------------------------------------------------------------ r5429 | marko | 2009-06-29 09:49:54 -0400 (Mon, 29 Jun 2009) | 13 lines branches/zip: Do not crash on SET GLOBAL innodb_file_format=DEFAULT or SET GLOBAL innodb_file_format_check=DEFAULT. innodb_file_format.test: New test for innodb_file_format and innodb_file_format_check. innodb_file_format_name_validate(): Store the string in *save. innodb_file_format_name_update(): Check the string again. innodb_file_format_check_validate(): Store the string in *save. innodb_file_format_check_update(): Check the string again. Issue #282, rb://140 approved by Heikki Tuuri ------------------------------------------------------------------------ r5430 | marko | 2009-06-29 09:58:07 -0400 (Mon, 29 Jun 2009) | 2 lines branches/zip: lock_rec_validate_page(): Add another assertion to track down Issue #289. ------------------------------------------------------------------------ r5431 | marko | 2009-06-29 09:58:40 -0400 (Mon, 29 Jun 2009) | 1 line branches/zip: Revert an accidentally made change in r5430 to univ.i. ------------------------------------------------------------------------ r5437 | marko | 2009-06-30 05:10:01 -0400 (Tue, 30 Jun 2009) | 1 line branches/zip: ibuf_dummy_index_free(): Beautify the comment. ------------------------------------------------------------------------ r5438 | marko | 2009-06-30 05:10:32 -0400 (Tue, 30 Jun 2009) | 1 line branches/zip: fseg_free(): Remove this unused function. ------------------------------------------------------------------------ r5439 | marko | 2009-06-30 05:15:22 -0400 (Tue, 30 Jun 2009) | 2 lines branches/zip: fseg_validate(): Enclose in #ifdef UNIV_DEBUG. This function is unused, but it could turn out to be a useful debugging aid. ------------------------------------------------------------------------ r5441 | marko | 2009-06-30 06:30:14 -0400 (Tue, 30 Jun 2009) | 2 lines branches/zip: ha_delete(): Remove this unused function that was very similar to ha_search_and_delete_if_found(). ------------------------------------------------------------------------ r5442 | marko | 2009-06-30 06:45:41 -0400 (Tue, 30 Jun 2009) | 1 line branches/zip: lock_is_on_table(), lock_table_unlock(): Unused, remove. ------------------------------------------------------------------------ r5443 | marko | 2009-06-30 07:03:00 -0400 (Tue, 30 Jun 2009) | 1 line branches/zip: os_event_create_auto(): Unused, remove. ------------------------------------------------------------------------ r5444 | marko | 2009-06-30 07:19:49 -0400 (Tue, 30 Jun 2009) | 1 line branches/zip: que_graph_try_free(): Unused, remove. ------------------------------------------------------------------------ r5445 | marko | 2009-06-30 07:28:11 -0400 (Tue, 30 Jun 2009) | 1 line branches/zip: row_build_row_ref_from_row(): Unused, remove. ------------------------------------------------------------------------ r5446 | marko | 2009-06-30 07:35:45 -0400 (Tue, 30 Jun 2009) | 1 line branches/zip: srv_que_round_robin(), srv_que_task_enqueue(): Unused, remove. ------------------------------------------------------------------------ r5447 | marko | 2009-06-30 07:37:58 -0400 (Tue, 30 Jun 2009) | 1 line branches/zip: srv_que_task_queue_check(): Unused, remove. ------------------------------------------------------------------------ r5448 | marko | 2009-06-30 07:56:36 -0400 (Tue, 30 Jun 2009) | 1 line branches/zip: mem_heap_cat(): Unused, remove. ------------------------------------------------------------------------ r5449 | marko | 2009-06-30 08:00:50 -0400 (Tue, 30 Jun 2009) | 2 lines branches/zip: innobase_start_or_create_for_mysql(): Invoke os_get_os_version() at most once. ------------------------------------------------------------------------ r5450 | marko | 2009-06-30 08:02:20 -0400 (Tue, 30 Jun 2009) | 1 line branches/zip: os_file_close_no_error_handling(): Unused, remove. ------------------------------------------------------------------------ r5451 | marko | 2009-06-30 08:09:49 -0400 (Tue, 30 Jun 2009) | 2 lines branches/zip: page_set_max_trx_id(): Make the code compile with UNIV_HOTBACKUP. ------------------------------------------------------------------------ r5452 | marko | 2009-06-30 08:10:26 -0400 (Tue, 30 Jun 2009) | 2 lines branches/zip: os_file_close_no_error_handling(): Restore, as this function is used within InnoDB Hot Backup. ------------------------------------------------------------------------ r5453 | marko | 2009-06-30 08:14:01 -0400 (Tue, 30 Jun 2009) | 1 line branches/zip: os_process_set_priority_boost(): Unused, remove. ------------------------------------------------------------------------ r5454 | marko | 2009-06-30 08:42:52 -0400 (Tue, 30 Jun 2009) | 2 lines branches/zip: Replace a non-ASCII character (ISO 8859-1 encoded U+00AD SOFT HYPHEN) with a cheap ASCII substitute. ------------------------------------------------------------------------ r5456 | inaam | 2009-06-30 14:21:09 -0400 (Tue, 30 Jun 2009) | 4 lines branches/zip Non functional change. s/Percona/Percona Inc./ ------------------------------------------------------------------------ r5470 | vasil | 2009-07-02 09:12:36 -0400 (Thu, 02 Jul 2009) | 16 lines branches/zip: Use PAUSE instruction inside spinloop if it is available. The patch was originally developed by Mikael Ronstrom <mikael@mysql.com> and can be found here: http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2768 http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2771 http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2772 http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2774 http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2777 http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2799 http://bazaar.launchpad.net/%7Emysql/mysql-server/mysql-5.4/revision/2800 Approved by: Heikki (rb://137) ------------------------------------------------------------------------ r5481 | vasil | 2009-07-06 13:16:32 -0400 (Mon, 06 Jul 2009) | 4 lines branches/zip: Remove unnecessary quotes and simplify plug.in. ------------------------------------------------------------------------ r5482 | calvin | 2009-07-06 18:36:35 -0400 (Mon, 06 Jul 2009) | 5 lines branches/zip: add COPYING files for Percona and Sun Micro. 1.0.4 contains patches based on contributions from Percona and Sun Microsystems. ------------------------------------------------------------------------ r5483 | calvin | 2009-07-07 05:36:43 -0400 (Tue, 07 Jul 2009) | 3 lines branches/zip: add IB_HAVE_PAUSE_INSTRUCTION to CMake. Windows will support PAUSE instruction by default. ------------------------------------------------------------------------ r5484 | inaam | 2009-07-07 18:57:14 -0400 (Tue, 07 Jul 2009) | 13 lines branches/zip rb://126 Based on contribution from Google Inc. This patch introduces a new parameter innodb_io_capacity to control the rate at which master threads performs various tasks. The default value is 200 and higher values imply more aggressive flushing and ibuf merges from within the master thread. This patch also changes the ibuf merge from synchronous to asynchronous. Another minor change is not to force the master thread to wait for a log flush to complete every second. Approved by: Heikki ------------------------------------------------------------------------ r5485 | inaam | 2009-07-07 19:00:49 -0400 (Tue, 07 Jul 2009) | 18 lines branches/zip rb://138 The current implementation is to try to flush the neighbors of every page that we flush. This patch makes the following distinction: 1) If the flush is from flush_list AND 2) If the flush is intended to move the oldest_modification LSN ahead (this happens when a user thread sees little space in the log file and attempts to flush pages from the buffer pool so that a checkpoint can be made) THEN Do not try to flush the neighbors. Just focus on flushing dirty pages at the end of flush_list Approved by: Heikki ------------------------------------------------------------------------ r5486 | inaam | 2009-07-08 12:11:40 -0400 (Wed, 08 Jul 2009) | 29 lines branches/zip rb://133 This patch introduces heuristics based flushing rate of dirty pages to avoid IO bursts at checkpoint. 1) log_capacity / log_generated per second gives us number of seconds in which ALL dirty pages need to be flushed. Based on this rough assumption we can say that n_dirty_pages / (log_capacity / log_generation_rate) = desired_flush_rate 2) We use weighted averages (hard coded to 20 seconds) of log_generation_rate to avoid resonance. 3) From the desired_flush_rate we subtract the number of pages that have been flushed due to LRU flushing. That gives us pages that we should flush as part of flush_list cleanup. And that is the number (capped by maximum io_capacity) that we try to flush from the master thread. Knobs: ====== innodb_adaptive_flushing: boolean, global, dynamic, default TRUE. Since this heuristic is very experimental and has the potential to dramatically change the IO pattern I think it is a good idea to leave a knob to turn it off. Approved by: Heikki ------------------------------------------------------------------------ r5487 | calvin | 2009-07-08 12:42:28 -0400 (Wed, 08 Jul 2009) | 7 lines branches/zip: fix PAUSE instruction patch on Windows The original PAUSE instruction patch (r5470) does not compile on Windows. Also, there is an elegant way of doing it on Windows - YieldProcessor(). Approved by: Heikki (on IM) ------------------------------------------------------------------------ r5489 | vasil | 2009-07-10 05:02:22 -0400 (Fri, 10 Jul 2009) | 9 lines branches/zip: Change the defaults for innodb_sync_spin_loops: 20 -> 30 innodb_spin_wait_delay: 5 -> 6 This change was proposed by Sun/MySQL based on their performance testing, see https://svn.innodb.com/innobase/Release_tasks_for_InnoDB_Plugin_V1.0.4 ------------------------------------------------------------------------ r5490 | vasil | 2009-07-10 05:04:20 -0400 (Fri, 10 Jul 2009) | 4 lines branches/zip: Add ChangeLog entry for 5489. ------------------------------------------------------------------------ r5491 | calvin | 2009-07-10 12:19:17 -0400 (Fri, 10 Jul 2009) | 6 lines branches/zip: add copyright info to files related to PAUSE instruction patch, contributed by Sun Microsystems. ------------------------------------------------------------------------ r5492 | calvin | 2009-07-10 17:47:34 -0400 (Fri, 10 Jul 2009) | 5 lines branches/zip: add ChangeLog entries for r5484-r5486. ------------------------------------------------------------------------ r5494 | vasil | 2009-07-13 03:37:35 -0400 (Mon, 13 Jul 2009) | 6 lines branches/zip: Restore the original value of innodb_sync_spin_loops at the end, previously the test assumed that setting it to 20 will do this, but now the default is 30 and MTR's internal check failed. ------------------------------------------------------------------------ r5495 | inaam | 2009-07-13 11:48:45 -0400 (Mon, 13 Jul 2009) | 5 lines branches/zip rb://138 (REVERT) Revert the flush neighbors patch as it shows regression in the benchmarks run by Michael. ------------------------------------------------------------------------ r5496 | inaam | 2009-07-13 14:04:57 -0400 (Mon, 13 Jul 2009) | 4 lines branches/zip Fixed warnings on windows where ulint != ib_uint64_t ------------------------------------------------------------------------ r5497 | calvin | 2009-07-13 15:01:00 -0400 (Mon, 13 Jul 2009) | 9 lines branches/zip: fix run-time symbols clash on Solaris. This patch is from Sergey Vojtovich of Sun Microsystems, to fix run-time symbols clash on Solaris with older C++ compiler: - when finding out a way to hide symbols, make decision basing on compiler, not operating system. - Sun Studio supports __hidden declaration specifier for this purpose. ------------------------------------------------------------------------ r5498 | vasil | 2009-07-14 03:16:18 -0400 (Tue, 14 Jul 2009) | 92 lines branches/zip: Merge r5341:5497 from branches/5.1, skipping: c5419 because it is merge from branches/zip into branches/5.1 c5466 because the source code has been adjusted to match the MySQL behavior and the innodb-autoinc test does not fail in branches/zip, if c5466 is merged, then innodb-autoinc starts failing, Sunny suggested not to merge c5466. and resolving conflicts in c5410, c5440, c5488: ------------------------------------------------------------------------ r5410 | marko | 2009-06-24 22:26:34 +0300 (Wed, 24 Jun 2009) | 2 lines Changed paths: M /branches/5.1/include/trx0sys.ic M /branches/5.1/trx/trx0purge.c M /branches/5.1/trx/trx0sys.c M /branches/5.1/trx/trx0undo.c branches/5.1: Add missing #include "mtr0log.h" to avoid warnings when compiling with -DUNIV_MUST_NOT_INLINE. ------------------------------------------------------------------------ r5419 | marko | 2009-06-25 16:11:57 +0300 (Thu, 25 Jun 2009) | 18 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc M /branches/5.1/mysql-test/innodb_bug42101-nonzero.result M /branches/5.1/mysql-test/innodb_bug42101-nonzero.test M /branches/5.1/mysql-test/innodb_bug42101.result M /branches/5.1/mysql-test/innodb_bug42101.test branches/5.1: Merge r5418 from branches/zip: ------------------------------------------------------------------------ r5418 | marko | 2009-06-25 15:55:52 +0300 (Thu, 25 Jun 2009) | 5 lines Changed paths: M /branches/zip/ChangeLog M /branches/zip/handler/ha_innodb.cc M /branches/zip/mysql-test/innodb_bug42101-nonzero.result M /branches/zip/mysql-test/innodb_bug42101-nonzero.test M /branches/zip/mysql-test/innodb_bug42101.result M /branches/zip/mysql-test/innodb_bug42101.test branches/zip: Fix a race condition caused by SET GLOBAL innodb_commit_concurrency=DEFAULT. (Bug #45749) When innodb_commit_concurrency is initially set nonzero, DEFAULT would change it back to 0, triggering Bug #42101. rb://139 approved by Heikki Tuuri. ------------------------------------------------------------------------ ------------------------------------------------------------------------ r5440 | vasil | 2009-06-30 13:04:29 +0300 (Tue, 30 Jun 2009) | 8 lines Changed paths: M /branches/5.1/fil/fil0fil.c branches/5.1: Fix Bug#45814 URL reference in InnoDB server errors needs adjusting to match documentation by changing the URL from http://dev.mysql.com/doc/refman/5.1/en/innodb-troubleshooting.html to http://dev.mysql.com/doc/refman/5.1/en/innodb-troubleshooting-datadict.html ------------------------------------------------------------------------ r5466 | vasil | 2009-07-02 10:46:45 +0300 (Thu, 02 Jul 2009) | 6 lines Changed paths: M /branches/5.1/mysql-test/innodb-autoinc.result M /branches/5.1/mysql-test/innodb-autoinc.test branches/5.1: Adjust the failing innodb-autoinc test to conform to the latest behavior of the MySQL code. The idea and the comment in innodb-autoinc.test come from Sunny. ------------------------------------------------------------------------ r5488 | vasil | 2009-07-09 19:16:44 +0300 (Thu, 09 Jul 2009) | 13 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc A /branches/5.1/mysql-test/innodb_bug21704.result A /branches/5.1/mysql-test/innodb_bug21704.test branches/5.1: Fix Bug#21704 Renaming column does not update FK definition by checking whether a column that participates in a FK definition is being renamed and denying the ALTER in this case. The patch was originally developed by Davi Arnaut <Davi.Arnaut@Sun.COM>: http://lists.mysql.com/commits/77714 and was later adjusted to conform to InnoDB coding style by me (Vasil), I also added some more comments and moved the bug specific mysql-test to a separate file to make it more manageable and flexible. ------------------------------------------------------------------------ ------------------------------------------------------------------------ r5499 | calvin | 2009-07-14 12:55:10 -0400 (Tue, 14 Jul 2009) | 3 lines branches/zip: add a missing file in Makefile.am This change was suggested by MySQL. ------------------------------------------------------------------------ r5500 | calvin | 2009-07-14 13:03:26 -0400 (Tue, 14 Jul 2009) | 3 lines branches/zip: minor change Remove an extra "with". ------------------------------------------------------------------------ r5501 | vasil | 2009-07-14 13:58:15 -0400 (Tue, 14 Jul 2009) | 5 lines branches/zip: Add @ZLIB_INCLUDES@ so that the InnoDB Plugin picks up the same zlib.h header file that is eventually used by mysqld. ------------------------------------------------------------------------ r5502 | vasil | 2009-07-14 13:59:59 -0400 (Tue, 14 Jul 2009) | 4 lines branches/zip: Add include/ut0auxconf.h to noinst_HEADERS ------------------------------------------------------------------------ r5503 | vasil | 2009-07-14 14:16:11 -0400 (Tue, 14 Jul 2009) | 8 lines branches/zip: Non-functional change: put files in noinst_HEADERS and libinnobase_a_SOURCES one per line and sort alphabetically, so it is easier to find if a file is there or not and also diffs show exactly the added or removed file instead of surrounding lines too. ------------------------------------------------------------------------ r5504 | calvin | 2009-07-15 04:58:44 -0400 (Wed, 15 Jul 2009) | 6 lines branches/zip: fix compile errors on Win64 Both srv_read_ahead_factor and srv_io_capacity should be defined as ulong. Approved by: Sunny ------------------------------------------------------------------------ r5508 | calvin | 2009-07-16 09:40:47 -0400 (Thu, 16 Jul 2009) | 16 lines branches/zip: Support inlining of functions and prefetch with Sun Studio Those changes are contributed by Sun/MySQL. Two sets of changes in this patch when Sun Studio is used: - Explicit inlining of functions - Prefetch Support This patch has been tested by Sunny with the plugin statically built in. Since we've never built the plugin as a dynamically loaded module on Solaris, it is a separate task to change plug.in. rb://142 Approved by: Heikki ------------------------------------------------------------------------ r5509 | calvin | 2009-07-16 09:45:28 -0400 (Thu, 16 Jul 2009) | 2 lines branches/zip: add ChangeLog entry for r5508. ------------------------------------------------------------------------ r5512 | sunny | 2009-07-19 19:52:48 -0400 (Sun, 19 Jul 2009) | 2 lines branches/zip: Remove unused extern ref to timed_mutexes. ------------------------------------------------------------------------ r5513 | sunny | 2009-07-19 19:58:43 -0400 (Sun, 19 Jul 2009) | 2 lines branches/zip: Undo r5512 ------------------------------------------------------------------------ r5514 | sunny | 2009-07-19 20:08:49 -0400 (Sun, 19 Jul 2009) | 2 lines branches/zip: Only use my_bool when UNIV_HOTBACKUP is not defined. ------------------------------------------------------------------------ r5515 | sunny | 2009-07-20 03:29:14 -0400 (Mon, 20 Jul 2009) | 2 lines branches/zip: The dict_table_t::autoinc_mutex field is not used in HotBackup. ------------------------------------------------------------------------ r5516 | sunny | 2009-07-20 03:46:05 -0400 (Mon, 20 Jul 2009) | 4 lines branches/zip: Make this file usable from within HotBackup. A new file has been introduced called hb_univ.i. This file should have all the HotBackup specific configuration. ------------------------------------------------------------------------ r5517 | sunny | 2009-07-20 03:55:11 -0400 (Mon, 20 Jul 2009) | 2 lines Add /* UNIV_HOTBACK */ ------------------------------------------------------------------------ r5519 | vasil | 2009-07-20 04:45:18 -0400 (Mon, 20 Jul 2009) | 31 lines branches/zip: Merge r5497:5518 from branches/5.1: ------------------------------------------------------------------------ r5518 | vasil | 2009-07-20 11:29:47 +0300 (Mon, 20 Jul 2009) | 22 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc branches/5.1: Merge a change from MySQL: ------------------------------------------------------------ revno: 2874.2.1 committer: Anurag Shekhar <anurag.shekhar@sun.com> branch nick: mysql-5.1-bugteam-windows-warning timestamp: Wed 2009-05-13 15:41:24 +0530 message: Bug #39802 On Windows, 32-bit time_t should be enforced This patch fixes compilation warning, "conversion from 'time_t' to 'ulong', possible loss of data". The fix is to typecast time_t to ulong before assigning it to ulong. Backported this from 6.0-bugteam tree. modified: storage/archive/ha_archive.cc storage/federated/ha_federated.cc storage/innobase/handler/ha_innodb.cc storage/myisam/ha_myisam.cc ------------------------------------------------------------------------ ------------------------------------------------------------------------ r5520 | vasil | 2009-07-20 04:51:47 -0400 (Mon, 20 Jul 2009) | 4 lines branches/zip: Add ChangeLog entries for r5498 and r5519. ------------------------------------------------------------------------ r5524 | inaam | 2009-07-20 12:23:15 -0400 (Mon, 20 Jul 2009) | 9 lines branches/zip Change the read ahead parameter name to innodb_read_ahead_threshold. Change the meaning of this parameter to signify the number of pages that must be sequentially accessed for InnoDB to trigger a readahead request. Suggested by: Ken ------------------------------------------------------------------------
1428 lines
34 KiB
C
1428 lines
34 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 que/que0que.c
|
|
Query graph
|
|
|
|
Created 5/27/1996 Heikki Tuuri
|
|
*******************************************************/
|
|
|
|
#include "que0que.h"
|
|
|
|
#ifdef UNIV_NONINL
|
|
#include "que0que.ic"
|
|
#endif
|
|
|
|
#include "srv0que.h"
|
|
#include "usr0sess.h"
|
|
#include "trx0trx.h"
|
|
#include "trx0roll.h"
|
|
#include "row0undo.h"
|
|
#include "row0ins.h"
|
|
#include "row0upd.h"
|
|
#include "row0sel.h"
|
|
#include "row0purge.h"
|
|
#include "dict0crea.h"
|
|
#include "log0log.h"
|
|
#include "eval0proc.h"
|
|
#include "eval0eval.h"
|
|
#include "pars0types.h"
|
|
|
|
#define QUE_PARALLELIZE_LIMIT (64 * 256 * 256 * 256)
|
|
#define QUE_ROUND_ROBIN_LIMIT (64 * 256 * 256 * 256)
|
|
#define QUE_MAX_LOOPS_WITHOUT_CHECK 16
|
|
|
|
#ifdef UNIV_DEBUG
|
|
/* If the following flag is set TRUE, the module will print trace info
|
|
of SQL execution in the UNIV_SQL_DEBUG version */
|
|
UNIV_INTERN ibool que_trace_on = FALSE;
|
|
#endif /* UNIV_DEBUG */
|
|
|
|
/* Short introduction to query graphs
|
|
==================================
|
|
|
|
A query graph consists of nodes linked to each other in various ways. The
|
|
execution starts at que_run_threads() which takes a que_thr_t parameter.
|
|
que_thr_t contains two fields that control query graph execution: run_node
|
|
and prev_node. run_node is the next node to execute and prev_node is the
|
|
last node executed.
|
|
|
|
Each node has a pointer to a 'next' statement, i.e., its brother, and a
|
|
pointer to its parent node. The next pointer is NULL in the last statement
|
|
of a block.
|
|
|
|
Loop nodes contain a link to the first statement of the enclosed statement
|
|
list. While the loop runs, que_thr_step() checks if execution to the loop
|
|
node came from its parent or from one of the statement nodes in the loop. If
|
|
it came from the parent of the loop node it starts executing the first
|
|
statement node in the loop. If it came from one of the statement nodes in
|
|
the loop, then it checks if the statement node has another statement node
|
|
following it, and runs it if so.
|
|
|
|
To signify loop ending, the loop statements (see e.g. while_step()) set
|
|
que_thr_t->run_node to the loop node's parent node. This is noticed on the
|
|
next call of que_thr_step() and execution proceeds to the node pointed to by
|
|
the loop node's 'next' pointer.
|
|
|
|
For example, the code:
|
|
|
|
X := 1;
|
|
WHILE X < 5 LOOP
|
|
X := X + 1;
|
|
X := X + 1;
|
|
X := 5
|
|
|
|
will result in the following node hierarchy, with the X-axis indicating
|
|
'next' links and the Y-axis indicating parent/child links:
|
|
|
|
A - W - A
|
|
|
|
|
|
|
|
A - A
|
|
|
|
A = assign_node_t, W = while_node_t. */
|
|
|
|
/* How a stored procedure containing COMMIT or ROLLBACK commands
|
|
is executed?
|
|
|
|
The commit or rollback can be seen as a subprocedure call.
|
|
The problem is that if there are several query threads
|
|
currently running within the transaction, their action could
|
|
mess the commit or rollback operation. Or, at the least, the
|
|
operation would be difficult to visualize and keep in control.
|
|
|
|
Therefore the query thread requesting a commit or a rollback
|
|
sends to the transaction a signal, which moves the transaction
|
|
to TRX_QUE_SIGNALED state. All running query threads of the
|
|
transaction will eventually notice that the transaction is now in
|
|
this state and voluntarily suspend themselves. Only the last
|
|
query thread which suspends itself will trigger handling of
|
|
the signal.
|
|
|
|
When the transaction starts to handle a rollback or commit
|
|
signal, it builds a query graph which, when executed, will
|
|
roll back or commit the incomplete transaction. The transaction
|
|
is moved to the TRX_QUE_ROLLING_BACK or TRX_QUE_COMMITTING state.
|
|
If specified, the SQL cursors opened by the transaction are closed.
|
|
When the execution of the graph completes, it is like returning
|
|
from a subprocedure: the query thread which requested the operation
|
|
starts running again. */
|
|
|
|
/**********************************************************************//**
|
|
Moves a thread from another state to the QUE_THR_RUNNING state. Increments
|
|
the n_active_thrs counters of the query graph and transaction.
|
|
***NOTE***: This is the only function in which such a transition is allowed
|
|
to happen! */
|
|
static
|
|
void
|
|
que_thr_move_to_run_state(
|
|
/*======================*/
|
|
que_thr_t* thr); /*!< in: an query thread */
|
|
|
|
/***********************************************************************//**
|
|
Adds a query graph to the session's list of graphs. */
|
|
UNIV_INTERN
|
|
void
|
|
que_graph_publish(
|
|
/*==============*/
|
|
que_t* graph, /*!< in: graph */
|
|
sess_t* sess) /*!< in: session */
|
|
{
|
|
ut_ad(mutex_own(&kernel_mutex));
|
|
|
|
UT_LIST_ADD_LAST(graphs, sess->graphs, graph);
|
|
}
|
|
|
|
/***********************************************************************//**
|
|
Creates a query graph fork node.
|
|
@return own: fork node */
|
|
UNIV_INTERN
|
|
que_fork_t*
|
|
que_fork_create(
|
|
/*============*/
|
|
que_t* graph, /*!< in: graph, if NULL then this
|
|
fork node is assumed to be the
|
|
graph root */
|
|
que_node_t* parent, /*!< in: parent node */
|
|
ulint fork_type, /*!< in: fork type */
|
|
mem_heap_t* heap) /*!< in: memory heap where created */
|
|
{
|
|
que_fork_t* fork;
|
|
|
|
ut_ad(heap);
|
|
|
|
fork = mem_heap_alloc(heap, sizeof(que_fork_t));
|
|
|
|
fork->common.type = QUE_NODE_FORK;
|
|
fork->n_active_thrs = 0;
|
|
|
|
fork->state = QUE_FORK_COMMAND_WAIT;
|
|
|
|
if (graph != NULL) {
|
|
fork->graph = graph;
|
|
} else {
|
|
fork->graph = fork;
|
|
}
|
|
|
|
fork->common.parent = parent;
|
|
fork->fork_type = fork_type;
|
|
|
|
fork->caller = NULL;
|
|
|
|
UT_LIST_INIT(fork->thrs);
|
|
|
|
fork->sym_tab = NULL;
|
|
fork->info = NULL;
|
|
|
|
fork->heap = heap;
|
|
|
|
return(fork);
|
|
}
|
|
|
|
/***********************************************************************//**
|
|
Creates a query graph thread node.
|
|
@return own: query thread node */
|
|
UNIV_INTERN
|
|
que_thr_t*
|
|
que_thr_create(
|
|
/*===========*/
|
|
que_fork_t* parent, /*!< in: parent node, i.e., a fork node */
|
|
mem_heap_t* heap) /*!< in: memory heap where created */
|
|
{
|
|
que_thr_t* thr;
|
|
|
|
ut_ad(parent && heap);
|
|
|
|
thr = mem_heap_alloc(heap, sizeof(que_thr_t));
|
|
|
|
thr->common.type = QUE_NODE_THR;
|
|
thr->common.parent = parent;
|
|
|
|
thr->magic_n = QUE_THR_MAGIC_N;
|
|
|
|
thr->graph = parent->graph;
|
|
|
|
thr->state = QUE_THR_COMMAND_WAIT;
|
|
|
|
thr->is_active = FALSE;
|
|
|
|
thr->run_node = NULL;
|
|
thr->resource = 0;
|
|
thr->lock_state = QUE_THR_LOCK_NOLOCK;
|
|
|
|
UT_LIST_ADD_LAST(thrs, parent->thrs, thr);
|
|
|
|
return(thr);
|
|
}
|
|
|
|
/**********************************************************************//**
|
|
Moves a suspended query thread to the QUE_THR_RUNNING state and may release
|
|
a single worker thread to execute it. This function should be used to end
|
|
the wait state of a query thread waiting for a lock or a stored procedure
|
|
completion. */
|
|
UNIV_INTERN
|
|
void
|
|
que_thr_end_wait(
|
|
/*=============*/
|
|
que_thr_t* thr, /*!< in: query thread in the
|
|
QUE_THR_LOCK_WAIT,
|
|
or QUE_THR_PROCEDURE_WAIT, or
|
|
QUE_THR_SIG_REPLY_WAIT state */
|
|
que_thr_t** next_thr) /*!< in/out: next query thread to run;
|
|
if the value which is passed in is
|
|
a pointer to a NULL pointer, then the
|
|
calling function can start running
|
|
a new query thread; if NULL is passed
|
|
as the parameter, it is ignored */
|
|
{
|
|
ibool was_active;
|
|
|
|
ut_ad(mutex_own(&kernel_mutex));
|
|
ut_ad(thr);
|
|
ut_ad((thr->state == QUE_THR_LOCK_WAIT)
|
|
|| (thr->state == QUE_THR_PROCEDURE_WAIT)
|
|
|| (thr->state == QUE_THR_SIG_REPLY_WAIT));
|
|
ut_ad(thr->run_node);
|
|
|
|
thr->prev_node = thr->run_node;
|
|
|
|
was_active = thr->is_active;
|
|
|
|
que_thr_move_to_run_state(thr);
|
|
|
|
if (was_active) {
|
|
|
|
return;
|
|
}
|
|
|
|
if (next_thr && *next_thr == NULL) {
|
|
*next_thr = thr;
|
|
} else {
|
|
ut_a(0);
|
|
srv_que_task_enqueue_low(thr);
|
|
}
|
|
}
|
|
|
|
/**********************************************************************//**
|
|
Same as que_thr_end_wait, but no parameter next_thr available. */
|
|
UNIV_INTERN
|
|
void
|
|
que_thr_end_wait_no_next_thr(
|
|
/*=========================*/
|
|
que_thr_t* thr) /*!< in: query thread in the QUE_THR_LOCK_WAIT,
|
|
or QUE_THR_PROCEDURE_WAIT, or
|
|
QUE_THR_SIG_REPLY_WAIT state */
|
|
{
|
|
ibool was_active;
|
|
|
|
ut_a(thr->state == QUE_THR_LOCK_WAIT); /* In MySQL this is the
|
|
only possible state here */
|
|
ut_ad(mutex_own(&kernel_mutex));
|
|
ut_ad(thr);
|
|
ut_ad((thr->state == QUE_THR_LOCK_WAIT)
|
|
|| (thr->state == QUE_THR_PROCEDURE_WAIT)
|
|
|| (thr->state == QUE_THR_SIG_REPLY_WAIT));
|
|
|
|
was_active = thr->is_active;
|
|
|
|
que_thr_move_to_run_state(thr);
|
|
|
|
if (was_active) {
|
|
|
|
return;
|
|
}
|
|
|
|
/* In MySQL we let the OS thread (not just the query thread) to wait
|
|
for the lock to be released: */
|
|
|
|
srv_release_mysql_thread_if_suspended(thr);
|
|
|
|
/* srv_que_task_enqueue_low(thr); */
|
|
}
|
|
|
|
/**********************************************************************//**
|
|
Inits a query thread for a command. */
|
|
UNIV_INLINE
|
|
void
|
|
que_thr_init_command(
|
|
/*=================*/
|
|
que_thr_t* thr) /*!< in: query thread */
|
|
{
|
|
thr->run_node = thr;
|
|
thr->prev_node = thr->common.parent;
|
|
|
|
que_thr_move_to_run_state(thr);
|
|
}
|
|
|
|
/**********************************************************************//**
|
|
Starts execution of a command in a query fork. Picks a query thread which
|
|
is not in the QUE_THR_RUNNING state and moves it to that state. If none
|
|
can be chosen, a situation which may arise in parallelized fetches, NULL
|
|
is returned.
|
|
@return a query thread of the graph moved to QUE_THR_RUNNING state, or
|
|
NULL; the query thread should be executed by que_run_threads by the
|
|
caller */
|
|
UNIV_INTERN
|
|
que_thr_t*
|
|
que_fork_start_command(
|
|
/*===================*/
|
|
que_fork_t* fork) /*!< in: a query fork */
|
|
{
|
|
que_thr_t* thr;
|
|
que_thr_t* suspended_thr = NULL;
|
|
que_thr_t* completed_thr = NULL;
|
|
|
|
fork->state = QUE_FORK_ACTIVE;
|
|
|
|
fork->last_sel_node = NULL;
|
|
|
|
suspended_thr = NULL;
|
|
completed_thr = NULL;
|
|
|
|
/* Choose the query thread to run: usually there is just one thread,
|
|
but in a parallelized select, which necessarily is non-scrollable,
|
|
there may be several to choose from */
|
|
|
|
/* First we try to find a query thread in the QUE_THR_COMMAND_WAIT
|
|
state. Then we try to find a query thread in the QUE_THR_SUSPENDED
|
|
state, finally we try to find a query thread in the QUE_THR_COMPLETED
|
|
state */
|
|
|
|
thr = UT_LIST_GET_FIRST(fork->thrs);
|
|
|
|
/* We make a single pass over the thr list within which we note which
|
|
threads are ready to run. */
|
|
while (thr) {
|
|
switch (thr->state) {
|
|
case QUE_THR_COMMAND_WAIT:
|
|
|
|
/* We have to send the initial message to query thread
|
|
to start it */
|
|
|
|
que_thr_init_command(thr);
|
|
|
|
return(thr);
|
|
|
|
case QUE_THR_SUSPENDED:
|
|
/* In this case the execution of the thread was
|
|
suspended: no initial message is needed because
|
|
execution can continue from where it was left */
|
|
if (!suspended_thr) {
|
|
suspended_thr = thr;
|
|
}
|
|
|
|
break;
|
|
|
|
case QUE_THR_COMPLETED:
|
|
if (!completed_thr) {
|
|
completed_thr = thr;
|
|
}
|
|
|
|
break;
|
|
|
|
case QUE_THR_LOCK_WAIT:
|
|
ut_error;
|
|
|
|
}
|
|
|
|
thr = UT_LIST_GET_NEXT(thrs, thr);
|
|
}
|
|
|
|
if (suspended_thr) {
|
|
|
|
thr = suspended_thr;
|
|
que_thr_move_to_run_state(thr);
|
|
|
|
} else if (completed_thr) {
|
|
|
|
thr = completed_thr;
|
|
que_thr_init_command(thr);
|
|
}
|
|
|
|
return(thr);
|
|
}
|
|
|
|
/**********************************************************************//**
|
|
After signal handling is finished, returns control to a query graph error
|
|
handling routine. (Currently, just returns the control to the root of the
|
|
graph so that the graph can communicate an error message to the client.) */
|
|
UNIV_INTERN
|
|
void
|
|
que_fork_error_handle(
|
|
/*==================*/
|
|
trx_t* trx __attribute__((unused)), /*!< in: trx */
|
|
que_t* fork) /*!< in: query graph which was run before signal
|
|
handling started, NULL not allowed */
|
|
{
|
|
que_thr_t* thr;
|
|
|
|
ut_ad(mutex_own(&kernel_mutex));
|
|
ut_ad(trx->sess->state == SESS_ERROR);
|
|
ut_ad(UT_LIST_GET_LEN(trx->reply_signals) == 0);
|
|
ut_ad(UT_LIST_GET_LEN(trx->wait_thrs) == 0);
|
|
|
|
thr = UT_LIST_GET_FIRST(fork->thrs);
|
|
|
|
while (thr != NULL) {
|
|
ut_ad(!thr->is_active);
|
|
ut_ad(thr->state != QUE_THR_SIG_REPLY_WAIT);
|
|
ut_ad(thr->state != QUE_THR_LOCK_WAIT);
|
|
|
|
thr->run_node = thr;
|
|
thr->prev_node = thr->child;
|
|
thr->state = QUE_THR_COMPLETED;
|
|
|
|
thr = UT_LIST_GET_NEXT(thrs, thr);
|
|
}
|
|
|
|
thr = UT_LIST_GET_FIRST(fork->thrs);
|
|
|
|
que_thr_move_to_run_state(thr);
|
|
|
|
ut_a(0);
|
|
srv_que_task_enqueue_low(thr);
|
|
}
|
|
|
|
/****************************************************************//**
|
|
Tests if all the query threads in the same fork have a given state.
|
|
@return TRUE if all the query threads in the same fork were in the
|
|
given state */
|
|
UNIV_INLINE
|
|
ibool
|
|
que_fork_all_thrs_in_state(
|
|
/*=======================*/
|
|
que_fork_t* fork, /*!< in: query fork */
|
|
ulint state) /*!< in: state */
|
|
{
|
|
que_thr_t* thr_node;
|
|
|
|
thr_node = UT_LIST_GET_FIRST(fork->thrs);
|
|
|
|
while (thr_node != NULL) {
|
|
if (thr_node->state != state) {
|
|
|
|
return(FALSE);
|
|
}
|
|
|
|
thr_node = UT_LIST_GET_NEXT(thrs, thr_node);
|
|
}
|
|
|
|
return(TRUE);
|
|
}
|
|
|
|
/**********************************************************************//**
|
|
Calls que_graph_free_recursive for statements in a statement list. */
|
|
static
|
|
void
|
|
que_graph_free_stat_list(
|
|
/*=====================*/
|
|
que_node_t* node) /*!< in: first query graph node in the list */
|
|
{
|
|
while (node) {
|
|
que_graph_free_recursive(node);
|
|
|
|
node = que_node_get_next(node);
|
|
}
|
|
}
|
|
|
|
/**********************************************************************//**
|
|
Frees a query graph, but not the heap where it was created. Does not free
|
|
explicit cursor declarations, they are freed in que_graph_free. */
|
|
UNIV_INTERN
|
|
void
|
|
que_graph_free_recursive(
|
|
/*=====================*/
|
|
que_node_t* node) /*!< in: query graph node */
|
|
{
|
|
que_fork_t* fork;
|
|
que_thr_t* thr;
|
|
undo_node_t* undo;
|
|
sel_node_t* sel;
|
|
ins_node_t* ins;
|
|
upd_node_t* upd;
|
|
tab_node_t* cre_tab;
|
|
ind_node_t* cre_ind;
|
|
|
|
if (node == NULL) {
|
|
|
|
return;
|
|
}
|
|
|
|
switch (que_node_get_type(node)) {
|
|
|
|
case QUE_NODE_FORK:
|
|
fork = node;
|
|
|
|
thr = UT_LIST_GET_FIRST(fork->thrs);
|
|
|
|
while (thr) {
|
|
que_graph_free_recursive(thr);
|
|
|
|
thr = UT_LIST_GET_NEXT(thrs, thr);
|
|
}
|
|
|
|
break;
|
|
case QUE_NODE_THR:
|
|
|
|
thr = node;
|
|
|
|
if (thr->magic_n != QUE_THR_MAGIC_N) {
|
|
fprintf(stderr,
|
|
"que_thr struct appears corrupt;"
|
|
" magic n %lu\n",
|
|
(unsigned long) thr->magic_n);
|
|
mem_analyze_corruption(thr);
|
|
ut_error;
|
|
}
|
|
|
|
thr->magic_n = QUE_THR_MAGIC_FREED;
|
|
|
|
que_graph_free_recursive(thr->child);
|
|
|
|
break;
|
|
case QUE_NODE_UNDO:
|
|
|
|
undo = node;
|
|
|
|
mem_heap_free(undo->heap);
|
|
|
|
break;
|
|
case QUE_NODE_SELECT:
|
|
|
|
sel = node;
|
|
|
|
sel_node_free_private(sel);
|
|
|
|
break;
|
|
case QUE_NODE_INSERT:
|
|
|
|
ins = node;
|
|
|
|
que_graph_free_recursive(ins->select);
|
|
|
|
mem_heap_free(ins->entry_sys_heap);
|
|
|
|
break;
|
|
case QUE_NODE_UPDATE:
|
|
|
|
upd = node;
|
|
|
|
if (upd->in_mysql_interface) {
|
|
|
|
btr_pcur_free_for_mysql(upd->pcur);
|
|
}
|
|
|
|
que_graph_free_recursive(upd->cascade_node);
|
|
|
|
if (upd->cascade_heap) {
|
|
mem_heap_free(upd->cascade_heap);
|
|
}
|
|
|
|
que_graph_free_recursive(upd->select);
|
|
|
|
mem_heap_free(upd->heap);
|
|
|
|
break;
|
|
case QUE_NODE_CREATE_TABLE:
|
|
cre_tab = node;
|
|
|
|
que_graph_free_recursive(cre_tab->tab_def);
|
|
que_graph_free_recursive(cre_tab->col_def);
|
|
que_graph_free_recursive(cre_tab->commit_node);
|
|
|
|
mem_heap_free(cre_tab->heap);
|
|
|
|
break;
|
|
case QUE_NODE_CREATE_INDEX:
|
|
cre_ind = node;
|
|
|
|
que_graph_free_recursive(cre_ind->ind_def);
|
|
que_graph_free_recursive(cre_ind->field_def);
|
|
que_graph_free_recursive(cre_ind->commit_node);
|
|
|
|
mem_heap_free(cre_ind->heap);
|
|
|
|
break;
|
|
case QUE_NODE_PROC:
|
|
que_graph_free_stat_list(((proc_node_t*)node)->stat_list);
|
|
|
|
break;
|
|
case QUE_NODE_IF:
|
|
que_graph_free_stat_list(((if_node_t*)node)->stat_list);
|
|
que_graph_free_stat_list(((if_node_t*)node)->else_part);
|
|
que_graph_free_stat_list(((if_node_t*)node)->elsif_list);
|
|
|
|
break;
|
|
case QUE_NODE_ELSIF:
|
|
que_graph_free_stat_list(((elsif_node_t*)node)->stat_list);
|
|
|
|
break;
|
|
case QUE_NODE_WHILE:
|
|
que_graph_free_stat_list(((while_node_t*)node)->stat_list);
|
|
|
|
break;
|
|
case QUE_NODE_FOR:
|
|
que_graph_free_stat_list(((for_node_t*)node)->stat_list);
|
|
|
|
break;
|
|
|
|
case QUE_NODE_ASSIGNMENT:
|
|
case QUE_NODE_EXIT:
|
|
case QUE_NODE_RETURN:
|
|
case QUE_NODE_COMMIT:
|
|
case QUE_NODE_ROLLBACK:
|
|
case QUE_NODE_LOCK:
|
|
case QUE_NODE_FUNC:
|
|
case QUE_NODE_ORDER:
|
|
case QUE_NODE_ROW_PRINTF:
|
|
case QUE_NODE_OPEN:
|
|
case QUE_NODE_FETCH:
|
|
/* No need to do anything */
|
|
|
|
break;
|
|
default:
|
|
fprintf(stderr,
|
|
"que_node struct appears corrupt; type %lu\n",
|
|
(unsigned long) que_node_get_type(node));
|
|
mem_analyze_corruption(node);
|
|
ut_error;
|
|
}
|
|
}
|
|
|
|
/**********************************************************************//**
|
|
Frees a query graph. */
|
|
UNIV_INTERN
|
|
void
|
|
que_graph_free(
|
|
/*===========*/
|
|
que_t* graph) /*!< in: query graph; we assume that the memory
|
|
heap where this graph was created is private
|
|
to this graph: if not, then use
|
|
que_graph_free_recursive and free the heap
|
|
afterwards! */
|
|
{
|
|
ut_ad(graph);
|
|
|
|
if (graph->sym_tab) {
|
|
/* The following call frees dynamic memory allocated
|
|
for variables etc. during execution. Frees also explicit
|
|
cursor definitions. */
|
|
|
|
sym_tab_free_private(graph->sym_tab);
|
|
}
|
|
|
|
if (graph->info && graph->info->graph_owns_us) {
|
|
pars_info_free(graph->info);
|
|
}
|
|
|
|
que_graph_free_recursive(graph);
|
|
|
|
mem_heap_free(graph->heap);
|
|
}
|
|
|
|
/****************************************************************//**
|
|
Performs an execution step on a thr node.
|
|
@return query thread to run next, or NULL if none */
|
|
static
|
|
que_thr_t*
|
|
que_thr_node_step(
|
|
/*==============*/
|
|
que_thr_t* thr) /*!< in: query thread where run_node must
|
|
be the thread node itself */
|
|
{
|
|
ut_ad(thr->run_node == thr);
|
|
|
|
if (thr->prev_node == thr->common.parent) {
|
|
/* If control to the node came from above, it is just passed
|
|
on */
|
|
|
|
thr->run_node = thr->child;
|
|
|
|
return(thr);
|
|
}
|
|
|
|
mutex_enter(&kernel_mutex);
|
|
|
|
if (que_thr_peek_stop(thr)) {
|
|
|
|
mutex_exit(&kernel_mutex);
|
|
|
|
return(thr);
|
|
}
|
|
|
|
/* Thread execution completed */
|
|
|
|
thr->state = QUE_THR_COMPLETED;
|
|
|
|
mutex_exit(&kernel_mutex);
|
|
|
|
return(NULL);
|
|
}
|
|
|
|
/**********************************************************************//**
|
|
Moves a thread from another state to the QUE_THR_RUNNING state. Increments
|
|
the n_active_thrs counters of the query graph and transaction if thr was
|
|
not active.
|
|
***NOTE***: This and ..._mysql are the only functions in which such a
|
|
transition is allowed to happen! */
|
|
static
|
|
void
|
|
que_thr_move_to_run_state(
|
|
/*======================*/
|
|
que_thr_t* thr) /*!< in: an query thread */
|
|
{
|
|
trx_t* trx;
|
|
|
|
ut_ad(thr->state != QUE_THR_RUNNING);
|
|
|
|
trx = thr_get_trx(thr);
|
|
|
|
if (!thr->is_active) {
|
|
|
|
(thr->graph)->n_active_thrs++;
|
|
|
|
trx->n_active_thrs++;
|
|
|
|
thr->is_active = TRUE;
|
|
|
|
ut_ad((thr->graph)->n_active_thrs == 1);
|
|
ut_ad(trx->n_active_thrs == 1);
|
|
}
|
|
|
|
thr->state = QUE_THR_RUNNING;
|
|
}
|
|
|
|
/**********************************************************************//**
|
|
Decrements the query thread reference counts in the query graph and the
|
|
transaction. May start signal handling, e.g., a rollback.
|
|
*** NOTE ***:
|
|
This and que_thr_stop_for_mysql are the only functions where the reference
|
|
count can be decremented and this function may only be called from inside
|
|
que_run_threads or que_thr_check_if_switch! These restrictions exist to make
|
|
the rollback code easier to maintain. */
|
|
static
|
|
void
|
|
que_thr_dec_refer_count(
|
|
/*====================*/
|
|
que_thr_t* thr, /*!< in: query thread */
|
|
que_thr_t** next_thr) /*!< in/out: next query thread to run;
|
|
if the value which is passed in is
|
|
a pointer to a NULL pointer, then the
|
|
calling function can start running
|
|
a new query thread */
|
|
{
|
|
que_fork_t* fork;
|
|
trx_t* trx;
|
|
ulint fork_type;
|
|
ibool stopped;
|
|
|
|
fork = thr->common.parent;
|
|
trx = thr_get_trx(thr);
|
|
|
|
mutex_enter(&kernel_mutex);
|
|
|
|
ut_a(thr->is_active);
|
|
|
|
if (thr->state == QUE_THR_RUNNING) {
|
|
|
|
stopped = que_thr_stop(thr);
|
|
|
|
if (!stopped) {
|
|
/* The reason for the thr suspension or wait was
|
|
already canceled before we came here: continue
|
|
running the thread */
|
|
|
|
/* fputs("!!!!!!!! Wait already ended: continue thr\n",
|
|
stderr); */
|
|
|
|
if (next_thr && *next_thr == NULL) {
|
|
/* Normally srv_suspend_mysql_thread resets
|
|
the state to DB_SUCCESS before waiting, but
|
|
in this case we have to do it here,
|
|
otherwise nobody does it. */
|
|
trx->error_state = DB_SUCCESS;
|
|
|
|
*next_thr = thr;
|
|
} else {
|
|
ut_error;
|
|
srv_que_task_enqueue_low(thr);
|
|
}
|
|
|
|
mutex_exit(&kernel_mutex);
|
|
|
|
return;
|
|
}
|
|
}
|
|
|
|
ut_ad(fork->n_active_thrs == 1);
|
|
ut_ad(trx->n_active_thrs == 1);
|
|
|
|
fork->n_active_thrs--;
|
|
trx->n_active_thrs--;
|
|
|
|
thr->is_active = FALSE;
|
|
|
|
if (trx->n_active_thrs > 0) {
|
|
|
|
mutex_exit(&kernel_mutex);
|
|
|
|
return;
|
|
}
|
|
|
|
fork_type = fork->fork_type;
|
|
|
|
/* Check if all query threads in the same fork are completed */
|
|
|
|
if (que_fork_all_thrs_in_state(fork, QUE_THR_COMPLETED)) {
|
|
|
|
switch (fork_type) {
|
|
case QUE_FORK_ROLLBACK:
|
|
/* This is really the undo graph used in rollback,
|
|
no roll_node in this graph */
|
|
|
|
ut_ad(UT_LIST_GET_LEN(trx->signals) > 0);
|
|
ut_ad(trx->handling_signals == TRUE);
|
|
|
|
trx_finish_rollback_off_kernel(fork, trx, next_thr);
|
|
break;
|
|
|
|
case QUE_FORK_PURGE:
|
|
case QUE_FORK_RECOVERY:
|
|
case QUE_FORK_MYSQL_INTERFACE:
|
|
|
|
/* Do nothing */
|
|
break;
|
|
|
|
default:
|
|
ut_error; /*!< not used in MySQL */
|
|
}
|
|
}
|
|
|
|
if (UT_LIST_GET_LEN(trx->signals) > 0 && trx->n_active_thrs == 0) {
|
|
|
|
/* If the trx is signaled and its query thread count drops to
|
|
zero, then we start processing a signal; from it we may get
|
|
a new query thread to run */
|
|
|
|
trx_sig_start_handle(trx, next_thr);
|
|
}
|
|
|
|
if (trx->handling_signals && UT_LIST_GET_LEN(trx->signals) == 0) {
|
|
|
|
trx_end_signal_handling(trx);
|
|
}
|
|
|
|
mutex_exit(&kernel_mutex);
|
|
}
|
|
|
|
/**********************************************************************//**
|
|
Stops a query thread if graph or trx is in a state requiring it. The
|
|
conditions are tested in the order (1) graph, (2) trx. The kernel mutex has
|
|
to be reserved.
|
|
@return TRUE if stopped */
|
|
UNIV_INTERN
|
|
ibool
|
|
que_thr_stop(
|
|
/*=========*/
|
|
que_thr_t* thr) /*!< in: query thread */
|
|
{
|
|
trx_t* trx;
|
|
que_t* graph;
|
|
ibool ret = TRUE;
|
|
|
|
ut_ad(mutex_own(&kernel_mutex));
|
|
|
|
graph = thr->graph;
|
|
trx = graph->trx;
|
|
|
|
if (graph->state == QUE_FORK_COMMAND_WAIT) {
|
|
thr->state = QUE_THR_SUSPENDED;
|
|
|
|
} else if (trx->que_state == TRX_QUE_LOCK_WAIT) {
|
|
|
|
UT_LIST_ADD_FIRST(trx_thrs, trx->wait_thrs, thr);
|
|
thr->state = QUE_THR_LOCK_WAIT;
|
|
|
|
} else if (trx->error_state != DB_SUCCESS
|
|
&& trx->error_state != DB_LOCK_WAIT) {
|
|
|
|
/* Error handling built for the MySQL interface */
|
|
thr->state = QUE_THR_COMPLETED;
|
|
|
|
} else if (UT_LIST_GET_LEN(trx->signals) > 0
|
|
&& graph->fork_type != QUE_FORK_ROLLBACK) {
|
|
|
|
thr->state = QUE_THR_SUSPENDED;
|
|
} else {
|
|
ut_ad(graph->state == QUE_FORK_ACTIVE);
|
|
|
|
ret = FALSE;
|
|
}
|
|
|
|
return(ret);
|
|
}
|
|
|
|
/**********************************************************************//**
|
|
A patch for MySQL used to 'stop' a dummy query thread used in MySQL. The
|
|
query thread is stopped and made inactive, except in the case where
|
|
it was put to the lock wait state in lock0lock.c, but the lock has already
|
|
been granted or the transaction chosen as a victim in deadlock resolution. */
|
|
UNIV_INTERN
|
|
void
|
|
que_thr_stop_for_mysql(
|
|
/*===================*/
|
|
que_thr_t* thr) /*!< in: query thread */
|
|
{
|
|
trx_t* trx;
|
|
|
|
trx = thr_get_trx(thr);
|
|
|
|
mutex_enter(&kernel_mutex);
|
|
|
|
if (thr->state == QUE_THR_RUNNING) {
|
|
|
|
if (trx->error_state != DB_SUCCESS
|
|
&& trx->error_state != DB_LOCK_WAIT) {
|
|
|
|
/* Error handling built for the MySQL interface */
|
|
thr->state = QUE_THR_COMPLETED;
|
|
} else {
|
|
/* It must have been a lock wait but the lock was
|
|
already released, or this transaction was chosen
|
|
as a victim in selective deadlock resolution */
|
|
|
|
mutex_exit(&kernel_mutex);
|
|
|
|
return;
|
|
}
|
|
}
|
|
|
|
ut_ad(thr->is_active == TRUE);
|
|
ut_ad(trx->n_active_thrs == 1);
|
|
ut_ad(thr->graph->n_active_thrs == 1);
|
|
|
|
thr->is_active = FALSE;
|
|
(thr->graph)->n_active_thrs--;
|
|
|
|
trx->n_active_thrs--;
|
|
|
|
mutex_exit(&kernel_mutex);
|
|
}
|
|
|
|
/**********************************************************************//**
|
|
Moves a thread from another state to the QUE_THR_RUNNING state. Increments
|
|
the n_active_thrs counters of the query graph and transaction if thr was
|
|
not active. */
|
|
UNIV_INTERN
|
|
void
|
|
que_thr_move_to_run_state_for_mysql(
|
|
/*================================*/
|
|
que_thr_t* thr, /*!< in: an query thread */
|
|
trx_t* trx) /*!< in: transaction */
|
|
{
|
|
if (thr->magic_n != QUE_THR_MAGIC_N) {
|
|
fprintf(stderr,
|
|
"que_thr struct appears corrupt; magic n %lu\n",
|
|
(unsigned long) thr->magic_n);
|
|
|
|
mem_analyze_corruption(thr);
|
|
|
|
ut_error;
|
|
}
|
|
|
|
if (!thr->is_active) {
|
|
|
|
thr->graph->n_active_thrs++;
|
|
|
|
trx->n_active_thrs++;
|
|
|
|
thr->is_active = TRUE;
|
|
}
|
|
|
|
thr->state = QUE_THR_RUNNING;
|
|
}
|
|
|
|
/**********************************************************************//**
|
|
A patch for MySQL used to 'stop' a dummy query thread used in MySQL
|
|
select, when there is no error or lock wait. */
|
|
UNIV_INTERN
|
|
void
|
|
que_thr_stop_for_mysql_no_error(
|
|
/*============================*/
|
|
que_thr_t* thr, /*!< in: query thread */
|
|
trx_t* trx) /*!< in: transaction */
|
|
{
|
|
ut_ad(thr->state == QUE_THR_RUNNING);
|
|
ut_ad(thr->is_active == TRUE);
|
|
ut_ad(trx->n_active_thrs == 1);
|
|
ut_ad(thr->graph->n_active_thrs == 1);
|
|
|
|
if (thr->magic_n != QUE_THR_MAGIC_N) {
|
|
fprintf(stderr,
|
|
"que_thr struct appears corrupt; magic n %lu\n",
|
|
(unsigned long) thr->magic_n);
|
|
|
|
mem_analyze_corruption(thr);
|
|
|
|
ut_error;
|
|
}
|
|
|
|
thr->state = QUE_THR_COMPLETED;
|
|
|
|
thr->is_active = FALSE;
|
|
(thr->graph)->n_active_thrs--;
|
|
|
|
trx->n_active_thrs--;
|
|
}
|
|
|
|
/****************************************************************//**
|
|
Get the first containing loop node (e.g. while_node_t or for_node_t) for the
|
|
given node, or NULL if the node is not within a loop.
|
|
@return containing loop node, or NULL. */
|
|
UNIV_INTERN
|
|
que_node_t*
|
|
que_node_get_containing_loop_node(
|
|
/*==============================*/
|
|
que_node_t* node) /*!< in: node */
|
|
{
|
|
ut_ad(node);
|
|
|
|
for (;;) {
|
|
ulint type;
|
|
|
|
node = que_node_get_parent(node);
|
|
|
|
if (!node) {
|
|
break;
|
|
}
|
|
|
|
type = que_node_get_type(node);
|
|
|
|
if ((type == QUE_NODE_FOR) || (type == QUE_NODE_WHILE)) {
|
|
break;
|
|
}
|
|
}
|
|
|
|
return(node);
|
|
}
|
|
|
|
/**********************************************************************//**
|
|
Prints info of an SQL query graph node. */
|
|
UNIV_INTERN
|
|
void
|
|
que_node_print_info(
|
|
/*================*/
|
|
que_node_t* node) /*!< in: query graph node */
|
|
{
|
|
ulint type;
|
|
const char* str;
|
|
|
|
type = que_node_get_type(node);
|
|
|
|
if (type == QUE_NODE_SELECT) {
|
|
str = "SELECT";
|
|
} else if (type == QUE_NODE_INSERT) {
|
|
str = "INSERT";
|
|
} else if (type == QUE_NODE_UPDATE) {
|
|
str = "UPDATE";
|
|
} else if (type == QUE_NODE_WHILE) {
|
|
str = "WHILE";
|
|
} else if (type == QUE_NODE_ASSIGNMENT) {
|
|
str = "ASSIGNMENT";
|
|
} else if (type == QUE_NODE_IF) {
|
|
str = "IF";
|
|
} else if (type == QUE_NODE_FETCH) {
|
|
str = "FETCH";
|
|
} else if (type == QUE_NODE_OPEN) {
|
|
str = "OPEN";
|
|
} else if (type == QUE_NODE_PROC) {
|
|
str = "STORED PROCEDURE";
|
|
} else if (type == QUE_NODE_FUNC) {
|
|
str = "FUNCTION";
|
|
} else if (type == QUE_NODE_LOCK) {
|
|
str = "LOCK";
|
|
} else if (type == QUE_NODE_THR) {
|
|
str = "QUERY THREAD";
|
|
} else if (type == QUE_NODE_COMMIT) {
|
|
str = "COMMIT";
|
|
} else if (type == QUE_NODE_UNDO) {
|
|
str = "UNDO ROW";
|
|
} else if (type == QUE_NODE_PURGE) {
|
|
str = "PURGE ROW";
|
|
} else if (type == QUE_NODE_ROLLBACK) {
|
|
str = "ROLLBACK";
|
|
} else if (type == QUE_NODE_CREATE_TABLE) {
|
|
str = "CREATE TABLE";
|
|
} else if (type == QUE_NODE_CREATE_INDEX) {
|
|
str = "CREATE INDEX";
|
|
} else if (type == QUE_NODE_FOR) {
|
|
str = "FOR LOOP";
|
|
} else if (type == QUE_NODE_RETURN) {
|
|
str = "RETURN";
|
|
} else if (type == QUE_NODE_EXIT) {
|
|
str = "EXIT";
|
|
} else {
|
|
str = "UNKNOWN NODE TYPE";
|
|
}
|
|
|
|
fprintf(stderr, "Node type %lu: %s, address %p\n",
|
|
(ulong) type, str, (void*) node);
|
|
}
|
|
|
|
/**********************************************************************//**
|
|
Performs an execution step on a query thread.
|
|
@return query thread to run next: it may differ from the input
|
|
parameter if, e.g., a subprocedure call is made */
|
|
UNIV_INLINE
|
|
que_thr_t*
|
|
que_thr_step(
|
|
/*=========*/
|
|
que_thr_t* thr) /*!< in: query thread */
|
|
{
|
|
que_node_t* node;
|
|
que_thr_t* old_thr;
|
|
trx_t* trx;
|
|
ulint type;
|
|
|
|
trx = thr_get_trx(thr);
|
|
|
|
ut_ad(thr->state == QUE_THR_RUNNING);
|
|
ut_a(trx->error_state == DB_SUCCESS);
|
|
|
|
thr->resource++;
|
|
|
|
node = thr->run_node;
|
|
type = que_node_get_type(node);
|
|
|
|
old_thr = thr;
|
|
|
|
#ifdef UNIV_DEBUG
|
|
if (que_trace_on) {
|
|
fputs("To execute: ", stderr);
|
|
que_node_print_info(node);
|
|
}
|
|
#endif
|
|
if (type & QUE_NODE_CONTROL_STAT) {
|
|
if ((thr->prev_node != que_node_get_parent(node))
|
|
&& que_node_get_next(thr->prev_node)) {
|
|
|
|
/* The control statements, like WHILE, always pass the
|
|
control to the next child statement if there is any
|
|
child left */
|
|
|
|
thr->run_node = que_node_get_next(thr->prev_node);
|
|
|
|
} else if (type == QUE_NODE_IF) {
|
|
if_step(thr);
|
|
} else if (type == QUE_NODE_FOR) {
|
|
for_step(thr);
|
|
} else if (type == QUE_NODE_PROC) {
|
|
|
|
/* We can access trx->undo_no without reserving
|
|
trx->undo_mutex, because there cannot be active query
|
|
threads doing updating or inserting at the moment! */
|
|
|
|
if (thr->prev_node == que_node_get_parent(node)) {
|
|
trx->last_sql_stat_start.least_undo_no
|
|
= trx->undo_no;
|
|
}
|
|
|
|
proc_step(thr);
|
|
} else if (type == QUE_NODE_WHILE) {
|
|
while_step(thr);
|
|
} else {
|
|
ut_error;
|
|
}
|
|
} else if (type == QUE_NODE_ASSIGNMENT) {
|
|
assign_step(thr);
|
|
} else if (type == QUE_NODE_SELECT) {
|
|
thr = row_sel_step(thr);
|
|
} else if (type == QUE_NODE_INSERT) {
|
|
thr = row_ins_step(thr);
|
|
} else if (type == QUE_NODE_UPDATE) {
|
|
thr = row_upd_step(thr);
|
|
} else if (type == QUE_NODE_FETCH) {
|
|
thr = fetch_step(thr);
|
|
} else if (type == QUE_NODE_OPEN) {
|
|
thr = open_step(thr);
|
|
} else if (type == QUE_NODE_FUNC) {
|
|
proc_eval_step(thr);
|
|
|
|
} else if (type == QUE_NODE_LOCK) {
|
|
|
|
ut_error;
|
|
/*
|
|
thr = que_lock_step(thr);
|
|
*/
|
|
} else if (type == QUE_NODE_THR) {
|
|
thr = que_thr_node_step(thr);
|
|
} else if (type == QUE_NODE_COMMIT) {
|
|
thr = trx_commit_step(thr);
|
|
} else if (type == QUE_NODE_UNDO) {
|
|
thr = row_undo_step(thr);
|
|
} else if (type == QUE_NODE_PURGE) {
|
|
thr = row_purge_step(thr);
|
|
} else if (type == QUE_NODE_RETURN) {
|
|
thr = return_step(thr);
|
|
} else if (type == QUE_NODE_EXIT) {
|
|
thr = exit_step(thr);
|
|
} else if (type == QUE_NODE_ROLLBACK) {
|
|
thr = trx_rollback_step(thr);
|
|
} else if (type == QUE_NODE_CREATE_TABLE) {
|
|
thr = dict_create_table_step(thr);
|
|
} else if (type == QUE_NODE_CREATE_INDEX) {
|
|
thr = dict_create_index_step(thr);
|
|
} else if (type == QUE_NODE_ROW_PRINTF) {
|
|
thr = row_printf_step(thr);
|
|
} else {
|
|
ut_error;
|
|
}
|
|
|
|
if (type == QUE_NODE_EXIT) {
|
|
old_thr->prev_node = que_node_get_containing_loop_node(node);
|
|
} else {
|
|
old_thr->prev_node = node;
|
|
}
|
|
|
|
if (thr) {
|
|
ut_a(thr_get_trx(thr)->error_state == DB_SUCCESS);
|
|
}
|
|
|
|
return(thr);
|
|
}
|
|
|
|
/**********************************************************************//**
|
|
Run a query thread until it finishes or encounters e.g. a lock wait. */
|
|
static
|
|
void
|
|
que_run_threads_low(
|
|
/*================*/
|
|
que_thr_t* thr) /*!< in: query thread */
|
|
{
|
|
que_thr_t* next_thr;
|
|
ulint cumul_resource;
|
|
ulint loop_count;
|
|
|
|
ut_ad(thr->state == QUE_THR_RUNNING);
|
|
ut_a(thr_get_trx(thr)->error_state == DB_SUCCESS);
|
|
ut_ad(!mutex_own(&kernel_mutex));
|
|
|
|
/* cumul_resource counts how much resources the OS thread (NOT the
|
|
query thread) has spent in this function */
|
|
|
|
loop_count = QUE_MAX_LOOPS_WITHOUT_CHECK;
|
|
cumul_resource = 0;
|
|
loop:
|
|
/* Check that there is enough space in the log to accommodate
|
|
possible log entries by this query step; if the operation can touch
|
|
more than about 4 pages, checks must be made also within the query
|
|
step! */
|
|
|
|
log_free_check();
|
|
|
|
/* Perform the actual query step: note that the query thread
|
|
may change if, e.g., a subprocedure call is made */
|
|
|
|
/*-------------------------*/
|
|
next_thr = que_thr_step(thr);
|
|
/*-------------------------*/
|
|
|
|
ut_a(!next_thr || (thr_get_trx(next_thr)->error_state == DB_SUCCESS));
|
|
|
|
loop_count++;
|
|
|
|
if (next_thr != thr) {
|
|
ut_a(next_thr == NULL);
|
|
|
|
/* This can change next_thr to a non-NULL value if there was
|
|
a lock wait that already completed. */
|
|
que_thr_dec_refer_count(thr, &next_thr);
|
|
|
|
if (next_thr == NULL) {
|
|
|
|
return;
|
|
}
|
|
|
|
loop_count = QUE_MAX_LOOPS_WITHOUT_CHECK;
|
|
|
|
thr = next_thr;
|
|
}
|
|
|
|
goto loop;
|
|
}
|
|
|
|
/**********************************************************************//**
|
|
Run a query thread. Handles lock waits. */
|
|
UNIV_INTERN
|
|
void
|
|
que_run_threads(
|
|
/*============*/
|
|
que_thr_t* thr) /*!< in: query thread */
|
|
{
|
|
loop:
|
|
ut_a(thr_get_trx(thr)->error_state == DB_SUCCESS);
|
|
que_run_threads_low(thr);
|
|
|
|
mutex_enter(&kernel_mutex);
|
|
|
|
switch (thr->state) {
|
|
|
|
case QUE_THR_RUNNING:
|
|
/* There probably was a lock wait, but it already ended
|
|
before we came here: continue running thr */
|
|
|
|
mutex_exit(&kernel_mutex);
|
|
|
|
goto loop;
|
|
|
|
case QUE_THR_LOCK_WAIT:
|
|
mutex_exit(&kernel_mutex);
|
|
|
|
/* The ..._mysql_... function works also for InnoDB's
|
|
internal threads. Let us wait that the lock wait ends. */
|
|
|
|
srv_suspend_mysql_thread(thr);
|
|
|
|
if (thr_get_trx(thr)->error_state != DB_SUCCESS) {
|
|
/* thr was chosen as a deadlock victim or there was
|
|
a lock wait timeout */
|
|
|
|
que_thr_dec_refer_count(thr, NULL);
|
|
|
|
return;
|
|
}
|
|
|
|
goto loop;
|
|
|
|
case QUE_THR_COMPLETED:
|
|
case QUE_THR_COMMAND_WAIT:
|
|
/* Do nothing */
|
|
break;
|
|
|
|
default:
|
|
ut_error;
|
|
}
|
|
|
|
mutex_exit(&kernel_mutex);
|
|
}
|
|
|
|
/*********************************************************************//**
|
|
Evaluate the given SQL.
|
|
@return error code or DB_SUCCESS */
|
|
UNIV_INTERN
|
|
ulint
|
|
que_eval_sql(
|
|
/*=========*/
|
|
pars_info_t* info, /*!< in: info struct, or NULL */
|
|
const char* sql, /*!< in: SQL string */
|
|
ibool reserve_dict_mutex,
|
|
/*!< in: if TRUE, acquire/release
|
|
dict_sys->mutex around call to pars_sql. */
|
|
trx_t* trx) /*!< in: trx */
|
|
{
|
|
que_thr_t* thr;
|
|
que_t* graph;
|
|
|
|
ut_a(trx->error_state == DB_SUCCESS);
|
|
|
|
if (reserve_dict_mutex) {
|
|
mutex_enter(&dict_sys->mutex);
|
|
}
|
|
|
|
graph = pars_sql(info, sql);
|
|
|
|
if (reserve_dict_mutex) {
|
|
mutex_exit(&dict_sys->mutex);
|
|
}
|
|
|
|
ut_a(graph);
|
|
|
|
graph->trx = trx;
|
|
trx->graph = NULL;
|
|
|
|
graph->fork_type = QUE_FORK_MYSQL_INTERFACE;
|
|
|
|
ut_a(thr = que_fork_start_command(graph));
|
|
|
|
que_run_threads(thr);
|
|
|
|
que_graph_free(graph);
|
|
|
|
return(trx->error_state);
|
|
}
|