mirror of
https://github.com/MariaDB/server.git
synced 2025-01-20 05:52:27 +01:00
509e761f06
------------------------------------------------------------------------ r4670 | vasil | 2009-04-07 09:35:23 +0300 (Tue, 07 Apr 2009) | 11 lines branches/zip: Fix Bug#43660 SHOW INDEXES/ANALYZE does NOT update cardinality for indexes of InnoDB table by replacing the pseudo random number generator with a better one (LCG). This also fixes Mantis Issue#212. Approved by: Heikki (rb://110) ------------------------------------------------------------------------ r4671 | vasil | 2009-04-07 09:37:31 +0300 (Tue, 07 Apr 2009) | 4 lines branches/zip: Add ChangeLog entry for r4670. ------------------------------------------------------------------------ r4673 | marko | 2009-04-07 15:45:28 +0300 (Tue, 07 Apr 2009) | 4 lines branches/zip: Allow in-place updates of UTF-8 CHAR columns from or to NULL in ROW_FORMAT=REDUNDANT. (Bug #44032) rb://107 approved by Heikki Tuuri. ------------------------------------------------------------------------ r4677 | marko | 2009-04-07 16:19:31 +0300 (Tue, 07 Apr 2009) | 1 line branches/zip: Adjust r4673 as in the merge to branches/6.0 -r4676. ------------------------------------------------------------------------ r4678 | inaam | 2009-04-07 18:45:37 +0300 (Tue, 07 Apr 2009) | 12 lines branches/zip Enable atomics on solaris (using the libc functions as defined in atomic.h) if GCC atomic builtins are not present. There still remains some work to be done (by Vasil?). This patch makes changes to plug.in to check pthread_t size and presence of atomic functions when running on solaris. The same has to become a part of the generated Makefile.in when we bake our source. Reviewed by: Heikki rb://106 ------------------------------------------------------------------------ r4687 | vasil | 2009-04-08 13:08:59 +0300 (Wed, 08 Apr 2009) | 4 lines branches/zip: Whitespace fixup in the ChangeLog ------------------------------------------------------------------------ r4688 | vasil | 2009-04-08 13:11:15 +0300 (Wed, 08 Apr 2009) | 4 lines branches/zip: Add ChangeLog entry for r4678. ------------------------------------------------------------------------ r4689 | marko | 2009-04-08 14:24:49 +0300 (Wed, 08 Apr 2009) | 5 lines branches/zip: Hide unnecessarily visible globals. dict_ind_redundant, dict_ind_compact: Declare these UNIV_INTERN. innodb_hton_ptr: Declare static. We do not attempt to access the built-in InnoDB any more. trx_roll_savepoints_free(): Declare UNIV_INTERN. ------------------------------------------------------------------------ r4700 | calvin | 2009-04-11 00:37:10 +0300 (Sat, 11 Apr 2009) | 9 lines branches/zip: Rewrite CMakeLists.txt CMakeLists.txt is completely rewritten: - To replace the one written by mysql - Print out some useful information, such as system name, directory, generator used, win64, Microsoft compiler, etc. - Remove one workaround for mysqld.lib location. User does not need to specify a build type ------------------------------------------------------------------------ r4702 | calvin | 2009-04-13 18:16:44 +0300 (Mon, 13 Apr 2009) | 3 lines branches/zip: delete the original CMakeLists.txt A new version will be committed, suggested by Ken. ------------------------------------------------------------------------ r4703 | calvin | 2009-04-13 18:20:45 +0300 (Mon, 13 Apr 2009) | 9 lines branches/zip: new CMakeLists.txt CMakeLists.txt is completely rewritten with enhancements: - Print out useful information, such as system name, directory, generator used, win64, Microsoft compiler, etc. - Remove one workaround for mysqld.lib location. User does not need to specify a build type when invoking MSVC generator. ------------------------------------------------------------------------ r4706 | vasil | 2009-04-14 14:32:11 +0300 (Tue, 14 Apr 2009) | 5 lines branches/zip: When using the random function, first take the modulus by the number of pages and then typecast to ulint. ------------------------------------------------------------------------ r4707 | calvin | 2009-04-14 17:47:31 +0300 (Tue, 14 Apr 2009) | 13 lines branches/zip: remove statically linked libraries from mysql To make zlib and strings dynamically linked; mysqld will export additional functions required by InnoDB. Since the symbols will be resolved dynamically during runtime, wdl_load_mapfile() is no longer able to make any function calls to ones in mysqld. As the result, strtoull() (from strings.lib) is replaced with _strtoui64(). rb://111 Approved by: Marko ------------------------------------------------------------------------ r4712 | vasil | 2009-04-15 12:26:32 +0300 (Wed, 15 Apr 2009) | 157 lines branches/zip: Merge revisions 4481:4710 from branches/5.1: (resolving conflict in r4574, r4575 and skipping r4699 and r4705 because analogous changes to r4699 and r4705 were already made to branches/zip) ------------------------------------------------------------------------ r4573 | vasil | 2009-03-30 14:17:13 +0300 (Mon, 30 Mar 2009) | 4 lines Changed paths: M /branches/5.1/mysql-test/innodb.test branches/5.1: Fix email address from dev@innodb.com to innodb_dev_ww@oracle.com ------------------------------------------------------------------------ r4574 | vasil | 2009-03-30 14:27:08 +0300 (Mon, 30 Mar 2009) | 38 lines Changed paths: M /branches/5.1/Makefile.am M /branches/5.1/mysql-test/innodb.test branches/5.1: Restore the state of INNODB_THREAD_CONCURRENCY to silence this warning: TEST RESULT TIME (ms) ------------------------------------------------------------ worker[1] Using MTR_BUILD_THREAD 250, with reserved ports 12500..12509 main.innodb [ pass ] 8803 MTR's internal check of the test case 'main.innodb' failed. This means that the test case does not preserve the state that existed before the test case was executed. Most likely the test case did not do a proper clean-up. This is the diff of the states of the servers before and after the test case was executed: mysqltest: Logging to '/tmp/autotest.sh-20090330_033000-5.1.5Hg8CY/mysql-5.1/mysql-test/var/tmp/check-mysqld_1.log'. mysqltest: Results saved in '/tmp/autotest.sh-20090330_033000-5.1.5Hg8CY/mysql-5.1/mysql-test/var/tmp/check-mysqld_1.result'. mysqltest: Connecting to server localhost:12500 (socket /tmp/autotest.sh-20090330_033000-5.1.5Hg8CY/mysql-5.1/mysql-test/var/tmp/mysqld.1.sock) as 'root', connection 'default', attempt 0 ... mysqltest: ... Connected. mysqltest: Start processing test commands from './include/check-testcase.test' ... mysqltest: ... Done processing test commands. --- /tmp/autotest.sh-20090330_033000-5.1.5Hg8CY/mysql-5.1/mysql-test/var/tmp/check-mysqld_1.result 2009-03-30 14:12:31.000000000 +0300 +++ /tmp/autotest.sh-20090330_033000-5.1.5Hg8CY/mysql-5.1/mysql-test/var/tmp/check-mysqld_1.reject 2009-03-30 14:12:41.000000000 +0300 @@ -99,7 +99,7 @@ INNODB_SUPPORT_XA ON INNODB_SYNC_SPIN_LOOPS 20 INNODB_TABLE_LOCKS ON -INNODB_THREAD_CONCURRENCY 8 +INNODB_THREAD_CONCURRENCY 16 INNODB_THREAD_SLEEP_DELAY 10000 INSERT_ID 0 INTERACTIVE_TIMEOUT 28800 mysqltest: Result content mismatch not ok ------------------------------------------------------------------------ r4575 | vasil | 2009-03-30 15:55:31 +0300 (Mon, 30 Mar 2009) | 8 lines Changed paths: M /branches/5.1/mysql-test/innodb.result M /branches/5.1/mysql-test/innodb.test branches/5.1: Fix Bug#43309 Test main.innodb can't be run twice Make the innodb mysql-test more flexible by inspecting how much a variable of interest has changed since the start of the test. Do not assume the variables have zero values at the start of the test. ------------------------------------------------------------------------ r4576 | vasil | 2009-03-30 16:25:10 +0300 (Mon, 30 Mar 2009) | 4 lines Changed paths: M /branches/5.1/Makefile.am branches/5.1: Revert a change to Makefile.am that I committed accidentally in c4574. ------------------------------------------------------------------------ r4659 | vasil | 2009-04-06 15:34:51 +0300 (Mon, 06 Apr 2009) | 6 lines Changed paths: M /branches/5.1/mysql-test/innodb.test branches/5.1: Followup to r4575 and the fix of Bug#43309 Test main.innodb can't be run twice: Add an explanatory comment, as suggested by Patrick Crews in the bug report. ------------------------------------------------------------------------ r4699 | vasil | 2009-04-09 14:01:52 +0300 (Thu, 09 Apr 2009) | 15 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc M /branches/5.1/include/srv0srv.h M /branches/5.1/page/page0cur.c M /branches/5.1/srv/srv0srv.c branches/5.1: Fix Bug#43660 SHOW INDEXES/ANALYZE does NOT update cardinality for indexes of InnoDB table by replacing the PRNG that is used to pick random pages with a better one. This is based on r4670 but also adds a new configuration option and enables the fix only if this option is changed. Please skip the present revision when merging. Approved by: Heikki (via email) ------------------------------------------------------------------------ r4705 | vasil | 2009-04-14 14:30:13 +0300 (Tue, 14 Apr 2009) | 5 lines Changed paths: M /branches/5.1/page/page0cur.c branches/5.1: When using the random function, first take the modulus by the number of pages and then typecast to ulint. ------------------------------------------------------------------------ r4710 | vasil | 2009-04-15 11:55:18 +0300 (Wed, 15 Apr 2009) | 25 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc branches/5.1: Merge a change from MySQL (looks like this is against 5.0 but they later merged it to 5.1): ------------------------------------------------------------ revno: 1810.3846.1 committer: Alexey Botchkov <holyfoot@mysql.com> branch nick: 31435 timestamp: Tue 2008-11-11 14:42:32 +0400 message: Bug#31435 ha_innodb.cc:3983: ulint convert_search_mode_to_innobase(ha_rkey_function): Asse I think we don't need to issue an error statement in the convert_search_mode_to_innobase(). Returning the PAGE_CUR_UNSUPP value is enough as allows to handle this case depending on the requirements. per-file comments: sql/ha_innodb.cc Bug#31435 ha_innodb.cc:3983: ulint convert_search_mode_to_innobase(ha_rkey_function): Asse no error issued in convert_search_mode_to_innobase. ha_innobase::records_in_range() returns HA_POS_ERROR if search mode isn't supported. modified: sql/ha_innodb.cc ------------------------------------------------------------------------ ------------------------------------------------------------------------ r4713 | vasil | 2009-04-15 12:36:16 +0300 (Wed, 15 Apr 2009) | 4 lines branches/zip: Add missing ChangeLog entries ------------------------------------------------------------------------ r4714 | vasil | 2009-04-15 12:36:57 +0300 (Wed, 15 Apr 2009) | 4 lines branches/zip: Fix typo in the ChangeLog ------------------------------------------------------------------------ r4715 | vasil | 2009-04-15 12:39:04 +0300 (Wed, 15 Apr 2009) | 4 lines branches/zip: Whitespace cleanup in ChangeLog ------------------------------------------------------------------------ r4716 | vasil | 2009-04-15 21:36:06 +0300 (Wed, 15 Apr 2009) | 4 lines branches/zip: Add ChangeLog entry for r4543. ------------------------------------------------------------------------ r4717 | calvin | 2009-04-16 01:22:35 +0300 (Thu, 16 Apr 2009) | 18 lines branches/zip: Use the Windows Interlocked functions for atomic memory access Mapping the atomic operations to Windows Interlocked functions: os_compare_and_swap_* to InterlockedCompareExchange(64) os_atomic_increment_* to InterlockedExchangeAdd(64) os_atomic_test_and_set_byte to InterlockedExchange In this patch, the legacy code under UNIV_CAN_USE_X86_ASSEMBLER is removed all together, and add HAVE_WINDOWS_ATOMICS and INNODB_RW_LOCKS_USE_ATOMICS to CMakeLists.txt This is to address mantis issue#194. rb://113 Approved by: Marko ------------------------------------------------------------------------ r4720 | vasil | 2009-04-16 09:44:48 +0300 (Thu, 16 Apr 2009) | 4 lines branches/zip: Add ChangeLog entry for r4717. ------------------------------------------------------------------------ r4721 | marko | 2009-04-16 10:32:09 +0300 (Thu, 16 Apr 2009) | 2 lines branches/zip: row_scan_and_check_index(): Initialize prebuilt->index_usable. This should have been done in r4631. Spotted by Michael. ------------------------------------------------------------------------ r4728 | marko | 2009-04-16 16:02:27 +0300 (Thu, 16 Apr 2009) | 3 lines branches/zip: univ.i: Define REFMAN as the base URL of the MySQL Reference Manual and use it in every string. This fixes Issue #221. ------------------------------------------------------------------------ r4733 | calvin | 2009-04-17 08:13:20 +0300 (Fri, 17 Apr 2009) | 6 lines branches/zip: minor changes to CMakeLists.txt All are non-functional changes: - should check for long (not int), spotted by Sunny - comment out the project definition, avoiding to generate another .sln file. ------------------------------------------------------------------------ r4748 | vasil | 2009-04-18 00:50:09 +0300 (Sat, 18 Apr 2009) | 118 lines branches/zip: Merge revisions 4710:4746 from branches/5.1: ------------------------------------------------------------------------ r4746 | vasil | 2009-04-18 00:32:08 +0300 (Sat, 18 Apr 2009) | 110 lines Changed paths: M /branches/5.1/handler/ha_innodb.cc M /branches/5.1/include/pars0pars.h branches/5.1: Merge a change from MySQL: ------------------------------------------------------------ revno: 2728.10.2 committer: Ignacio Galarza <iggy@mysql.com> branch nick: mysql-5.1-bugteam-bug29125 timestamp: Fri 2009-02-13 11:41:47 -0500 message: Bug#29125 Windows Server X64: so many compiler warnings - Remove bothersome warning messages. This change focuses on the warnings that are covered by the ignore file: support-files/compiler_warnings.supp. - Strings are guaranteed to be max uint in length modified: client/mysql_upgrade.c client/mysqladmin.cc client/mysqlbinlog.cc client/mysqlcheck.c client/mysqldump.c client/mysqlslap.c client/mysqltest.cc client/sql_string.cc extra/comp_err.c extra/yassl/src/buffer.cpp extra/yassl/taocrypt/include/block.hpp extra/yassl/taocrypt/src/algebra.cpp extra/yassl/taocrypt/src/asn.cpp include/config-win.h libmysql/libmysql.c mysys/array.c mysys/base64.c mysys/charset.c mysys/checksum.c mysys/default.c mysys/default_modify.c mysys/hash.c mysys/mf_keycache.c mysys/mf_tempdir.c mysys/my_append.c mysys/my_compress.c mysys/my_conio.c mysys/my_copy.c mysys/my_getwd.c mysys/my_pread.c mysys/my_quick.c mysys/my_read.c mysys/safemalloc.c mysys/string.c server-tools/instance-manager/buffer.cc server-tools/instance-manager/instance.cc server-tools/instance-manager/options.cc server-tools/instance-manager/parse.h sql-common/client.c sql-common/my_user.c sql/event_data_objects.cc sql/event_parse_data.cc sql/events.cc sql/gen_lex_hash.cc sql/item.h sql/item_func.cc sql/item_strfunc.cc sql/item_timefunc.cc sql/lock.cc sql/log_event.cc sql/log_event.h sql/log_event_old.cc sql/net_serv.cc sql/sp_head.h sql/spatial.h sql/sql_class.h sql/sql_connect.cc sql/sql_crypt.cc sql/sql_error.cc sql/sql_insert.cc sql/sql_lex.cc sql/sql_lex.h sql/sql_load.cc sql/sql_prepare.cc sql/sql_profile.cc sql/sql_repl.cc sql/sql_servers.cc sql/sql_string.cc sql/sql_table.cc sql/sql_trigger.cc sql/sql_udf.cc sql/sql_view.cc sql/udf_example.c sql/uniques.cc storage/archive/azio.c storage/archive/azlib.h storage/csv/ha_tina.cc storage/csv/ha_tina.h storage/csv/transparent_file.h storage/federated/ha_federated.cc storage/federated/ha_federated.h storage/heap/hp_write.c storage/innobase/handler/ha_innodb.cc storage/innobase/include/pars0pars.h storage/myisam/ha_myisam.cc storage/myisam/mi_check.c storage/myisam/mi_packrec.c storage/myisam/mi_search.c storage/myisam/rt_index.c storage/myisammrg/ha_myisammrg.cc strings/ctype.c strings/my_vsnprintf.c tests/bug25714.c tests/mysql_client_test.c ------------------------------------------------------------------------ r4749 | vasil | 2009-04-18 00:58:08 +0300 (Sat, 18 Apr 2009) | 4 lines branches/zip: Add ChangeLog entry for t4748. ------------------------------------------------------------------------ r4751 | vasil | 2009-04-18 01:29:16 +0300 (Sat, 18 Apr 2009) | 4 lines branches/zip: Silence warning about unused variables. ------------------------------------------------------------------------ r4752 | vasil | 2009-04-18 01:30:37 +0300 (Sat, 18 Apr 2009) | 4 lines branches/zip: Include the needed header for memset(). ------------------------------------------------------------------------ r4753 | vasil | 2009-04-18 01:31:34 +0300 (Sat, 18 Apr 2009) | 4 lines branches/zip: Silence a compiler warning. ------------------------------------------------------------------------ r4756 | vasil | 2009-04-18 02:19:03 +0300 (Sat, 18 Apr 2009) | 5 lines branches/zip: Rename the aux config program and give it a more specific name because more are coming. ------------------------------------------------------------------------ r4757 | vasil | 2009-04-18 02:22:33 +0300 (Sat, 18 Apr 2009) | 4 lines branches/zip: Add comment and copyright notice to the aux config program. ------------------------------------------------------------------------ r4758 | vasil | 2009-04-18 02:40:47 +0300 (Sat, 18 Apr 2009) | 5 lines branches/zip: Add aux config programs to emulate the newly added checks in plug.in (from r4678). ------------------------------------------------------------------------ r4830 | marko | 2009-04-20 16:11:38 +0300 (Mon, 20 Apr 2009) | 6 lines branches/zip: Cosmetic fixes. row_unlock_for_mysql(): Add a const qualifier to read-only rec_t*. Use dict_index_is_clust(). CMakeLists.txt: svn propset svn:eol-style native. ------------------------------------------------------------------------ r4893 | marko | 2009-04-23 09:32:36 +0300 (Thu, 23 Apr 2009) | 11 lines branches/zip: Introduce the logical type names trx_id_t, roll_ptr_t, and undo_no_t. Each type is still defined as dulint. This is an initial step towards replacing dulint with a 64-bit data type. Because modern compilers have no trouble supporting 64-bit arithmetics even on 32-bit targets, the dulint struct is a relic that should go. The last remaining major use of dulint is dictionary IDs (table, index, and row ids). rb://114 approved by Sunny Bains ------------------------------------------------------------------------ r4894 | marko | 2009-04-23 10:21:07 +0300 (Thu, 23 Apr 2009) | 1 line branches/zip: ChangeLog: Document r4893. ------------------------------------------------------------------------ r4895 | marko | 2009-04-23 10:22:06 +0300 (Thu, 23 Apr 2009) | 1 line branches/zip: ChangeLog: Add the missing include/ to two files. ------------------------------------------------------------------------ r4896 | marko | 2009-04-23 10:37:40 +0300 (Thu, 23 Apr 2009) | 4 lines branches/zip: row_scan_and_check_index(): Improve the diagnostics, by reporting errors from row_search_for_mysql() in the error log. The errors will still be ignored by CHECK TABLE. This is somewhat related to Issue #211. ------------------------------------------------------------------------ r4897 | marko | 2009-04-23 10:40:34 +0300 (Thu, 23 Apr 2009) | 2 lines branches/zip: row_scan_and_check_index(): Check row_merge_is_index_usable() earlier, to make the logic clearer. ------------------------------------------------------------------------ r4898 | marko | 2009-04-23 15:15:07 +0300 (Thu, 23 Apr 2009) | 4 lines branches/zip: Correct a misleading comment. PAGE_MAX_TRX_ID will be updated in ibuf_insert_low() and updated from the insert buffer tree page to the secondary index tree page during the insert buffer merge. ------------------------------------------------------------------------ r4915 | marko | 2009-04-27 13:40:20 +0300 (Mon, 27 Apr 2009) | 2 lines branches/zip: row_scan_and_check_index(): Add some comments on prebuilt->index_usable, as suggested by Michael. ------------------------------------------------------------------------ r4921 | marko | 2009-04-29 11:51:25 +0300 (Wed, 29 Apr 2009) | 2 lines branches/zip: btr_cur_optimistic_insert(): Remove a redundant condition. The insert buffer tree is a clustered index. ------------------------------------------------------------------------ r4922 | marko | 2009-04-29 23:23:27 +0300 (Wed, 29 Apr 2009) | 22 lines branches/zip: Distinguish temporary tables in MLOG_FILE_CREATE. This addresses Mantis Issue #23 in InnoDB Hot Backup and some of MySQL Bug #41609. In MLOG_FILE_CREATE, we need to distinguish temporary tables, so that InnoDB Hot Backup can work correctly. It turns out that we can do this easily, by using a bit of the previously unused parameter for page number. (The page number parameter of MLOG_FILE_CREATE has been written as 0 ever since MySQL 4.1, which introduced MLOG_FILE_CREATE.) MLOG_FILE_FLAG_TEMP: A flag for indicating a temporary table in the page number parameter of MLOG_FILE_ operations. fil_op_write_log(): Add the parameter log_flags. fil_op_log_parse_or_replay(): Add the parameter log_flags. Do not replay MLOG_FILE_CREATE when MLOG_FILE_FLAG_TEMP is set in log_flags. This only affects ibbackup --apply-log. InnoDB itself never replays file operations. rb://117 approved by Heikki Tuuri ------------------------------------------------------------------------ r4977 | marko | 2009-05-13 15:49:38 +0300 (Wed, 13 May 2009) | 12 lines branches/zip: Merge revisions 4746:4976 from branches/5.1: ------------------------------------------------------------------------ r4976 | marko | 2009-05-13 15:44:54 +0300 (Wed, 13 May 2009) | 6 lines branches/5.1: Display DB_ROLL_PTR in the COLUMNS section of the innodb_table_monitor output. It was accidentally omitted due to an off-by-one loop condition. (Bug #44320) rb://116 approved by Heikki Tuuri ------------------------------------------------------------------------ ------------------------------------------------------------------------ r4978 | vasil | 2009-05-13 16:21:55 +0300 (Wed, 13 May 2009) | 4 lines branches/zip: Add ChangeLog entry for r4977. ------------------------------------------------------------------------ r4995 | marko | 2009-05-14 15:31:43 +0300 (Thu, 14 May 2009) | 24 lines branches/zip: Merge revisions 4976:4994 from branches/5.1: ------------------------------------------------------------------------ r4994 | marko | 2009-05-14 15:04:55 +0300 (Thu, 14 May 2009) | 18 lines branches/5.1: Prevent a race condition in innobase_commit() by ensuring that innodb_commit_concurrency>0 remains constant at run time. (Bug #42101) srv_commit_concurrency: Make this a static variable in ha_innodb.cc. innobase_commit_concurrency_validate(): Check that innodb_commit_concurrency is not changed from or to 0 at run time. This is needed, because innobase_commit() assumes that innodb_commit_concurrency>0 remains constant. Without this limitation, the checks for innodb_commit_concurrency>0 in innobase_commit() should be removed and that function would have to acquire and release commit_cond_m at least twice per invocation. Normally, innodb_commit_concurrency=0, and introducing the mutex operations would mean significant overhead. innodb_bug42101.test, innodb_bug42101-nonzero.test: Test cases. rb://123 approved by Heikki Tuuri ------------------------------------------------------------------------ ------------------------------------------------------------------------ r5000 | vasil | 2009-05-14 20:13:41 +0300 (Thu, 14 May 2009) | 4 lines branches/zip: Add ChangeLog entry for r4994. ------------------------------------------------------------------------ r5026 | marko | 2009-05-18 16:29:51 +0300 (Mon, 18 May 2009) | 1 line branches/zip: buf_validate(): Add missing out: comment. ------------------------------------------------------------------------ r5027 | marko | 2009-05-18 16:36:10 +0300 (Mon, 18 May 2009) | 1 line branches/zip: Add some missing out: comments to buf0buf.h, buf0buf.c. ------------------------------------------------------------------------ r5028 | marko | 2009-05-18 16:40:07 +0300 (Mon, 18 May 2009) | 11 lines branches/zip: When executing an optimistic update by delete-and-insert, correctly estimate the free space on the compressed page by page_zip_available(..., create=TRUE). This was reported as Issue #231. btr_cur_update_alloc_zip(): Add the parameter ibool create and pass it to page_zip_available(). The parameter was previously passed as 0. btr_cur_optimistic_update(): Pass create=TRUE to btr_cur_update_alloc_zip(). rb://120 approved by Heikki Tuuri ------------------------------------------------------------------------ r5030 | marko | 2009-05-19 10:04:04 +0300 (Tue, 19 May 2009) | 2 lines branches/zip: os_thread_get_curr_id(), os_thread_get_curr(): Add missing out: comments. ------------------------------------------------------------------------ r5031 | marko | 2009-05-19 10:30:02 +0300 (Tue, 19 May 2009) | 1 line branches/zip: Add missing out: comments to nullary functions. ------------------------------------------------------------------------ r5033 | marko | 2009-05-19 11:00:51 +0300 (Tue, 19 May 2009) | 1 line branches/zip: Remove bogus out: comments of functions returning void. ------------------------------------------------------------------------ r5034 | marko | 2009-05-19 12:41:32 +0300 (Tue, 19 May 2009) | 1 line branches/zip: row_update_prebuilt_trx(): Correct bogus comment. ------------------------------------------------------------------------ r5035 | marko | 2009-05-19 13:04:58 +0300 (Tue, 19 May 2009) | 3 lines branches/zip: ut0auxconf_have_solaris_atomics.c: Get the function declarations from <atomic.h>. Call the functions with proper arguments. ------------------------------------------------------------------------ r5036 | marko | 2009-05-19 13:05:50 +0300 (Tue, 19 May 2009) | 1 line branches/zip: Add proper comments to some file page accessors. ------------------------------------------------------------------------ r5037 | marko | 2009-05-19 13:08:16 +0300 (Tue, 19 May 2009) | 1 line branches/zip: Fix a typo that was introduced in r5036. ------------------------------------------------------------------------ r5038 | marko | 2009-05-19 22:59:07 +0300 (Tue, 19 May 2009) | 30 lines branches/zip: Write PAGE_MAX_TRX_ID to the redo log. Otherwise, transactions that are started before the rollback of incomplete transactions has finished may have an inconsistent view of the secondary indexes. dict_index_is_sec_or_ibuf(): Auxiliary function for controlling updates and checks of PAGE_MAX_TRX_ID: check whether an index is a secondary index or the insert buffer tree. page_set_max_trx_id(), page_update_max_trx_id(), lock_rec_insert_check_and_lock(), lock_sec_rec_modify_check_and_lock(), btr_cur_ins_lock_and_undo(), btr_cur_upd_lock_and_undo(): Add the parameter mtr. page_set_max_trx_id(): Allow mtr to be NULL. When mtr==NULL, do not attempt to write to the redo log. This only occurs when creating a page or reorganizing a compressed page. In these cases, the PAGE_MAX_TRX_ID will be set correctly during the application of redo log records, even though there is no explicit log record about it. btr_discard_only_page_on_level(): Preserve PAGE_MAX_TRX_ID. This function should be unreachable, though. btr_cur_pessimistic_update(): Update PAGE_MAX_TRX_ID. Add some assertions for checking that PAGE_MAX_TRX_ID is set on all secondary index leaf pages. rb://115 tested by Michael, fixes Issue #211 ------------------------------------------------------------------------ r5039 | marko | 2009-05-19 23:13:12 +0300 (Tue, 19 May 2009) | 1 line branches/zip: ib_wqueue_wait(): Add decorative comment. ------------------------------------------------------------------------ r5041 | marko | 2009-05-20 08:42:12 +0300 (Wed, 20 May 2009) | 1 line branches/zip: Add missing function comments. ------------------------------------------------------------------------ r5042 | marko | 2009-05-20 08:46:01 +0300 (Wed, 20 May 2009) | 1 line branches/zip: sync0rw.ic: Remove an extra ; that was added in r5041. ------------------------------------------------------------------------ r5044 | marko | 2009-05-20 11:11:58 +0300 (Wed, 20 May 2009) | 2 lines branches/zip: mlog_parse_index(): Correct a parameter comment and add a const qualifier that was missing. ------------------------------------------------------------------------ r5045 | marko | 2009-05-20 11:37:08 +0300 (Wed, 20 May 2009) | 1 line branches/zip: fil0fil.c: Correct some comments. ------------------------------------------------------------------------ r5046 | marko | 2009-05-20 12:19:40 +0300 (Wed, 20 May 2009) | 1 line branches/zip: Fix some function comments. ------------------------------------------------------------------------ r5047 | marko | 2009-05-20 12:26:49 +0300 (Wed, 20 May 2009) | 1 line branches/zip: ut_snprintf(): Fix the function comments. ------------------------------------------------------------------------ r5048 | marko | 2009-05-20 12:28:44 +0300 (Wed, 20 May 2009) | 3 lines branches/zip: inno_bcmp(): Remove this memcmp replacement. srv0start.c does not (any longer) call memcmp. srv_parse_megabytes(): Add a function comment. ------------------------------------------------------------------------ r5052 | marko | 2009-05-20 12:32:37 +0300 (Wed, 20 May 2009) | 1 line branches/zip: ib_vector_is_empty(): Fix the function comment. ------------------------------------------------------------------------ r5054 | marko | 2009-05-20 12:35:33 +0300 (Wed, 20 May 2009) | 1 line branches/zip: page_cur_lcg_prng(): Add missing parameter list. ------------------------------------------------------------------------ r5057 | marko | 2009-05-20 12:45:17 +0300 (Wed, 20 May 2009) | 1 line branches/zip: Remove bogus in: comments from struct members. ------------------------------------------------------------------------ r5058 | marko | 2009-05-20 13:06:03 +0300 (Wed, 20 May 2009) | 1 line branches/zip: Clean up some function comments. ------------------------------------------------------------------------ r5060 | marko | 2009-05-20 14:06:59 +0300 (Wed, 20 May 2009) | 1 line branches/zip: Clean up some comments. ------------------------------------------------------------------------ r5061 | marko | 2009-05-20 14:07:49 +0300 (Wed, 20 May 2009) | 2 lines branches/zip: innodb_export_status(): Remove the return(0), now that the function was declared void in r5060. ------------------------------------------------------------------------ r5062 | marko | 2009-05-20 14:45:03 +0300 (Wed, 20 May 2009) | 1 line branches/zip: ha_innodb.cc: Clean up some comments. ------------------------------------------------------------------------ r5063 | marko | 2009-05-20 16:10:17 +0300 (Wed, 20 May 2009) | 1 line branches/zip: ut_dulint_sort(): Write proper comments. ------------------------------------------------------------------------ r5064 | marko | 2009-05-20 16:17:26 +0300 (Wed, 20 May 2009) | 2 lines branches/zip: innobase_end(), innobase_flush_logs(): Document the function parameters. ------------------------------------------------------------------------ r5065 | marko | 2009-05-20 23:17:43 +0300 (Wed, 20 May 2009) | 1 line branches/zip: ha_innodb.cc: Add some missing function comments. ------------------------------------------------------------------------ r5066 | marko | 2009-05-21 00:51:23 +0300 (Thu, 21 May 2009) | 2 lines branches/zip: Fix some function comments. ------------------------------------------------------------------------ r5070 | vasil | 2009-05-21 08:27:00 +0300 (Thu, 21 May 2009) | 4 lines branches/zip: Whitespace fixup. ------------------------------------------------------------------------
1722 lines
44 KiB
C
1722 lines
44 KiB
C
/*****************************************************************************
|
|
|
|
Copyright (c) 1994, 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
|
|
|
|
*****************************************************************************/
|
|
|
|
/************************************************************************
|
|
Record manager
|
|
|
|
Created 5/30/1994 Heikki Tuuri
|
|
*************************************************************************/
|
|
|
|
#include "rem0rec.h"
|
|
|
|
#ifdef UNIV_NONINL
|
|
#include "rem0rec.ic"
|
|
#endif
|
|
|
|
#include "mtr0mtr.h"
|
|
#include "mtr0log.h"
|
|
|
|
/* PHYSICAL RECORD (OLD STYLE)
|
|
===========================
|
|
|
|
The physical record, which is the data type of all the records
|
|
found in index pages of the database, has the following format
|
|
(lower addresses and more significant bits inside a byte are below
|
|
represented on a higher text line):
|
|
|
|
| offset of the end of the last field of data, the most significant
|
|
bit is set to 1 if and only if the field is SQL-null,
|
|
if the offset is 2-byte, then the second most significant
|
|
bit is set to 1 if the field is stored on another page:
|
|
mostly this will occur in the case of big BLOB fields |
|
|
...
|
|
| offset of the end of the first field of data + the SQL-null bit |
|
|
| 4 bits used to delete mark a record, and mark a predefined
|
|
minimum record in alphabetical order |
|
|
| 4 bits giving the number of records owned by this record
|
|
(this term is explained in page0page.h) |
|
|
| 13 bits giving the order number of this record in the
|
|
heap of the index page |
|
|
| 10 bits giving the number of fields in this record |
|
|
| 1 bit which is set to 1 if the offsets above are given in
|
|
one byte format, 0 if in two byte format |
|
|
| two bytes giving an absolute pointer to the next record in the page |
|
|
ORIGIN of the record
|
|
| first field of data |
|
|
...
|
|
| last field of data |
|
|
|
|
The origin of the record is the start address of the first field
|
|
of data. The offsets are given relative to the origin.
|
|
The offsets of the data fields are stored in an inverted
|
|
order because then the offset of the first fields are near the
|
|
origin, giving maybe a better processor cache hit rate in searches.
|
|
|
|
The offsets of the data fields are given as one-byte
|
|
(if there are less than 127 bytes of data in the record)
|
|
or two-byte unsigned integers. The most significant bit
|
|
is not part of the offset, instead it indicates the SQL-null
|
|
if the bit is set to 1. */
|
|
|
|
/* PHYSICAL RECORD (NEW STYLE)
|
|
===========================
|
|
|
|
The physical record, which is the data type of all the records
|
|
found in index pages of the database, has the following format
|
|
(lower addresses and more significant bits inside a byte are below
|
|
represented on a higher text line):
|
|
|
|
| length of the last non-null variable-length field of data:
|
|
if the maximum length is 255, one byte; otherwise,
|
|
0xxxxxxx (one byte, length=0..127), or 1exxxxxxxxxxxxxx (two bytes,
|
|
length=128..16383, extern storage flag) |
|
|
...
|
|
| length of first variable-length field of data |
|
|
| SQL-null flags (1 bit per nullable field), padded to full bytes |
|
|
| 4 bits used to delete mark a record, and mark a predefined
|
|
minimum record in alphabetical order |
|
|
| 4 bits giving the number of records owned by this record
|
|
(this term is explained in page0page.h) |
|
|
| 13 bits giving the order number of this record in the
|
|
heap of the index page |
|
|
| 3 bits record type: 000=conventional, 001=node pointer (inside B-tree),
|
|
010=infimum, 011=supremum, 1xx=reserved |
|
|
| two bytes giving a relative pointer to the next record in the page |
|
|
ORIGIN of the record
|
|
| first field of data |
|
|
...
|
|
| last field of data |
|
|
|
|
The origin of the record is the start address of the first field
|
|
of data. The offsets are given relative to the origin.
|
|
The offsets of the data fields are stored in an inverted
|
|
order because then the offset of the first fields are near the
|
|
origin, giving maybe a better processor cache hit rate in searches.
|
|
|
|
The offsets of the data fields are given as one-byte
|
|
(if there are less than 127 bytes of data in the record)
|
|
or two-byte unsigned integers. The most significant bit
|
|
is not part of the offset, instead it indicates the SQL-null
|
|
if the bit is set to 1. */
|
|
|
|
/* CANONICAL COORDINATES. A record can be seen as a single
|
|
string of 'characters' in the following way: catenate the bytes
|
|
in each field, in the order of fields. An SQL-null field
|
|
is taken to be an empty sequence of bytes. Then after
|
|
the position of each field insert in the string
|
|
the 'character' <FIELD-END>, except that after an SQL-null field
|
|
insert <NULL-FIELD-END>. Now the ordinal position of each
|
|
byte in this canonical string is its canonical coordinate.
|
|
So, for the record ("AA", SQL-NULL, "BB", ""), the canonical
|
|
string is "AA<FIELD_END><NULL-FIELD-END>BB<FIELD-END><FIELD-END>".
|
|
We identify prefixes (= initial segments) of a record
|
|
with prefixes of the canonical string. The canonical
|
|
length of the prefix is the length of the corresponding
|
|
prefix of the canonical string. The canonical length of
|
|
a record is the length of its canonical string.
|
|
|
|
For example, the maximal common prefix of records
|
|
("AA", SQL-NULL, "BB", "C") and ("AA", SQL-NULL, "B", "C")
|
|
is "AA<FIELD-END><NULL-FIELD-END>B", and its canonical
|
|
length is 5.
|
|
|
|
A complete-field prefix of a record is a prefix which ends at the
|
|
end of some field (containing also <FIELD-END>).
|
|
A record is a complete-field prefix of another record, if
|
|
the corresponding canonical strings have the same property. */
|
|
|
|
/* this is used to fool compiler in rec_validate */
|
|
UNIV_INTERN ulint rec_dummy;
|
|
|
|
/*******************************************************************
|
|
Validates the consistency of an old-style physical record. */
|
|
static
|
|
ibool
|
|
rec_validate_old(
|
|
/*=============*/
|
|
/* out: TRUE if ok */
|
|
const rec_t* rec); /* in: physical record */
|
|
|
|
/**********************************************************
|
|
Determine how many of the first n columns in a compact
|
|
physical record are stored externally. */
|
|
UNIV_INTERN
|
|
ulint
|
|
rec_get_n_extern_new(
|
|
/*=================*/
|
|
/* out: number of externally stored columns */
|
|
const rec_t* rec, /* in: compact physical record */
|
|
dict_index_t* index, /* in: record descriptor */
|
|
ulint n) /* in: number of columns to scan */
|
|
{
|
|
const byte* nulls;
|
|
const byte* lens;
|
|
dict_field_t* field;
|
|
ulint null_mask;
|
|
ulint n_extern;
|
|
ulint i;
|
|
|
|
ut_ad(dict_table_is_comp(index->table));
|
|
ut_ad(rec_get_status(rec) == REC_STATUS_ORDINARY);
|
|
ut_ad(n == ULINT_UNDEFINED || n <= dict_index_get_n_fields(index));
|
|
|
|
if (n == ULINT_UNDEFINED) {
|
|
n = dict_index_get_n_fields(index);
|
|
}
|
|
|
|
nulls = rec - (REC_N_NEW_EXTRA_BYTES + 1);
|
|
lens = nulls - UT_BITS_IN_BYTES(index->n_nullable);
|
|
null_mask = 1;
|
|
n_extern = 0;
|
|
i = 0;
|
|
|
|
/* read the lengths of fields 0..n */
|
|
do {
|
|
ulint len;
|
|
|
|
field = dict_index_get_nth_field(index, i);
|
|
if (!(dict_field_get_col(field)->prtype & DATA_NOT_NULL)) {
|
|
/* nullable field => read the null flag */
|
|
|
|
if (UNIV_UNLIKELY(!(byte) null_mask)) {
|
|
nulls--;
|
|
null_mask = 1;
|
|
}
|
|
|
|
if (*nulls & null_mask) {
|
|
null_mask <<= 1;
|
|
/* No length is stored for NULL fields. */
|
|
continue;
|
|
}
|
|
null_mask <<= 1;
|
|
}
|
|
|
|
if (UNIV_UNLIKELY(!field->fixed_len)) {
|
|
/* Variable-length field: read the length */
|
|
const dict_col_t* col
|
|
= dict_field_get_col(field);
|
|
len = *lens--;
|
|
if (UNIV_UNLIKELY(col->len > 255)
|
|
|| UNIV_UNLIKELY(col->mtype == DATA_BLOB)) {
|
|
if (len & 0x80) {
|
|
/* 1exxxxxxx xxxxxxxx */
|
|
if (len & 0x40) {
|
|
n_extern++;
|
|
}
|
|
lens--;
|
|
}
|
|
}
|
|
}
|
|
} while (++i < n);
|
|
|
|
return(n_extern);
|
|
}
|
|
|
|
/**********************************************************
|
|
Determine the offset to each field in a leaf-page record
|
|
in ROW_FORMAT=COMPACT. This is a special case of
|
|
rec_init_offsets() and rec_get_offsets_func(). */
|
|
UNIV_INTERN
|
|
void
|
|
rec_init_offsets_comp_ordinary(
|
|
/*===========================*/
|
|
const rec_t* rec, /* in: physical record in
|
|
ROW_FORMAT=COMPACT */
|
|
ulint extra, /* in: number of bytes to reserve
|
|
between the record header and
|
|
the data payload
|
|
(usually REC_N_NEW_EXTRA_BYTES) */
|
|
const dict_index_t* index, /* in: record descriptor */
|
|
ulint* offsets)/* in/out: array of offsets;
|
|
in: n=rec_offs_n_fields(offsets) */
|
|
{
|
|
ulint i = 0;
|
|
ulint offs = 0;
|
|
ulint any_ext = 0;
|
|
const byte* nulls = rec - (extra + 1);
|
|
const byte* lens = nulls
|
|
- UT_BITS_IN_BYTES(index->n_nullable);
|
|
dict_field_t* field;
|
|
ulint null_mask = 1;
|
|
|
|
#ifdef UNIV_DEBUG
|
|
/* We cannot invoke rec_offs_make_valid() here, because it can hold
|
|
that extra != REC_N_NEW_EXTRA_BYTES. Similarly, rec_offs_validate()
|
|
will fail in that case, because it invokes rec_get_status(). */
|
|
offsets[2] = (ulint) rec;
|
|
offsets[3] = (ulint) index;
|
|
#endif /* UNIV_DEBUG */
|
|
|
|
/* read the lengths of fields 0..n */
|
|
do {
|
|
ulint len;
|
|
|
|
field = dict_index_get_nth_field(index, i);
|
|
if (!(dict_field_get_col(field)->prtype
|
|
& DATA_NOT_NULL)) {
|
|
/* nullable field => read the null flag */
|
|
|
|
if (UNIV_UNLIKELY(!(byte) null_mask)) {
|
|
nulls--;
|
|
null_mask = 1;
|
|
}
|
|
|
|
if (*nulls & null_mask) {
|
|
null_mask <<= 1;
|
|
/* No length is stored for NULL fields.
|
|
We do not advance offs, and we set
|
|
the length to zero and enable the
|
|
SQL NULL flag in offsets[]. */
|
|
len = offs | REC_OFFS_SQL_NULL;
|
|
goto resolved;
|
|
}
|
|
null_mask <<= 1;
|
|
}
|
|
|
|
if (UNIV_UNLIKELY(!field->fixed_len)) {
|
|
/* Variable-length field: read the length */
|
|
const dict_col_t* col
|
|
= dict_field_get_col(field);
|
|
len = *lens--;
|
|
if (UNIV_UNLIKELY(col->len > 255)
|
|
|| UNIV_UNLIKELY(col->mtype
|
|
== DATA_BLOB)) {
|
|
if (len & 0x80) {
|
|
/* 1exxxxxxx xxxxxxxx */
|
|
len <<= 8;
|
|
len |= *lens--;
|
|
|
|
offs += len & 0x3fff;
|
|
if (UNIV_UNLIKELY(len
|
|
& 0x4000)) {
|
|
ut_ad(dict_index_is_clust
|
|
(index));
|
|
any_ext = REC_OFFS_EXTERNAL;
|
|
len = offs
|
|
| REC_OFFS_EXTERNAL;
|
|
} else {
|
|
len = offs;
|
|
}
|
|
|
|
goto resolved;
|
|
}
|
|
}
|
|
|
|
len = offs += len;
|
|
} else {
|
|
len = offs += field->fixed_len;
|
|
}
|
|
resolved:
|
|
rec_offs_base(offsets)[i + 1] = len;
|
|
} while (++i < rec_offs_n_fields(offsets));
|
|
|
|
*rec_offs_base(offsets)
|
|
= (rec - (lens + 1)) | REC_OFFS_COMPACT | any_ext;
|
|
}
|
|
|
|
/**********************************************************
|
|
The following function determines the offsets to each field in the
|
|
record. The offsets are written to a previously allocated array of
|
|
ulint, where rec_offs_n_fields(offsets) has been initialized to the
|
|
number of fields in the record. The rest of the array will be
|
|
initialized by this function. rec_offs_base(offsets)[0] will be set
|
|
to the extra size (if REC_OFFS_COMPACT is set, the record is in the
|
|
new format; if REC_OFFS_EXTERNAL is set, the record contains externally
|
|
stored columns), and rec_offs_base(offsets)[1..n_fields] will be set to
|
|
offsets past the end of fields 0..n_fields, or to the beginning of
|
|
fields 1..n_fields+1. When the high-order bit of the offset at [i+1]
|
|
is set (REC_OFFS_SQL_NULL), the field i is NULL. When the second
|
|
high-order bit of the offset at [i+1] is set (REC_OFFS_EXTERNAL), the
|
|
field i is being stored externally. */
|
|
static
|
|
void
|
|
rec_init_offsets(
|
|
/*=============*/
|
|
const rec_t* rec, /* in: physical record */
|
|
const dict_index_t* index, /* in: record descriptor */
|
|
ulint* offsets)/* in/out: array of offsets;
|
|
in: n=rec_offs_n_fields(offsets) */
|
|
{
|
|
ulint i = 0;
|
|
ulint offs;
|
|
|
|
rec_offs_make_valid(rec, index, offsets);
|
|
|
|
if (dict_table_is_comp(index->table)) {
|
|
const byte* nulls;
|
|
const byte* lens;
|
|
dict_field_t* field;
|
|
ulint null_mask;
|
|
ulint status = rec_get_status(rec);
|
|
ulint n_node_ptr_field = ULINT_UNDEFINED;
|
|
|
|
switch (UNIV_EXPECT(status, REC_STATUS_ORDINARY)) {
|
|
case REC_STATUS_INFIMUM:
|
|
case REC_STATUS_SUPREMUM:
|
|
/* the field is 8 bytes long */
|
|
rec_offs_base(offsets)[0]
|
|
= REC_N_NEW_EXTRA_BYTES | REC_OFFS_COMPACT;
|
|
rec_offs_base(offsets)[1] = 8;
|
|
return;
|
|
case REC_STATUS_NODE_PTR:
|
|
n_node_ptr_field
|
|
= dict_index_get_n_unique_in_tree(index);
|
|
break;
|
|
case REC_STATUS_ORDINARY:
|
|
rec_init_offsets_comp_ordinary(rec,
|
|
REC_N_NEW_EXTRA_BYTES,
|
|
index, offsets);
|
|
return;
|
|
}
|
|
|
|
nulls = rec - (REC_N_NEW_EXTRA_BYTES + 1);
|
|
lens = nulls - UT_BITS_IN_BYTES(index->n_nullable);
|
|
offs = 0;
|
|
null_mask = 1;
|
|
|
|
/* read the lengths of fields 0..n */
|
|
do {
|
|
ulint len;
|
|
if (UNIV_UNLIKELY(i == n_node_ptr_field)) {
|
|
len = offs += 4;
|
|
goto resolved;
|
|
}
|
|
|
|
field = dict_index_get_nth_field(index, i);
|
|
if (!(dict_field_get_col(field)->prtype
|
|
& DATA_NOT_NULL)) {
|
|
/* nullable field => read the null flag */
|
|
|
|
if (UNIV_UNLIKELY(!(byte) null_mask)) {
|
|
nulls--;
|
|
null_mask = 1;
|
|
}
|
|
|
|
if (*nulls & null_mask) {
|
|
null_mask <<= 1;
|
|
/* No length is stored for NULL fields.
|
|
We do not advance offs, and we set
|
|
the length to zero and enable the
|
|
SQL NULL flag in offsets[]. */
|
|
len = offs | REC_OFFS_SQL_NULL;
|
|
goto resolved;
|
|
}
|
|
null_mask <<= 1;
|
|
}
|
|
|
|
if (UNIV_UNLIKELY(!field->fixed_len)) {
|
|
/* Variable-length field: read the length */
|
|
const dict_col_t* col
|
|
= dict_field_get_col(field);
|
|
len = *lens--;
|
|
if (UNIV_UNLIKELY(col->len > 255)
|
|
|| UNIV_UNLIKELY(col->mtype
|
|
== DATA_BLOB)) {
|
|
if (len & 0x80) {
|
|
/* 1exxxxxxx xxxxxxxx */
|
|
|
|
len <<= 8;
|
|
len |= *lens--;
|
|
|
|
/* B-tree node pointers
|
|
must not contain externally
|
|
stored columns. Thus
|
|
the "e" flag must be 0. */
|
|
ut_a(!(len & 0x4000));
|
|
offs += len & 0x3fff;
|
|
len = offs;
|
|
|
|
goto resolved;
|
|
}
|
|
}
|
|
|
|
len = offs += len;
|
|
} else {
|
|
len = offs += field->fixed_len;
|
|
}
|
|
resolved:
|
|
rec_offs_base(offsets)[i + 1] = len;
|
|
} while (++i < rec_offs_n_fields(offsets));
|
|
|
|
*rec_offs_base(offsets)
|
|
= (rec - (lens + 1)) | REC_OFFS_COMPACT;
|
|
} else {
|
|
/* Old-style record: determine extra size and end offsets */
|
|
offs = REC_N_OLD_EXTRA_BYTES;
|
|
if (rec_get_1byte_offs_flag(rec)) {
|
|
offs += rec_offs_n_fields(offsets);
|
|
*rec_offs_base(offsets) = offs;
|
|
/* Determine offsets to fields */
|
|
do {
|
|
offs = rec_1_get_field_end_info(rec, i);
|
|
if (offs & REC_1BYTE_SQL_NULL_MASK) {
|
|
offs &= ~REC_1BYTE_SQL_NULL_MASK;
|
|
offs |= REC_OFFS_SQL_NULL;
|
|
}
|
|
rec_offs_base(offsets)[1 + i] = offs;
|
|
} while (++i < rec_offs_n_fields(offsets));
|
|
} else {
|
|
offs += 2 * rec_offs_n_fields(offsets);
|
|
*rec_offs_base(offsets) = offs;
|
|
/* Determine offsets to fields */
|
|
do {
|
|
offs = rec_2_get_field_end_info(rec, i);
|
|
if (offs & REC_2BYTE_SQL_NULL_MASK) {
|
|
offs &= ~REC_2BYTE_SQL_NULL_MASK;
|
|
offs |= REC_OFFS_SQL_NULL;
|
|
}
|
|
if (offs & REC_2BYTE_EXTERN_MASK) {
|
|
offs &= ~REC_2BYTE_EXTERN_MASK;
|
|
offs |= REC_OFFS_EXTERNAL;
|
|
*rec_offs_base(offsets) |= REC_OFFS_EXTERNAL;
|
|
}
|
|
rec_offs_base(offsets)[1 + i] = offs;
|
|
} while (++i < rec_offs_n_fields(offsets));
|
|
}
|
|
}
|
|
}
|
|
|
|
/**********************************************************
|
|
The following function determines the offsets to each field
|
|
in the record. It can reuse a previously returned array. */
|
|
UNIV_INTERN
|
|
ulint*
|
|
rec_get_offsets_func(
|
|
/*=================*/
|
|
/* out: the new offsets */
|
|
const rec_t* rec, /* in: physical record */
|
|
const dict_index_t* index, /* in: record descriptor */
|
|
ulint* offsets,/* in/out: array consisting of
|
|
offsets[0] allocated elements,
|
|
or an array from rec_get_offsets(),
|
|
or NULL */
|
|
ulint n_fields,/* in: maximum number of
|
|
initialized fields
|
|
(ULINT_UNDEFINED if all fields) */
|
|
mem_heap_t** heap, /* in/out: memory heap */
|
|
const char* file, /* in: file name where called */
|
|
ulint line) /* in: line number where called */
|
|
{
|
|
ulint n;
|
|
ulint size;
|
|
|
|
ut_ad(rec);
|
|
ut_ad(index);
|
|
ut_ad(heap);
|
|
|
|
if (dict_table_is_comp(index->table)) {
|
|
switch (UNIV_EXPECT(rec_get_status(rec),
|
|
REC_STATUS_ORDINARY)) {
|
|
case REC_STATUS_ORDINARY:
|
|
n = dict_index_get_n_fields(index);
|
|
break;
|
|
case REC_STATUS_NODE_PTR:
|
|
n = dict_index_get_n_unique_in_tree(index) + 1;
|
|
break;
|
|
case REC_STATUS_INFIMUM:
|
|
case REC_STATUS_SUPREMUM:
|
|
/* infimum or supremum record */
|
|
n = 1;
|
|
break;
|
|
default:
|
|
ut_error;
|
|
return(NULL);
|
|
}
|
|
} else {
|
|
n = rec_get_n_fields_old(rec);
|
|
}
|
|
|
|
if (UNIV_UNLIKELY(n_fields < n)) {
|
|
n = n_fields;
|
|
}
|
|
|
|
size = n + (1 + REC_OFFS_HEADER_SIZE);
|
|
|
|
if (UNIV_UNLIKELY(!offsets)
|
|
|| UNIV_UNLIKELY(rec_offs_get_n_alloc(offsets) < size)) {
|
|
if (UNIV_UNLIKELY(!*heap)) {
|
|
*heap = mem_heap_create_func(size * sizeof(ulint),
|
|
MEM_HEAP_DYNAMIC,
|
|
file, line);
|
|
}
|
|
offsets = mem_heap_alloc(*heap, size * sizeof(ulint));
|
|
rec_offs_set_n_alloc(offsets, size);
|
|
}
|
|
|
|
rec_offs_set_n_fields(offsets, n);
|
|
rec_init_offsets(rec, index, offsets);
|
|
return(offsets);
|
|
}
|
|
|
|
/**********************************************************
|
|
The following function determines the offsets to each field
|
|
in the record. It can reuse a previously allocated array. */
|
|
UNIV_INTERN
|
|
void
|
|
rec_get_offsets_reverse(
|
|
/*====================*/
|
|
const byte* extra, /* in: the extra bytes of a
|
|
compact record in reverse order,
|
|
excluding the fixed-size
|
|
REC_N_NEW_EXTRA_BYTES */
|
|
const dict_index_t* index, /* in: record descriptor */
|
|
ulint node_ptr,/* in: nonzero=node pointer,
|
|
0=leaf node */
|
|
ulint* offsets)/* in/out: array consisting of
|
|
offsets[0] allocated elements */
|
|
{
|
|
ulint n;
|
|
ulint i;
|
|
ulint offs;
|
|
ulint any_ext;
|
|
const byte* nulls;
|
|
const byte* lens;
|
|
dict_field_t* field;
|
|
ulint null_mask;
|
|
ulint n_node_ptr_field;
|
|
|
|
ut_ad(extra);
|
|
ut_ad(index);
|
|
ut_ad(offsets);
|
|
ut_ad(dict_table_is_comp(index->table));
|
|
|
|
if (UNIV_UNLIKELY(node_ptr)) {
|
|
n_node_ptr_field = dict_index_get_n_unique_in_tree(index);
|
|
n = n_node_ptr_field + 1;
|
|
} else {
|
|
n_node_ptr_field = ULINT_UNDEFINED;
|
|
n = dict_index_get_n_fields(index);
|
|
}
|
|
|
|
ut_a(rec_offs_get_n_alloc(offsets) >= n + (1 + REC_OFFS_HEADER_SIZE));
|
|
rec_offs_set_n_fields(offsets, n);
|
|
|
|
nulls = extra;
|
|
lens = nulls + UT_BITS_IN_BYTES(index->n_nullable);
|
|
i = offs = 0;
|
|
null_mask = 1;
|
|
any_ext = 0;
|
|
|
|
/* read the lengths of fields 0..n */
|
|
do {
|
|
ulint len;
|
|
if (UNIV_UNLIKELY(i == n_node_ptr_field)) {
|
|
len = offs += 4;
|
|
goto resolved;
|
|
}
|
|
|
|
field = dict_index_get_nth_field(index, i);
|
|
if (!(dict_field_get_col(field)->prtype & DATA_NOT_NULL)) {
|
|
/* nullable field => read the null flag */
|
|
|
|
if (UNIV_UNLIKELY(!(byte) null_mask)) {
|
|
nulls++;
|
|
null_mask = 1;
|
|
}
|
|
|
|
if (*nulls & null_mask) {
|
|
null_mask <<= 1;
|
|
/* No length is stored for NULL fields.
|
|
We do not advance offs, and we set
|
|
the length to zero and enable the
|
|
SQL NULL flag in offsets[]. */
|
|
len = offs | REC_OFFS_SQL_NULL;
|
|
goto resolved;
|
|
}
|
|
null_mask <<= 1;
|
|
}
|
|
|
|
if (UNIV_UNLIKELY(!field->fixed_len)) {
|
|
/* Variable-length field: read the length */
|
|
const dict_col_t* col
|
|
= dict_field_get_col(field);
|
|
len = *lens++;
|
|
if (UNIV_UNLIKELY(col->len > 255)
|
|
|| UNIV_UNLIKELY(col->mtype == DATA_BLOB)) {
|
|
if (len & 0x80) {
|
|
/* 1exxxxxxx xxxxxxxx */
|
|
len <<= 8;
|
|
len |= *lens++;
|
|
|
|
offs += len & 0x3fff;
|
|
if (UNIV_UNLIKELY(len & 0x4000)) {
|
|
any_ext = REC_OFFS_EXTERNAL;
|
|
len = offs | REC_OFFS_EXTERNAL;
|
|
} else {
|
|
len = offs;
|
|
}
|
|
|
|
goto resolved;
|
|
}
|
|
}
|
|
|
|
len = offs += len;
|
|
} else {
|
|
len = offs += field->fixed_len;
|
|
}
|
|
resolved:
|
|
rec_offs_base(offsets)[i + 1] = len;
|
|
} while (++i < rec_offs_n_fields(offsets));
|
|
|
|
ut_ad(lens >= extra);
|
|
*rec_offs_base(offsets) = (lens - extra + REC_N_NEW_EXTRA_BYTES)
|
|
| REC_OFFS_COMPACT | any_ext;
|
|
}
|
|
|
|
/****************************************************************
|
|
The following function is used to get the offset to the nth
|
|
data field in an old-style record. */
|
|
UNIV_INTERN
|
|
ulint
|
|
rec_get_nth_field_offs_old(
|
|
/*=======================*/
|
|
/* out: offset to the field */
|
|
const rec_t* rec, /* in: record */
|
|
ulint n, /* in: index of the field */
|
|
ulint* len) /* out: length of the field;
|
|
UNIV_SQL_NULL if SQL null */
|
|
{
|
|
ulint os;
|
|
ulint next_os;
|
|
|
|
ut_ad(rec && len);
|
|
ut_ad(n < rec_get_n_fields_old(rec));
|
|
|
|
if (UNIV_UNLIKELY(n > REC_MAX_N_FIELDS)) {
|
|
fprintf(stderr, "Error: trying to access field %lu in rec\n",
|
|
(ulong) n);
|
|
ut_error;
|
|
}
|
|
|
|
if (UNIV_UNLIKELY(rec == NULL)) {
|
|
fputs("Error: rec is NULL pointer\n", stderr);
|
|
ut_error;
|
|
}
|
|
|
|
if (rec_get_1byte_offs_flag(rec)) {
|
|
os = rec_1_get_field_start_offs(rec, n);
|
|
|
|
next_os = rec_1_get_field_end_info(rec, n);
|
|
|
|
if (next_os & REC_1BYTE_SQL_NULL_MASK) {
|
|
*len = UNIV_SQL_NULL;
|
|
|
|
return(os);
|
|
}
|
|
|
|
next_os = next_os & ~REC_1BYTE_SQL_NULL_MASK;
|
|
} else {
|
|
os = rec_2_get_field_start_offs(rec, n);
|
|
|
|
next_os = rec_2_get_field_end_info(rec, n);
|
|
|
|
if (next_os & REC_2BYTE_SQL_NULL_MASK) {
|
|
*len = UNIV_SQL_NULL;
|
|
|
|
return(os);
|
|
}
|
|
|
|
next_os = next_os & ~(REC_2BYTE_SQL_NULL_MASK
|
|
| REC_2BYTE_EXTERN_MASK);
|
|
}
|
|
|
|
*len = next_os - os;
|
|
|
|
ut_ad(*len < UNIV_PAGE_SIZE);
|
|
|
|
return(os);
|
|
}
|
|
|
|
/**************************************************************
|
|
Determines the size of a data tuple prefix in ROW_FORMAT=COMPACT. */
|
|
UNIV_INTERN
|
|
ulint
|
|
rec_get_converted_size_comp_prefix(
|
|
/*===============================*/
|
|
/* out: total size */
|
|
const dict_index_t* index, /* in: record descriptor;
|
|
dict_table_is_comp() is
|
|
assumed to hold, even if
|
|
it does not */
|
|
const dfield_t* fields, /* in: array of data fields */
|
|
ulint n_fields,/* in: number of data fields */
|
|
ulint* extra) /* out: extra size */
|
|
{
|
|
ulint extra_size;
|
|
ulint data_size;
|
|
ulint i;
|
|
ut_ad(index);
|
|
ut_ad(fields);
|
|
ut_ad(n_fields > 0);
|
|
ut_ad(n_fields <= dict_index_get_n_fields(index));
|
|
|
|
extra_size = REC_N_NEW_EXTRA_BYTES
|
|
+ UT_BITS_IN_BYTES(index->n_nullable);
|
|
data_size = 0;
|
|
|
|
/* read the lengths of fields 0..n */
|
|
for (i = 0; i < n_fields; i++) {
|
|
const dict_field_t* field;
|
|
ulint len;
|
|
const dict_col_t* col;
|
|
|
|
field = dict_index_get_nth_field(index, i);
|
|
len = dfield_get_len(&fields[i]);
|
|
col = dict_field_get_col(field);
|
|
|
|
ut_ad(dict_col_type_assert_equal(col,
|
|
dfield_get_type(&fields[i])));
|
|
|
|
if (dfield_is_null(&fields[i])) {
|
|
/* No length is stored for NULL fields. */
|
|
ut_ad(!(col->prtype & DATA_NOT_NULL));
|
|
continue;
|
|
}
|
|
|
|
ut_ad(len <= col->len || col->mtype == DATA_BLOB);
|
|
|
|
if (field->fixed_len) {
|
|
ut_ad(len == field->fixed_len);
|
|
/* dict_index_add_col() should guarantee this */
|
|
ut_ad(!field->prefix_len
|
|
|| field->fixed_len == field->prefix_len);
|
|
} else if (dfield_is_ext(&fields[i])) {
|
|
extra_size += 2;
|
|
} else if (len < 128
|
|
|| (col->len < 256 && col->mtype != DATA_BLOB)) {
|
|
extra_size++;
|
|
} else {
|
|
/* For variable-length columns, we look up the
|
|
maximum length from the column itself. If this
|
|
is a prefix index column shorter than 256 bytes,
|
|
this will waste one byte. */
|
|
extra_size += 2;
|
|
}
|
|
data_size += len;
|
|
}
|
|
|
|
if (UNIV_LIKELY_NULL(extra)) {
|
|
*extra = extra_size;
|
|
}
|
|
|
|
return(extra_size + data_size);
|
|
}
|
|
|
|
/**************************************************************
|
|
Determines the size of a data tuple in ROW_FORMAT=COMPACT. */
|
|
UNIV_INTERN
|
|
ulint
|
|
rec_get_converted_size_comp(
|
|
/*========================*/
|
|
/* out: total size */
|
|
const dict_index_t* index, /* in: record descriptor;
|
|
dict_table_is_comp() is
|
|
assumed to hold, even if
|
|
it does not */
|
|
ulint status, /* in: status bits of the record */
|
|
const dfield_t* fields, /* in: array of data fields */
|
|
ulint n_fields,/* in: number of data fields */
|
|
ulint* extra) /* out: extra size */
|
|
{
|
|
ulint size;
|
|
ut_ad(index);
|
|
ut_ad(fields);
|
|
ut_ad(n_fields > 0);
|
|
|
|
switch (UNIV_EXPECT(status, REC_STATUS_ORDINARY)) {
|
|
case REC_STATUS_ORDINARY:
|
|
ut_ad(n_fields == dict_index_get_n_fields(index));
|
|
size = 0;
|
|
break;
|
|
case REC_STATUS_NODE_PTR:
|
|
n_fields--;
|
|
ut_ad(n_fields == dict_index_get_n_unique_in_tree(index));
|
|
ut_ad(dfield_get_len(&fields[n_fields]) == REC_NODE_PTR_SIZE);
|
|
size = REC_NODE_PTR_SIZE; /* child page number */
|
|
break;
|
|
case REC_STATUS_INFIMUM:
|
|
case REC_STATUS_SUPREMUM:
|
|
/* infimum or supremum record, 8 data bytes */
|
|
if (UNIV_LIKELY_NULL(extra)) {
|
|
*extra = REC_N_NEW_EXTRA_BYTES;
|
|
}
|
|
return(REC_N_NEW_EXTRA_BYTES + 8);
|
|
default:
|
|
ut_error;
|
|
return(ULINT_UNDEFINED);
|
|
}
|
|
|
|
return(size + rec_get_converted_size_comp_prefix(index, fields,
|
|
n_fields, extra));
|
|
}
|
|
|
|
/***************************************************************
|
|
Sets the value of the ith field SQL null bit of an old-style record. */
|
|
UNIV_INTERN
|
|
void
|
|
rec_set_nth_field_null_bit(
|
|
/*=======================*/
|
|
rec_t* rec, /* in: record */
|
|
ulint i, /* in: ith field */
|
|
ibool val) /* in: value to set */
|
|
{
|
|
ulint info;
|
|
|
|
if (rec_get_1byte_offs_flag(rec)) {
|
|
|
|
info = rec_1_get_field_end_info(rec, i);
|
|
|
|
if (val) {
|
|
info = info | REC_1BYTE_SQL_NULL_MASK;
|
|
} else {
|
|
info = info & ~REC_1BYTE_SQL_NULL_MASK;
|
|
}
|
|
|
|
rec_1_set_field_end_info(rec, i, info);
|
|
|
|
return;
|
|
}
|
|
|
|
info = rec_2_get_field_end_info(rec, i);
|
|
|
|
if (val) {
|
|
info = info | REC_2BYTE_SQL_NULL_MASK;
|
|
} else {
|
|
info = info & ~REC_2BYTE_SQL_NULL_MASK;
|
|
}
|
|
|
|
rec_2_set_field_end_info(rec, i, info);
|
|
}
|
|
|
|
/***************************************************************
|
|
Sets an old-style record field to SQL null.
|
|
The physical size of the field is not changed. */
|
|
UNIV_INTERN
|
|
void
|
|
rec_set_nth_field_sql_null(
|
|
/*=======================*/
|
|
rec_t* rec, /* in: record */
|
|
ulint n) /* in: index of the field */
|
|
{
|
|
ulint offset;
|
|
|
|
offset = rec_get_field_start_offs(rec, n);
|
|
|
|
data_write_sql_null(rec + offset, rec_get_nth_field_size(rec, n));
|
|
|
|
rec_set_nth_field_null_bit(rec, n, TRUE);
|
|
}
|
|
|
|
/*************************************************************
|
|
Builds an old-style physical record out of a data tuple and
|
|
stores it beginning from the start of the given buffer. */
|
|
static
|
|
rec_t*
|
|
rec_convert_dtuple_to_rec_old(
|
|
/*==========================*/
|
|
/* out: pointer to the origin of
|
|
physical record */
|
|
byte* buf, /* in: start address of the physical record */
|
|
const dtuple_t* dtuple, /* in: data tuple */
|
|
ulint n_ext) /* in: number of externally stored columns */
|
|
{
|
|
const dfield_t* field;
|
|
ulint n_fields;
|
|
ulint data_size;
|
|
rec_t* rec;
|
|
ulint end_offset;
|
|
ulint ored_offset;
|
|
ulint len;
|
|
ulint i;
|
|
|
|
ut_ad(buf && dtuple);
|
|
ut_ad(dtuple_validate(dtuple));
|
|
ut_ad(dtuple_check_typed(dtuple));
|
|
|
|
n_fields = dtuple_get_n_fields(dtuple);
|
|
data_size = dtuple_get_data_size(dtuple, 0);
|
|
|
|
ut_ad(n_fields > 0);
|
|
|
|
/* Calculate the offset of the origin in the physical record */
|
|
|
|
rec = buf + rec_get_converted_extra_size(data_size, n_fields, n_ext);
|
|
#ifdef UNIV_DEBUG
|
|
/* Suppress Valgrind warnings of ut_ad()
|
|
in mach_write_to_1(), mach_write_to_2() et al. */
|
|
memset(buf, 0xff, rec - buf + data_size);
|
|
#endif /* UNIV_DEBUG */
|
|
/* Store the number of fields */
|
|
rec_set_n_fields_old(rec, n_fields);
|
|
|
|
/* Set the info bits of the record */
|
|
rec_set_info_bits_old(rec, dtuple_get_info_bits(dtuple)
|
|
& REC_INFO_BITS_MASK);
|
|
|
|
/* Store the data and the offsets */
|
|
|
|
end_offset = 0;
|
|
|
|
if (!n_ext && data_size <= REC_1BYTE_OFFS_LIMIT) {
|
|
|
|
rec_set_1byte_offs_flag(rec, TRUE);
|
|
|
|
for (i = 0; i < n_fields; i++) {
|
|
|
|
field = dtuple_get_nth_field(dtuple, i);
|
|
|
|
if (dfield_is_null(field)) {
|
|
len = dtype_get_sql_null_size(
|
|
dfield_get_type(field), 0);
|
|
data_write_sql_null(rec + end_offset, len);
|
|
|
|
end_offset += len;
|
|
ored_offset = end_offset
|
|
| REC_1BYTE_SQL_NULL_MASK;
|
|
} else {
|
|
/* If the data is not SQL null, store it */
|
|
len = dfield_get_len(field);
|
|
|
|
memcpy(rec + end_offset,
|
|
dfield_get_data(field), len);
|
|
|
|
end_offset += len;
|
|
ored_offset = end_offset;
|
|
}
|
|
|
|
rec_1_set_field_end_info(rec, i, ored_offset);
|
|
}
|
|
} else {
|
|
rec_set_1byte_offs_flag(rec, FALSE);
|
|
|
|
for (i = 0; i < n_fields; i++) {
|
|
|
|
field = dtuple_get_nth_field(dtuple, i);
|
|
|
|
if (dfield_is_null(field)) {
|
|
len = dtype_get_sql_null_size(
|
|
dfield_get_type(field), 0);
|
|
data_write_sql_null(rec + end_offset, len);
|
|
|
|
end_offset += len;
|
|
ored_offset = end_offset
|
|
| REC_2BYTE_SQL_NULL_MASK;
|
|
} else {
|
|
/* If the data is not SQL null, store it */
|
|
len = dfield_get_len(field);
|
|
|
|
memcpy(rec + end_offset,
|
|
dfield_get_data(field), len);
|
|
|
|
end_offset += len;
|
|
ored_offset = end_offset;
|
|
|
|
if (dfield_is_ext(field)) {
|
|
ored_offset |= REC_2BYTE_EXTERN_MASK;
|
|
}
|
|
}
|
|
|
|
rec_2_set_field_end_info(rec, i, ored_offset);
|
|
}
|
|
}
|
|
|
|
return(rec);
|
|
}
|
|
|
|
/*************************************************************
|
|
Builds a ROW_FORMAT=COMPACT record out of a data tuple. */
|
|
UNIV_INTERN
|
|
void
|
|
rec_convert_dtuple_to_rec_comp(
|
|
/*===========================*/
|
|
rec_t* rec, /* in: origin of record */
|
|
ulint extra, /* in: number of bytes to
|
|
reserve between the record
|
|
header and the data payload
|
|
(normally REC_N_NEW_EXTRA_BYTES) */
|
|
const dict_index_t* index, /* in: record descriptor */
|
|
ulint status, /* in: status bits of the record */
|
|
const dfield_t* fields, /* in: array of data fields */
|
|
ulint n_fields)/* in: number of data fields */
|
|
{
|
|
const dfield_t* field;
|
|
const dtype_t* type;
|
|
byte* end;
|
|
byte* nulls;
|
|
byte* lens;
|
|
ulint len;
|
|
ulint i;
|
|
ulint n_node_ptr_field;
|
|
ulint fixed_len;
|
|
ulint null_mask = 1;
|
|
ut_ad(extra == 0 || dict_table_is_comp(index->table));
|
|
ut_ad(extra == 0 || extra == REC_N_NEW_EXTRA_BYTES);
|
|
ut_ad(n_fields > 0);
|
|
|
|
switch (UNIV_EXPECT(status, REC_STATUS_ORDINARY)) {
|
|
case REC_STATUS_ORDINARY:
|
|
ut_ad(n_fields <= dict_index_get_n_fields(index));
|
|
n_node_ptr_field = ULINT_UNDEFINED;
|
|
break;
|
|
case REC_STATUS_NODE_PTR:
|
|
ut_ad(n_fields == dict_index_get_n_unique_in_tree(index) + 1);
|
|
n_node_ptr_field = n_fields - 1;
|
|
break;
|
|
case REC_STATUS_INFIMUM:
|
|
case REC_STATUS_SUPREMUM:
|
|
ut_ad(n_fields == 1);
|
|
n_node_ptr_field = ULINT_UNDEFINED;
|
|
break;
|
|
default:
|
|
ut_error;
|
|
return;
|
|
}
|
|
|
|
end = rec;
|
|
nulls = rec - (extra + 1);
|
|
lens = nulls - UT_BITS_IN_BYTES(index->n_nullable);
|
|
/* clear the SQL-null flags */
|
|
memset(lens + 1, 0, nulls - lens);
|
|
|
|
/* Store the data and the offsets */
|
|
|
|
for (i = 0, field = fields; i < n_fields; i++, field++) {
|
|
type = dfield_get_type(field);
|
|
len = dfield_get_len(field);
|
|
|
|
if (UNIV_UNLIKELY(i == n_node_ptr_field)) {
|
|
ut_ad(dtype_get_prtype(type) & DATA_NOT_NULL);
|
|
ut_ad(len == 4);
|
|
memcpy(end, dfield_get_data(field), len);
|
|
end += 4;
|
|
break;
|
|
}
|
|
|
|
if (!(dtype_get_prtype(type) & DATA_NOT_NULL)) {
|
|
/* nullable field */
|
|
ut_ad(index->n_nullable > 0);
|
|
|
|
if (UNIV_UNLIKELY(!(byte) null_mask)) {
|
|
nulls--;
|
|
null_mask = 1;
|
|
}
|
|
|
|
ut_ad(*nulls < null_mask);
|
|
|
|
/* set the null flag if necessary */
|
|
if (dfield_is_null(field)) {
|
|
*nulls |= null_mask;
|
|
null_mask <<= 1;
|
|
continue;
|
|
}
|
|
|
|
null_mask <<= 1;
|
|
}
|
|
/* only nullable fields can be null */
|
|
ut_ad(!dfield_is_null(field));
|
|
|
|
fixed_len = dict_index_get_nth_field(index, i)->fixed_len;
|
|
|
|
if (fixed_len) {
|
|
ut_ad(len == fixed_len);
|
|
ut_ad(!dfield_is_ext(field));
|
|
} else if (dfield_is_ext(field)) {
|
|
ut_ad(len <= REC_MAX_INDEX_COL_LEN
|
|
+ BTR_EXTERN_FIELD_REF_SIZE);
|
|
*lens-- = (byte) (len >> 8) | 0xc0;
|
|
*lens-- = (byte) len;
|
|
} else {
|
|
ut_ad(len <= dtype_get_len(type)
|
|
|| dtype_get_mtype(type) == DATA_BLOB);
|
|
if (len < 128
|
|
|| (dtype_get_len(type) < 256
|
|
&& dtype_get_mtype(type) != DATA_BLOB)) {
|
|
|
|
*lens-- = (byte) len;
|
|
} else {
|
|
ut_ad(len < 16384);
|
|
*lens-- = (byte) (len >> 8) | 0x80;
|
|
*lens-- = (byte) len;
|
|
}
|
|
}
|
|
|
|
memcpy(end, dfield_get_data(field), len);
|
|
end += len;
|
|
}
|
|
}
|
|
|
|
/*************************************************************
|
|
Builds a new-style physical record out of a data tuple and
|
|
stores it beginning from the start of the given buffer. */
|
|
static
|
|
rec_t*
|
|
rec_convert_dtuple_to_rec_new(
|
|
/*==========================*/
|
|
/* out: pointer to the origin
|
|
of physical record */
|
|
byte* buf, /* in: start address of
|
|
the physical record */
|
|
const dict_index_t* index, /* in: record descriptor */
|
|
const dtuple_t* dtuple) /* in: data tuple */
|
|
{
|
|
ulint extra_size;
|
|
ulint status;
|
|
rec_t* rec;
|
|
|
|
status = dtuple_get_info_bits(dtuple) & REC_NEW_STATUS_MASK;
|
|
rec_get_converted_size_comp(index, status,
|
|
dtuple->fields, dtuple->n_fields,
|
|
&extra_size);
|
|
rec = buf + extra_size;
|
|
|
|
rec_convert_dtuple_to_rec_comp(
|
|
rec, REC_N_NEW_EXTRA_BYTES, index, status,
|
|
dtuple->fields, dtuple->n_fields);
|
|
|
|
/* Set the info bits of the record */
|
|
rec_set_info_and_status_bits(rec, dtuple_get_info_bits(dtuple));
|
|
|
|
return(rec);
|
|
}
|
|
|
|
/*************************************************************
|
|
Builds a physical record out of a data tuple and
|
|
stores it beginning from the start of the given buffer. */
|
|
UNIV_INTERN
|
|
rec_t*
|
|
rec_convert_dtuple_to_rec(
|
|
/*======================*/
|
|
/* out: pointer to the origin
|
|
of physical record */
|
|
byte* buf, /* in: start address of the
|
|
physical record */
|
|
const dict_index_t* index, /* in: record descriptor */
|
|
const dtuple_t* dtuple, /* in: data tuple */
|
|
ulint n_ext) /* in: number of
|
|
externally stored columns */
|
|
{
|
|
rec_t* rec;
|
|
|
|
ut_ad(buf && index && dtuple);
|
|
ut_ad(dtuple_validate(dtuple));
|
|
ut_ad(dtuple_check_typed(dtuple));
|
|
|
|
if (dict_table_is_comp(index->table)) {
|
|
rec = rec_convert_dtuple_to_rec_new(buf, index, dtuple);
|
|
} else {
|
|
rec = rec_convert_dtuple_to_rec_old(buf, dtuple, n_ext);
|
|
}
|
|
|
|
#ifdef UNIV_DEBUG
|
|
{
|
|
mem_heap_t* heap = NULL;
|
|
ulint offsets_[REC_OFFS_NORMAL_SIZE];
|
|
const ulint* offsets;
|
|
rec_offs_init(offsets_);
|
|
|
|
offsets = rec_get_offsets(rec, index,
|
|
offsets_, ULINT_UNDEFINED, &heap);
|
|
ut_ad(rec_validate(rec, offsets));
|
|
if (UNIV_LIKELY_NULL(heap)) {
|
|
mem_heap_free(heap);
|
|
}
|
|
}
|
|
#endif /* UNIV_DEBUG */
|
|
return(rec);
|
|
}
|
|
|
|
/******************************************************************
|
|
Copies the first n fields of a physical record to a data tuple. The fields
|
|
are copied to the memory heap. */
|
|
UNIV_INTERN
|
|
void
|
|
rec_copy_prefix_to_dtuple(
|
|
/*======================*/
|
|
dtuple_t* tuple, /* out: data tuple */
|
|
const rec_t* rec, /* in: physical record */
|
|
const dict_index_t* index, /* in: record descriptor */
|
|
ulint n_fields, /* in: number of fields
|
|
to copy */
|
|
mem_heap_t* heap) /* in: memory heap */
|
|
{
|
|
ulint i;
|
|
ulint offsets_[REC_OFFS_NORMAL_SIZE];
|
|
ulint* offsets = offsets_;
|
|
rec_offs_init(offsets_);
|
|
|
|
offsets = rec_get_offsets(rec, index, offsets, n_fields, &heap);
|
|
|
|
ut_ad(rec_validate(rec, offsets));
|
|
ut_ad(dtuple_check_typed(tuple));
|
|
|
|
dtuple_set_info_bits(tuple, rec_get_info_bits(
|
|
rec, dict_table_is_comp(index->table)));
|
|
|
|
for (i = 0; i < n_fields; i++) {
|
|
dfield_t* field;
|
|
const byte* data;
|
|
ulint len;
|
|
|
|
field = dtuple_get_nth_field(tuple, i);
|
|
data = rec_get_nth_field(rec, offsets, i, &len);
|
|
|
|
if (len != UNIV_SQL_NULL) {
|
|
dfield_set_data(field,
|
|
mem_heap_dup(heap, data, len), len);
|
|
ut_ad(!rec_offs_nth_extern(offsets, i));
|
|
} else {
|
|
dfield_set_null(field);
|
|
}
|
|
}
|
|
}
|
|
|
|
/******************************************************************
|
|
Copies the first n fields of an old-style physical record
|
|
to a new physical record in a buffer. */
|
|
static
|
|
rec_t*
|
|
rec_copy_prefix_to_buf_old(
|
|
/*=======================*/
|
|
/* out, own: copied record */
|
|
const rec_t* rec, /* in: physical record */
|
|
ulint n_fields, /* in: number of fields to copy */
|
|
ulint area_end, /* in: end of the prefix data */
|
|
byte** buf, /* in/out: memory buffer for
|
|
the copied prefix, or NULL */
|
|
ulint* buf_size) /* in/out: buffer size */
|
|
{
|
|
rec_t* copy_rec;
|
|
ulint area_start;
|
|
ulint prefix_len;
|
|
|
|
if (rec_get_1byte_offs_flag(rec)) {
|
|
area_start = REC_N_OLD_EXTRA_BYTES + n_fields;
|
|
} else {
|
|
area_start = REC_N_OLD_EXTRA_BYTES + 2 * n_fields;
|
|
}
|
|
|
|
prefix_len = area_start + area_end;
|
|
|
|
if ((*buf == NULL) || (*buf_size < prefix_len)) {
|
|
if (*buf != NULL) {
|
|
mem_free(*buf);
|
|
}
|
|
|
|
*buf = mem_alloc2(prefix_len, buf_size);
|
|
}
|
|
|
|
ut_memcpy(*buf, rec - area_start, prefix_len);
|
|
|
|
copy_rec = *buf + area_start;
|
|
|
|
rec_set_n_fields_old(copy_rec, n_fields);
|
|
|
|
return(copy_rec);
|
|
}
|
|
|
|
/******************************************************************
|
|
Copies the first n fields of a physical record to a new physical record in
|
|
a buffer. */
|
|
UNIV_INTERN
|
|
rec_t*
|
|
rec_copy_prefix_to_buf(
|
|
/*===================*/
|
|
/* out, own: copied record */
|
|
const rec_t* rec, /* in: physical record */
|
|
const dict_index_t* index, /* in: record descriptor */
|
|
ulint n_fields, /* in: number of fields
|
|
to copy */
|
|
byte** buf, /* in/out: memory buffer
|
|
for the copied prefix,
|
|
or NULL */
|
|
ulint* buf_size) /* in/out: buffer size */
|
|
{
|
|
const byte* nulls;
|
|
const byte* lens;
|
|
ulint i;
|
|
ulint prefix_len;
|
|
ulint null_mask;
|
|
ulint status;
|
|
|
|
UNIV_PREFETCH_RW(*buf);
|
|
|
|
if (!dict_table_is_comp(index->table)) {
|
|
ut_ad(rec_validate_old(rec));
|
|
return(rec_copy_prefix_to_buf_old(
|
|
rec, n_fields,
|
|
rec_get_field_start_offs(rec, n_fields),
|
|
buf, buf_size));
|
|
}
|
|
|
|
status = rec_get_status(rec);
|
|
|
|
switch (status) {
|
|
case REC_STATUS_ORDINARY:
|
|
ut_ad(n_fields <= dict_index_get_n_fields(index));
|
|
break;
|
|
case REC_STATUS_NODE_PTR:
|
|
/* it doesn't make sense to copy the child page number field */
|
|
ut_ad(n_fields <= dict_index_get_n_unique_in_tree(index));
|
|
break;
|
|
case REC_STATUS_INFIMUM:
|
|
case REC_STATUS_SUPREMUM:
|
|
/* infimum or supremum record: no sense to copy anything */
|
|
default:
|
|
ut_error;
|
|
return(NULL);
|
|
}
|
|
|
|
nulls = rec - (REC_N_NEW_EXTRA_BYTES + 1);
|
|
lens = nulls - UT_BITS_IN_BYTES(index->n_nullable);
|
|
UNIV_PREFETCH_R(lens);
|
|
prefix_len = 0;
|
|
null_mask = 1;
|
|
|
|
/* read the lengths of fields 0..n */
|
|
for (i = 0; i < n_fields; i++) {
|
|
const dict_field_t* field;
|
|
const dict_col_t* col;
|
|
|
|
field = dict_index_get_nth_field(index, i);
|
|
col = dict_field_get_col(field);
|
|
|
|
if (!(col->prtype & DATA_NOT_NULL)) {
|
|
/* nullable field => read the null flag */
|
|
if (UNIV_UNLIKELY(!(byte) null_mask)) {
|
|
nulls--;
|
|
null_mask = 1;
|
|
}
|
|
|
|
if (*nulls & null_mask) {
|
|
null_mask <<= 1;
|
|
continue;
|
|
}
|
|
|
|
null_mask <<= 1;
|
|
}
|
|
|
|
if (field->fixed_len) {
|
|
prefix_len += field->fixed_len;
|
|
} else {
|
|
ulint len = *lens--;
|
|
if (col->len > 255 || col->mtype == DATA_BLOB) {
|
|
if (len & 0x80) {
|
|
/* 1exxxxxx */
|
|
len &= 0x3f;
|
|
len <<= 8;
|
|
len |= *lens--;
|
|
UNIV_PREFETCH_R(lens);
|
|
}
|
|
}
|
|
prefix_len += len;
|
|
}
|
|
}
|
|
|
|
UNIV_PREFETCH_R(rec + prefix_len);
|
|
|
|
prefix_len += rec - (lens + 1);
|
|
|
|
if ((*buf == NULL) || (*buf_size < prefix_len)) {
|
|
if (*buf != NULL) {
|
|
mem_free(*buf);
|
|
}
|
|
|
|
*buf = mem_alloc2(prefix_len, buf_size);
|
|
}
|
|
|
|
memcpy(*buf, lens + 1, prefix_len);
|
|
|
|
return(*buf + (rec - (lens + 1)));
|
|
}
|
|
|
|
/*******************************************************************
|
|
Validates the consistency of an old-style physical record. */
|
|
static
|
|
ibool
|
|
rec_validate_old(
|
|
/*=============*/
|
|
/* out: TRUE if ok */
|
|
const rec_t* rec) /* in: physical record */
|
|
{
|
|
const byte* data;
|
|
ulint len;
|
|
ulint n_fields;
|
|
ulint len_sum = 0;
|
|
ulint sum = 0;
|
|
ulint i;
|
|
|
|
ut_a(rec);
|
|
n_fields = rec_get_n_fields_old(rec);
|
|
|
|
if ((n_fields == 0) || (n_fields > REC_MAX_N_FIELDS)) {
|
|
fprintf(stderr, "InnoDB: Error: record has %lu fields\n",
|
|
(ulong) n_fields);
|
|
return(FALSE);
|
|
}
|
|
|
|
for (i = 0; i < n_fields; i++) {
|
|
data = rec_get_nth_field_old(rec, i, &len);
|
|
|
|
if (!((len < UNIV_PAGE_SIZE) || (len == UNIV_SQL_NULL))) {
|
|
fprintf(stderr,
|
|
"InnoDB: Error: record field %lu len %lu\n",
|
|
(ulong) i,
|
|
(ulong) len);
|
|
return(FALSE);
|
|
}
|
|
|
|
if (len != UNIV_SQL_NULL) {
|
|
len_sum += len;
|
|
sum += *(data + len -1); /* dereference the
|
|
end of the field to
|
|
cause a memory trap
|
|
if possible */
|
|
} else {
|
|
len_sum += rec_get_nth_field_size(rec, i);
|
|
}
|
|
}
|
|
|
|
if (len_sum != rec_get_data_size_old(rec)) {
|
|
fprintf(stderr,
|
|
"InnoDB: Error: record len should be %lu, len %lu\n",
|
|
(ulong) len_sum,
|
|
rec_get_data_size_old(rec));
|
|
return(FALSE);
|
|
}
|
|
|
|
rec_dummy = sum; /* This is here only to fool the compiler */
|
|
|
|
return(TRUE);
|
|
}
|
|
|
|
/*******************************************************************
|
|
Validates the consistency of a physical record. */
|
|
UNIV_INTERN
|
|
ibool
|
|
rec_validate(
|
|
/*=========*/
|
|
/* out: TRUE if ok */
|
|
const rec_t* rec, /* in: physical record */
|
|
const ulint* offsets)/* in: array returned by rec_get_offsets() */
|
|
{
|
|
const byte* data;
|
|
ulint len;
|
|
ulint n_fields;
|
|
ulint len_sum = 0;
|
|
ulint sum = 0;
|
|
ulint i;
|
|
|
|
ut_a(rec);
|
|
n_fields = rec_offs_n_fields(offsets);
|
|
|
|
if ((n_fields == 0) || (n_fields > REC_MAX_N_FIELDS)) {
|
|
fprintf(stderr, "InnoDB: Error: record has %lu fields\n",
|
|
(ulong) n_fields);
|
|
return(FALSE);
|
|
}
|
|
|
|
ut_a(rec_offs_comp(offsets) || n_fields <= rec_get_n_fields_old(rec));
|
|
|
|
for (i = 0; i < n_fields; i++) {
|
|
data = rec_get_nth_field(rec, offsets, i, &len);
|
|
|
|
if (!((len < UNIV_PAGE_SIZE) || (len == UNIV_SQL_NULL))) {
|
|
fprintf(stderr,
|
|
"InnoDB: Error: record field %lu len %lu\n",
|
|
(ulong) i,
|
|
(ulong) len);
|
|
return(FALSE);
|
|
}
|
|
|
|
if (len != UNIV_SQL_NULL) {
|
|
len_sum += len;
|
|
sum += *(data + len -1); /* dereference the
|
|
end of the field to
|
|
cause a memory trap
|
|
if possible */
|
|
} else if (!rec_offs_comp(offsets)) {
|
|
len_sum += rec_get_nth_field_size(rec, i);
|
|
}
|
|
}
|
|
|
|
if (len_sum != rec_offs_data_size(offsets)) {
|
|
fprintf(stderr,
|
|
"InnoDB: Error: record len should be %lu, len %lu\n",
|
|
(ulong) len_sum,
|
|
(ulong) rec_offs_data_size(offsets));
|
|
return(FALSE);
|
|
}
|
|
|
|
rec_dummy = sum; /* This is here only to fool the compiler */
|
|
|
|
if (!rec_offs_comp(offsets)) {
|
|
ut_a(rec_validate_old(rec));
|
|
}
|
|
|
|
return(TRUE);
|
|
}
|
|
|
|
/*******************************************************************
|
|
Prints an old-style physical record. */
|
|
UNIV_INTERN
|
|
void
|
|
rec_print_old(
|
|
/*==========*/
|
|
FILE* file, /* in: file where to print */
|
|
const rec_t* rec) /* in: physical record */
|
|
{
|
|
const byte* data;
|
|
ulint len;
|
|
ulint n;
|
|
ulint i;
|
|
|
|
ut_ad(rec);
|
|
|
|
n = rec_get_n_fields_old(rec);
|
|
|
|
fprintf(file, "PHYSICAL RECORD: n_fields %lu;"
|
|
" %u-byte offsets; info bits %lu\n",
|
|
(ulong) n,
|
|
rec_get_1byte_offs_flag(rec) ? 1 : 2,
|
|
(ulong) rec_get_info_bits(rec, FALSE));
|
|
|
|
for (i = 0; i < n; i++) {
|
|
|
|
data = rec_get_nth_field_old(rec, i, &len);
|
|
|
|
fprintf(file, " %lu:", (ulong) i);
|
|
|
|
if (len != UNIV_SQL_NULL) {
|
|
if (len <= 30) {
|
|
|
|
ut_print_buf(file, data, len);
|
|
} else {
|
|
ut_print_buf(file, data, 30);
|
|
|
|
fprintf(file, " (total %lu bytes)",
|
|
(ulong) len);
|
|
}
|
|
} else {
|
|
fprintf(file, " SQL NULL, size %lu ",
|
|
rec_get_nth_field_size(rec, i));
|
|
}
|
|
|
|
putc(';', file);
|
|
putc('\n', file);
|
|
}
|
|
|
|
rec_validate_old(rec);
|
|
}
|
|
|
|
#ifndef UNIV_HOTBACKUP
|
|
/*******************************************************************
|
|
Prints a physical record in ROW_FORMAT=COMPACT. Ignores the
|
|
record header. */
|
|
UNIV_INTERN
|
|
void
|
|
rec_print_comp(
|
|
/*===========*/
|
|
FILE* file, /* in: file where to print */
|
|
const rec_t* rec, /* in: physical record */
|
|
const ulint* offsets)/* in: array returned by rec_get_offsets() */
|
|
{
|
|
ulint i;
|
|
|
|
for (i = 0; i < rec_offs_n_fields(offsets); i++) {
|
|
const byte* data;
|
|
ulint len;
|
|
|
|
data = rec_get_nth_field(rec, offsets, i, &len);
|
|
|
|
fprintf(file, " %lu:", (ulong) i);
|
|
|
|
if (len != UNIV_SQL_NULL) {
|
|
if (len <= 30) {
|
|
|
|
ut_print_buf(file, data, len);
|
|
} else {
|
|
ut_print_buf(file, data, 30);
|
|
|
|
fprintf(file, " (total %lu bytes)",
|
|
(ulong) len);
|
|
}
|
|
} else {
|
|
fputs(" SQL NULL", file);
|
|
}
|
|
putc(';', file);
|
|
putc('\n', file);
|
|
}
|
|
}
|
|
|
|
/*******************************************************************
|
|
Prints a physical record. */
|
|
UNIV_INTERN
|
|
void
|
|
rec_print_new(
|
|
/*==========*/
|
|
FILE* file, /* in: file where to print */
|
|
const rec_t* rec, /* in: physical record */
|
|
const ulint* offsets)/* in: array returned by rec_get_offsets() */
|
|
{
|
|
ut_ad(rec);
|
|
ut_ad(offsets);
|
|
ut_ad(rec_offs_validate(rec, NULL, offsets));
|
|
|
|
if (!rec_offs_comp(offsets)) {
|
|
rec_print_old(file, rec);
|
|
return;
|
|
}
|
|
|
|
fprintf(file, "PHYSICAL RECORD: n_fields %lu;"
|
|
" compact format; info bits %lu\n",
|
|
(ulong) rec_offs_n_fields(offsets),
|
|
(ulong) rec_get_info_bits(rec, TRUE));
|
|
|
|
rec_print_comp(file, rec, offsets);
|
|
rec_validate(rec, offsets);
|
|
}
|
|
|
|
/*******************************************************************
|
|
Prints a physical record. */
|
|
UNIV_INTERN
|
|
void
|
|
rec_print(
|
|
/*======*/
|
|
FILE* file, /* in: file where to print */
|
|
const rec_t* rec, /* in: physical record */
|
|
dict_index_t* index) /* in: record descriptor */
|
|
{
|
|
ut_ad(index);
|
|
|
|
if (!dict_table_is_comp(index->table)) {
|
|
rec_print_old(file, rec);
|
|
return;
|
|
} else {
|
|
mem_heap_t* heap = NULL;
|
|
ulint offsets_[REC_OFFS_NORMAL_SIZE];
|
|
rec_offs_init(offsets_);
|
|
|
|
rec_print_new(file, rec,
|
|
rec_get_offsets(rec, index, offsets_,
|
|
ULINT_UNDEFINED, &heap));
|
|
if (UNIV_LIKELY_NULL(heap)) {
|
|
mem_heap_free(heap);
|
|
}
|
|
}
|
|
}
|
|
#endif /* !UNIV_HOTBACKUP */
|