mariadb

Tree: ae70562abf

Author	SHA1	Message	Date
marko	8ab5601eea	branches/zip: Convert the function comments to Doxygen format. This patch was created by running the following commands: for i in /[ch]; do doxygenify.pl $i; done perl -i -pe 's#\{3} \/$#***/#' /[ch] where doxygenify.pl is https://svn.innodb.com/svn/misc/trunk/tools/doxygenify.pl r510 Verified the consistency as follows: (0) not too many / in: / or / out: / comments left in the code: grep -l '/\\s$in\\|out$[,:/]' /[ch] (1) no difference when ignoring blank lines, after stripping all C90-style / comments /, including multi-line ones, before and after applying this patch: perl -i -e 'undef $/;while(<ARGV>){s#/\(.?)\/##gs;print}' /[ch] diff -I'^\s$' --exclude .svn -ru TREE1 TREE2 (2) after stripping @return comments and !<, generated a diff and omitted the hunks where / out: / function return comments were removed: perl -i -e'undef $/;while(<ARGV>){s#!<##g;s#\n\@return\t.?\/# \/#gs;print}'\ /[ch] svn diff\| perl -e 'undef $/;$_=<>;s#\n-\s/\ out[:,]([^\n]?)(\n-[^\n]?)\/##gs;print' Some unintended changes were left. These will be removed in a subsequent patch.	17 years ago
marko	20a32e3c95	branches/zip: Add missing function comments.	17 years ago
marko	f7674d43c3	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	17 years ago
marko	6108afddf1	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.	17 years ago
marko	4aa0305b8d	branches/zip: Remove unneeded definitions and dependencies from UNIV_HOTBACKUP builds.	17 years ago
marko	4a423a0a9e	branches/zip: recv_parse_or_apply_log_rec_body(): Add debug assertions ensuring that FIL_PAGE_TYPE makes sense when applying log records.	17 years ago
marko	c2f40d13ce	branches/zip: Enclose recv_recovery_from_backup_on and recv_recovery_from_backup_is_on() in #ifdef UNIV_LOG_ARCHIVE.	17 years ago
marko	054ef0dec8	branches/zip: recv_scan_log_recs(): Remove a compile-time constant parameter.	17 years ago
marko	5c1adb5f9a	branches/zip: Non-functional change: Add const qualifiers. log_block_checksum_is_ok_or_old_format(), recv_sys_add_to_parsing_buf(): The log block is read-only. Make it const.	17 years ago
marko	cc6e72fc36	branches/zip: recv_sys_init(): Remove a compile-time constant parameter.	17 years ago
marko	f2a70c2a4b	branches/zip: recv_recover_page(): Remove compile-time constant parameters.	17 years ago
marko	391c810e2a	branches/zip: Add const qualifiers or in/out comments to some function parameters in log0log.	17 years ago
vasil	dfc3e641b7	branches/zip: * Remove old Innobase copyright lines from C source files * Add a reference to the GPLv2 license as recommended by the lawyers at Oracle Legal [Step 22/28]	17 years ago
marko	89b01b94e9	branches/zip: Map ut_malloc(), ut_realloc(), ut_free() to malloc(), realloc(), free() when innodb_use_sys_malloc is set. ut_free_all_mem(): If innodb_use_sys_malloc is set, do nothing, because then ut_mem_block_list_inited will never be set. log_init(): Use mem_alloc() instead of ut_malloc(), so that the memory will be freed. (Tested with Valgrind, although it is not clear why the memory would be freed.) rb://86 approved by Heikki Tuuri and Ken Jacobs. This addresses Issue #168.	17 years ago
marko	859394a011	branches/zip: Enclose some backup functions in #ifdef UNIV_HOTBACKUP. recv_read_cp_info_for_backup(), recv_scan_log_seg_for_backup(): These functions are only called by InnoDB Hot Backup.	17 years ago
marko	332094cbf0	branches/zip: Enclose some functions inside #ifdef UNIV_HOTBACKUP: ut_sprintf_timestamp_without_extra_chars(), ut_get_year_month_day(), log_reset_first_header_and_checkpoint(): These functions are only used in InnoDB Hot Backup.	17 years ago
marko	f209e720f0	branches/zip: Enclose some more unused code in #ifdef UNIV_LOG_ARCHIVE. This will help trim the dependencies of InnoDB Hot Backup. recv_recovery_from_checkpoint_start(): Rename to recv_recovery_from_checkpoint_start_func(), and remove the two first parameters unless UNIV_LOG_ARCHIVE is defined. Define and use the auxiliary macros TYPE_CHECKPOINT and LIMIT_LSN in the function. struct recv_sys_struct: Remove archive_group unless UNIV_LOG_ARCHIVE is defined. Do not define LOG_ARCHIVE unless UNIV_LOG_ARCHIVE is defined.	17 years ago
marko	f14f43c140	branches/zip: Remove some redundant #include statements.	17 years ago
marko	082f28dc85	branches/zip: Relax the page_zip_validate() check during crash recovery: ignore intermittent differences in the "predefined minimum record" flag. page_zip_validate_low(): Renamed from page_zip_validate(), with an additional parameter: ibool sloppy. Ignore REC_INFO_MIN_REC_FLAG when sloppy == TRUE. page_zip_validate(): Wrapper for page_zip_validate_low(). Pass sloppy = recv_recovery_is_on(). recv_recover_page(): After applying the changes from the redo log to a compressed B-tree page, invoke page_zip_validate_low() in strict mode.	17 years ago
marko	d87663c9f0	branches/zip: Non-functional change: buf_block_dbg_add_level(block, level): Define as an empty macro when UNIV_SYNC_DEBUG is not defined. Remove #ifdef UNIV_SYNC_DEBUG around all invocations.	17 years ago
marko	e3b2541287	branches/zip: Rename ib_ulonglong to ib_uint64_t and ib_longlong to ib_int64_t.	18 years ago
marko	a9ae7311ec	branches/zip: Implement the configuration parameter and settable global variable innodb_file_format. Implement file format version stamping of *.ibd files and SYS_TABLES.TYPE. This change breaks introduces an incompatible change for for compressed tables. We can do this, as we have not released yet. innodb-zip.test: Add tests for stricter KEY_BLOCK_SIZE and ROW_FORMAT checks. DICT_TF_COMPRESSED_MASK, DICT_TF_COMPRESSED_SHIFT: Replace with DICT_TF_ZSSIZE_MASK, DICT_TF_ZSSIZE_SHIFT. DICT_TF_FORMAT_MASK, DICT_TF_FORMAT_SHIFT, DICT_TF_FORMAT_51, DICT_TF_FORMAT_ZIP: File format version, stored in table->flags, in the .ibd file header, and in SYS_TABLES.TYPE. dict_create_sys_tables_tuple(): Write the table flags to SYS_TABLES.TYPE if the format is at least DICT_TF_FORMAT_ZIP. For old formats (DICT_TF_FORMAT_51), write DICT_TABLE_ORDINARY as the table type. DB_TABLE_ZIP_NO_IBD: Remove the error code. The error handling is done in ha_innodb.cc; as a failsafe measure, dict_build_table_def_step() will silently clear the compression and format flags instead of returning this error. dict_mem_table_create(): Assert that no extra bits are set in the flags. dict_sys_tables_get_zip_size(): Rename to dict_sys_tables_get_flags(). Check all flag bits, and return ULINT_UNDEFINED if the combination is unsupported. dict_boot(): Document the SYS_TABLES columns N_COLS and TYPE. dict_table_get_format(), dict_table_set_format(), dict_table_flags_to_zip_size(): New accessors to table->flags. dtuple_convert_big_rec(): Introduce the auxiliary variables local_len, local_prefix_len. Store a 768-byte prefix locally if the file format is less than DICT_TF_FORMAT_ZIP. dtuple_convert_back_big_rec(): Restore the columns. srv_file_format: New variable: innodb_file_format. fil_create_new_single_table_tablespace(): Replace the parameter zip_size with table->flags. fil_open_single_table_tablespace(): Replace the parameter zip_size_in_k with table->flags. Check the flags. fil_space_struct, fil_space_create(), fil_op_write_log(): Replace zip_size with flags. fil_node_open_file(): Note a TODO item for InnoDB Hot Backup. Check that the tablespace flags match. fil_space_get_zip_size(): Rename to fil_space_get_flags(). Add a wrapper for fil_space_get_zip_size(). fsp_header_get_flags(): New function. fsp_header_init_fields(): Replace zip_size with flags. FSP_SPACE_FLAGS: New name for the tablespace flags. This field used to be called FSP_PAGE_ZIP_SIZE, or FSP_LOWEST_NO_WRITE. It has always been written as 0 in MySQL/InnoDB versions 4.1 to 5.1. MLOG_ZIP_FILE_CREATE: Rename to MLOG_FILE_CREATE2. Add a 32-bit parameter for the tablespace flags. ha_innobase::create(): Check the table attributes ROW_FORMAT and KEY_BLOCK_SIZE. Issue errors if they are inappropriate, or warnings if the inherited attributes (in ALTER TABLE) will be ignored. PAGE_ZIP_MIN_SIZE_SHIFT: New constant: the 2-logarithm of PAGE_ZIP_MIN_SIZE.	18 years ago
marko	c4605a2807	branches/zip: Fix most MSVC (Windows) compilation warnings. lock_get_table(), locks_row_eq_lock(), buf_page_get_mutex(): Add return after ut_error. On Windows, ut_error is not declared as "noreturn". Add explicit type casts when assigning ulint to byte to get rid of "possible loss of precision" warnings. struct i_s_table_cache_struct: Declare rows_used, rows_allocd as ulint instead of ullint. 32 bits should be enough. fill_innodb_trx_from_cache(), i_s_zip_fill_low(): Cast 64-bit unsigned integers to longlong when calling Field::store(longlong, bool is_unsigned). Otherwise, the compiler would implicitly convert them to double and invoke Field::store(double) instead. recv_truncate_group(), recv_copy_group(), recv_calc_lsn_on_data_add(): Cast ib_uint64_t expressions to ulint to get rid of "possible loss of precision" warnings. (There should not be any loss of precision in these cases.) log_close(), log_checkpoint_margin(): Declare some variables as ib_uint64_t instead of ulint, so that there won't be any potential loss of precision. mach_write_ull(): Cast the second argument of mach_write_to_4() to ulint. OS_FILE_FROM_FD(): Cast the return value of _get_osfhandle() to HANDLE. row_merge_dict_table_get_index(): Cast the parameter of mem_free() to (void*) in order to get rid of the bogus MSVC warning C4090, which has been reported as MSVC bug 101661: <http://connect.microsoft.com/VisualStudio/feedback/ViewFeedback.aspx?FeedbackID=101661> row_mysql_read_blob_ref(): To get rid of a bogus MSVC warning C4090, drop a const qualifier.	18 years ago
marko	1d1dc31a06	branches/zip: Introduce UNIV_INTERN, a linkage specifier for InnoDB-global symbols. Use it for all definitions of non-static variables and functions. lexyy.c, make_flex.sh: Declare yylex as UNIV_INTERN, not static. It is referenced from pars0grm.c. Actually, according to nm .libs/ha_innodb.so\|grep -w '[ABCE-TVXYZ]' the following symbols are still global: * The vtable for class ha_innodb * pars0grm.c: The function yyparse() and the variables yychar, yylval, yynerrs The required changes to the Bison-generated file pars0grm.c will be addressed in a separate commit, which will add a script similar to make_flex.sh. The class ha_innodb is renamed from class ha_innobase by a #define. Thus, there will be no clash with the builtin InnoDB. However, there will be some overhead for invoking virtual methods of class ha_innodb. Ideas for making the vtable hidden are welcome. -fvisibility=hidden is not available in GCC 3.	18 years ago
marko	281d3966cf	branches/zip: trx_rollback_or_clean_all_without_sess(): Rename to trx_rollback_or_clean_all_recovered().	18 years ago
marko	84ff578142	branches/zip: Simplify crash recovery in fast index creation. trx_t: Remove dict_undo_list and dict_redo_list. innobase_create_temporary_tablename(): Replace TEMP_TABLE_PREFIX with a table name suffix "#1" or "#2". In this way, the user can restore precious data, should anything go wrong. It is possible to reach an inconsistent state, because the creation, deletion and renaming of single-table tablespaces are not transactional. ut_print_namel(), fil_make_ibd_name(), innobase_rename_table(): Remove the special treatment of TEMP_TABLE_PREFIX. Introduce TEMP_INDEX_PREFIX == 0xff for temporary indexes. This byte cannot occur in index names since MySQL 4.1. However, it might have been possible to use this byte in MySQL 4.0. recv_recovery_from_checkpoint_finish(): Call the new function row_merge_drop_temp_indexes(), to drop all indexes whose name starts with the byte 0xff. row_merge_rename_indexes(): Renamed from row_merge_rename_index(). Remove the parameter "index". row_drop_table_for_mysql(): Unconditionally call trx_commit_for_mysql(). row_drop_table_for_mysql_no_commit(): Correct the function commit, based on the corrected comment of row_drop_table_for_mysql(). Rely on table->to_be_dropped instead of TEMP_TABLE_PREFIX. ha_innobase::add_index(): Simplify the control flow.	18 years ago
marko	0a780db994	branches/zip: Merge 1575:1664 from trunk.	19 years ago
marko	8a294fa351	branches/zip: Merge 1493:1533 from trunk. Make use of UT_BITS_IN_BYTES().	19 years ago
marko	88df83bb3b	branches/zip: Merge revisions 1402:1493 from trunk. Remove mysql.patch, because the configuration parameter interface has changed.	19 years ago
marko	a56088231c	branches/zip: Minor cleanup. log_write_up_to(): Replace if-else if-else with a switch block. log_archive_do(): Remove an excess mutex_enter(). Replace if-else if-else with a switch block. (This function is not included unless UNIV_LOG_ARCHIVE is defined.)	19 years ago
marko	645b392294	branches/zip: Merge revisions 1206:1271 from trunk.	19 years ago
marko	5fc003b65d	branches/zip: Make mutex_own() work with UNIV_DEBUG, without UNIV_SYNC_DEBUG.	19 years ago
marko	8f65d7a661	branches/zip: Merge revisions 1165:1206 from trunk.	19 years ago
marko	f116afa724	branches/zip: Remove the fil_space_get_zip_size() call from buf_page_get_gen(). This saves one mutex operation per block request. buf_page_get_gen(), various macros and functions: Add parameter zip_size. btr_node_ptr_get_child(): Add parameter index. fil_space_get_latch(): Add optional output parameter zip_size. fil_space_get_zip_size(): Return 0 for space id==0, because the system tablespace is never compressed. fsp_header_init(): Remove the parameter zip_size. ibuf_free_excess_pages(): Remove the parameter zip_size. trx_rseg_t, trx_undo_t: Add field zip_size. xdes_lst_get_next(): Remove, unused.	19 years ago
marko	7fbc4f2bc0	branches/zip: Merge revisions 1009:1165 from trunk.	19 years ago
marko	c087a5d559	branches/zip: Minor cleanup. buf_page_get_gen(): Cache the result of fil_space_get_zip_size(). trx_commit_off_kernel(): Eliminate the flag must_flush_log. Initialize lsn = 0 to signify must_flush_log == FALSE. log_flush_margin(): Eliminate the flag do_flush. Initialize lsn = 0 to signify do_flush == FALSE.	19 years ago
marko	cb530ba3e7	branches/zip: Make use of the previously unused state BUF_BLOCK_MEMORY. buf_LRU_get_free_block(): Document that the block is in the state BUF_BLOCK_READY_FOR_USE. buf_block_alloc(): Change the state of the block to BUF_BLOCK_MEMORY and document it. Replace those invocations of buf_block_alloc() with buf_LRU_get_free_block() where the allocated block is used for buffer pool input and output. However, temporary copies of B-tree pages during reorganization are not used for file I/O, and such blocks are still allocated with buf_block_alloc().	19 years ago
marko	229d901921	branches/zip: Fix compilation errors when UNIV_HOTBACKUP is defined.	19 years ago
marko	6c0a4186af	branches/zip: Allow some functions to work on compressed-only pages (state == BUF_BLOCK_ZIP_PAGE). Make use of buf_page_in_file() and buf_page_get_mutex(). buf_block_get_newest_modification(): Rename to buf_page_get_newest_modification().	19 years ago
marko	267a81ebfb	branches/zip: Rename ut_ulonglong_align_down() and ut_ulonglong_align_up() to ut_uint64_align_down() and ut_uint64_align_up(), to reflect the rename of ib_ulonglong to ib_uint64_t in r1085.	19 years ago
marko	329a29c2fb	branches/zip: Replace ib_ulonglong with ib_uint64_t, since we want exactly 64 bits. "long long" might be longer than 64 bits on some systems.	19 years ago
marko	7593a465db	branches/zip: Introduce the unsigned 64-bit data type ib_ulonglong for log sequence numbers, to replace dulint.	19 years ago
marko	6c8dfab1dc	branches/zip: Replace most references to block->state, block->offset, and block->space with buf_block_get_state(block), buf_block_get_page_no(block), and buf_block_get_space(block). enum buf_block_state: Replaces the #define'd buf_block_t.state values. buf_block_get_state(): New function. buf_block_get_frame(): Add __attribute__((const)).	19 years ago
marko	d266262af6	branches/zip: Prepare for buffer pool allocation in several chunks. buf_pool_t: Remove n_frames, max_size, and blocks_of_frames. The current buffer pool size is in curr_size. buf_pool_init(): Remove parameter max_size. buf_pool_get_max_size(), buf_pool_is_block(): Remove. buf_block_align(): Do not assume that the buffer pool is allocated in one chunk. Replace dependency on buf_pool->blocks_of_frames with a call to buf_page_hash_get().	19 years ago
marko	b6e26f24d7	branches/zip: Remove some more buf_block_align() calls. btr_cur_t: Move page_block to page_cur_t::block. page_cur_get_block(), page_cur_get_page_zip(): New functions. page_cur_position(): Add parameter block. Remove many page_zip parameters, now that there is page_cur_get_page_zip(). Replace some page, page_zip parameters with block. Add some const qualifiers to function parameters and remove casts. PAGE_HEAP_NO_INFIMUM, PAGE_HEAP_NO_SUPREMUM, PAGE_HEAP_NO_USER_LOW: New constants. Replace some cursor code in low-level diagnostic functions with direct management of rec, because buf_block_t::buf_fix_count may be 0 when the functions are called, and debug assertions would fail.	19 years ago
marko	cdb096b609	branches/zip: Remove many fil_space_get_zip_size() calls. ibuf_page(), ibuf_page_low(), ibuf_free_excess_pages(), ibuf_insert(), buf_read_page(), buf_read_ahead_linear(), buf_read_recv_pages(): Add parameter zip_size.	19 years ago
marko	24d0bbf86c	branches/zip: Remove some more buf_block_align() calls. btr_search_build_page_hash_index(), fsp_parse_init_file_page(), ibuf_parse_bitmap_init(): Replace page_t* with buf_block_t. buf_read_ibuf_merge_pages(): Add const qualifiers. Retrieve zip_size. ibuf_merge_or_delete_for_page(): Replace page_t with buf_block_t*. Add parameter zip_size.	19 years ago
marko	d583b1803c	branches/zip: Eliminate many buf_block_align() calls. Replace page_t* or page_zip_des_t* parameters in some functions with buf_block_t. buf_frame_get_page_zip(): Disable unless #ifdef UNIV_DEBUG \|\| UNIV_ZIP_DEBUG. btr_cur_t: Add buf_block_t page_block. btr_pcur_get_block(), btr_cur_get_block(), btr_cur_get_page_zip(): New functions. btr_cur_position(): Add the parameter block.	19 years ago
marko	e5b6c39477	branches/zip: Remove some more buf_block_align() calls. Replace buf_frame_modify_clock_inc() with buf_block_modify_clock_inc(). Replace buf_frame_get_lock_hash_val() with buf_block_get_lock_hash_val(). Replace buf_frame_get_lock_mutex() with buf_block_get_lock_mutex(). page_create_zip(), page_create(), page_create_low(), btr_page_free(), btr_page_free_low(): Replace page_t with buf_block_t.	19 years ago
marko	5669dc3d2a	branches/zip: Reduce the number of buf_block_align() calls. btr_block_get(): New function to return buf_block_t. btr_page_alloc(), buf_page_get_release_on_io(), buf_page_get_gen(), buf_page_create(), fseg_create(), fseg_create_general(): Return buf_block_t. buf_page_get_known_nowait(): Expect buf_block_t instead of buf_frame_t. buf_frame_get_newest_modification(): Replace with buf_block_get_newest_modification(). buf_page_dbg_add_level(): Replace with buf_block_dbg_add_level(). buf_block_get_zip_size(): New function. buf_block_get_page_zip(): Reintroduce. recv_recover_page(): Replace page, space, page_no with block. ibuf_bitmap_page_init(): Replace page, zip_size with block. ibuf_parse_bitmap_init(): Remove the parameter zip_size. btr_search_drop_page_hash_index(): Replace page with block.	19 years ago

1 2

84 Commits (ae70562abf1e0a516b73bce2ed19e59c6f51f299)