mariadb

Tree: 44e33c235f

Author	SHA1	Message	Date
marko	44e33c235f	branches/zip: btr_page_get_sure_split_rec(): Rewrite the for (;;) { ... if (condition) { ... return }} loop as do { ... } while (!condition); ... return. On compressed pages, return NULL if incl_data > free_space.	19 years ago
marko	5a21753bcb	branches/zip: page_zip_empty_size(): New function to compute the guaranteed free space available for inserting one record. btr_page_get_sure_split_rec(), btr_cur_pessimistic_insert(): Use page_zip_empty_size(). btr_page_split_and_insert(): Relax a debug assertion that there should be at least two user records on the page. On compressed pages, we may be able to write only one record.	19 years ago
marko	68a65c142c	branches/zip: Merge revisions 804:838 from trunk.	19 years ago
marko	38e09b2fea	branches/zip: Merge revisions 720:765 from trunk and reindent the code as per revisions r763:765.	20 years ago
marko	800047591a	branches/zip: btr_page_get_sure_split_rec(): Align the variable declarations according to InnoDB formatting rules.	20 years ago
marko	4fb0e5e762	branches/zip: Account for the compressed page size when checking if a record will fit or need external storage. btr_page_get_sure_split_rec(): Estimate the free space of an empty compressed page. page_zip_rec_needs_ext(): New function, to replace existing tests whether external storage is needed.	20 years ago
marko	f4f5606fb6	branches/zip: Merge revisions 634:713 from trunk.	20 years ago
marko	12ccbd8ae0	branches/zip: Remove a bogus page_zip_validate() assertion failure found by running index_merge_ror_cpk on 1-kilobyte compressed pages. page_delete_rec_list_start(): Remove the page_zip_validate() assertion. btr_page_split_and_insert(): Add page_zip_validate() assertions about page and new_page after moving the records.	20 years ago
marko	3e670d86c7	branches/zip: btr_parse_page_reorganize(): Add parameter page_zip.	20 years ago
marko	6b077aa8e3	branches/zip: Eliminate page corruption in btr_compress() when page_zip_reorganize() was invoked. btr_compress(): Obtain orig_pred and orig_succ after copying the records. Add a debug assertion about FIL_PAGE_PREV. page_copy_rec_list_end(), page_copy_rec_list_start(): Change the return type from ibool to rec_t. Adjust the return value after invoking page_zip_reorganize().	20 years ago
marko	44175381a5	branches/zip: Make page_zip_validate() independent of UNIV_DEBUG. Replace most occurrences of #if defined UNIV_DEBUG \|\| defined UNIV_ZIP_DEBUG with #ifdef UNIV_ZIP_DEBUG.	20 years ago
marko	b43effdd9c	branches/zip: Add assertions. btr_compress(): Invoke page_zip_validate() on the page being compressed. recv_parse_or_apply_log_rec_body(): Assert that MLOG_WRITE_STRING is never used on compressed B-tree pages.	20 years ago
marko	7f8cb7aab9	branches/zip: Merge revisions 583:634 from trunk.	20 years ago
marko	2117ec5a96	branches/zip: Add page_zip_validate() assertions and remove a bogus page_zip_assertion() failure in page_copy_rec_list_end(). btr_root_raise_and_insert(), btr_lift_page_up(), btr_compress(): Add page_zip_validate() assertions. btr_compress(): Only copy FIL_PAGE_PREV when UNIV_BTR_DEBUG is defined. page_cur_delete_rec(): Document why the page_zip_validate() assertion was removed. page_copy_rec_list_end(): Remove the page_zip_validate() assertion and document why. page_move_rec_list_end(): Add page_zip_validate() assertion.	20 years ago
marko	8f6de3bba2	branches/zip: Add page_zip_validate() checks. page_cur_delete_rec(): Do not call page_zip_validate() in the beginning, because btr_set_min_rec_mark() in btr_cur_pessimistic_delete() will cause a temporary mismatch. Document temporary mismatches caused by btr_set_min_rec_mark() calls and explain why they will not cause any problems.	20 years ago
marko	8378c349e9	branches/zip: Replace all ut_ad(page_zip_validate()) assertions with ut_a(page_zip_validate()) that are enabled if UNIV_DEBUG or UNIV_ZIP_DEBUG is defined.	20 years ago
marko	168fa020f3	branches/zip: Try to reorganize the page when compression fails. page_zip_compress_write_log(): Make static. page_zip_compress(): Add optional parameter mtr for redo logging. page_zip_reorganize(): Low-level counterpart of btr_page_reorganize(). page_zip_copy(): Add debug assertions about mtr_memo_contains. page_cur_insert_rec_low(): Try page_zip_reorganize() and seek to the new position of insert_rec if it succeeds. page_copy_rec_list_end(), page_copy_rec_list_start(): Try page_zip_reorganize(). page_move_rec_list_end(): Remove bogus comment.	20 years ago
marko	2779bdc7ff	branches/zip: btr_root_raise_and_insert(): Remove a bogus assertion.	20 years ago
marko	2c3b224796	branches/zip: Shorten the log record MLOG_ZIP_PAGE_COMPRESS. page_zip_copy(), page_zip_compress_write_log(): Add parameter 'index'. page_zip_parse_write_header(): Check for !page_zip only if page != NULL. page_zip_compress_write_log(), page_zip_parse_compress(): Omit some fields in the page header. Omit the unused bytes between the modification log and the page trailer. parse_or_apply_log_rec_body(): Remove a bogus debug assertion.	20 years ago
marko	64678b8bc9	branches/zip: btr_page_split_and_insert(): Implement fallbacks for page_move_rec_list_start() and page_move_rec_list_end(). Relax the conditions on insert_will_fit if page_zip is set. page_delete_rec_list_start(): Make public. page_zip_copy(): Clear REC_INFO_MIN_REC_FLAG if FIL_PAGE_PREV != FIL_NULL.	20 years ago
marko	9c7913d92a	branches/zip: btr_compress(): When merging a compressed page to the right, set the FIL_PAGE_PREV field of merge_page to FIL_NULL before copying the records in order not to break the assumption of page_zip_compress() that min_rec_mark is always set on the first user record of a non-leaf page whose FIL_PAGE_PREV field is FIL_NULL, and never otherwise.	20 years ago
marko	1d406a014d	branches/zip: Fix a bug that was triggered during purge. btr_compress(): Defer any tree modifications until the records have successfully been copied. row_purge_remove_sec_if_poss_low(): Simplify the setting of the return status.	20 years ago
marko	27d21c0f89	branches/zip: Remove a potential assertion failure. btr_lift_page_up(): If page_copy_rec_list_end() fails, resort to page_zip_copy(). page_zip_copy(): Validate the copy of the page.	20 years ago
marko	3b21e1478b	branches/zip: After merge fix, and cleanup. btr_validate_level(): Add missing parameter to added buf_page_print() calls. btr_root_raise_and_insert(): Replace low-level code with page_zip_copy(). page_zip_copy(): New function to copy the data payload of a compressed page, byte for byte. The file page header and trailer are not copied, to avoid overwriting the fields FIL_PAGE_OFFSET, FIL_PAGE_PREV and FIL_PAGE_NEXT.	20 years ago
marko	24dce67db4	branches/zip: Merge revisions 558:560 from trunk.	20 years ago
marko	5073bb5015	branches/zip: btr_compress(): Do not modify the node pointer until the records have successfully been copied.	20 years ago
marko	aa852a3b72	branches/zip: Remove GCC 4.0.4 warnings from make AM_CFLAGS='-std=c89 -Wall -W -pedantic'	20 years ago
marko	3547f43d22	branches/zip: Fix bugs. btr_root_raise_and_insert(): When copying root to new_page byte for byte, restore the page number of new_page afterwards. buf_flush_init_for_writing(): For FIL_PAGE_INDEX, write the page number and space id also to the uncompressed page.	20 years ago
marko	b829657046	branches/zip: Fix bugs triggered by running out of space. btr_root_raise_and_insert(): If page_copy_rec_list_end() fails, copy the pages byte for byte. page_zip_compress(): Ensure that the uncompressed storage area will fit on the compressed page.	20 years ago
marko	f118a9c19f	branches/zip: Prepare for writing compressed and reading pages. buf_page_print(): Print also compressed pages. Add parameter zip_size. buf_flush_init_for_writing(): Stamp the fields on a compressed B-tree index page. Add the header field FIL_PAGE_ZBLOB_SPACE_ID as an alias of FIL_PAGE_PREV. page_zip_calc_checksum(): New function. page_zip_compress(): Avoid copying the fields that are written in buf_flush_init_for_writing(). page_zip_header_cmp(): New function for comparing those fields of the page header that will not be written in buf_flush_init_for_writing().	20 years ago
marko	5d591705bb	branches/zip: btr_lift_page_up(): Set level before page_zip_compress().	20 years ago
marko	ed354ce80c	branches/zip: Minor cleanup and bug fixes btr_page_reorganize_low(): Rename new_page to temp_page. btr_store_big_rec_extern_fields(): FIL_PAGE_TYPE is 2 bytes, not 4. buf_page_init(), buf_page_create(), buf_read_page_low(), buf_page_init_for_read(): Add parameter zip_size. buf_page_init_for_backup_restore(), recv_apply_log_recs_for_backup(): Enclose in #ifdef UNIV_HOTBACKUP. Enclose some debug code in #ifdef UNIV_LOG_REPLICATE. page_zip_write_header_log(): Replace page_zip with a pointer to the uncompressed page. page_zip_write_rec(): Relax an assertion about blob_no + n_ext. page_copy_rec_list_to_created_page_write_log(): Allow logging to be disabled.	20 years ago
marko	0c4dfda3be	branches/zip: Merge revisions 265:459 from trunk.	20 years ago
marko	f119108ff3	branches/zip: Add the redo log type MLOG_ZIP_PAGE_COMPRESS. Remove MLOG_ZIP_LIST_START_COPY and MLOG_ZIP_LIST_END_COPY. btr_compress(): Simplify a debug assertion. page_zip_compress_write_log(), page_zip_parse_compress(): New functions. page_cur_parse_insert_rec(): Simplify the code. page_parse_create_zip(): Removed. page_create_zip(), page_copy_rec_list_end(), page_copy_rec_list_start(): Invoke page_zip_compress_write_log().	20 years ago
marko	c65c50ae69	branches/zip: Minor cleanup. Remove MLOG_ZIP_ROOT_RAISE. btr_page_create(): Remove parameters "prev" and "next". The pointers to adjacent B-tree pages will be set in the caller before any user records are inserted. Remove the redo log entry type MLOG_ZIP_ROOT_RAISE, since btr_root_raise_and_insert() will not defer modifications to the compressed page. btr_attach_half_pages(): Add parameter new_page_zip.	20 years ago
marko	9b6200978d	branches/zip: Replace the redo log entry types MLOG_ZIP_COMPRESS and MLOG_ZIP_DECOMPRESS with higher-level entry types. Implement the logging and crash recovery of MLOG_ZIP_PAGE_CREATE. page_create_zip(): New function for creating a compressed B-tree page. page_parse_create_zip(): New function for applying a MLOG_ZIP_PAGE_CREATE redo log record. btr_page_create(): Remove the prototype. Add parameters page_zip, level, prev, and next. btr0btr.c: Eliminate page_zip_compress() calls where possible. page_zip_alloc(), page_zip_compress(), page_zip_decompress(), page_zip_clear_rec(): Remove parameter mtr. recv_parse_or_apply_log_rec_body(): Handle MLOG_ZIP_PAGE_CREATE. Add TODO comments for the other added redo log entry types.	20 years ago
marko	b4fe38d5f4	branches/zip: btr_lift_page_up(): Remove return value; assume that the operation always succeeds.	20 years ago
marko	7b57df2298	branches/zip: Minor cleanup. Replace btr_page_get_level() with page_is_leaf() where possible. row_purge_upd_exist_or_extern(): Remove obsolete TODO comment. dtuple_convert_big_rec(): Replace a flag variable with goto.	20 years ago
marko	f4a69e0185	branches/zip: Fix some bugs btr_page_split_and_insert(): Avoid dereferencing pointers to garbage on the old page. btr_cur_pessimistic_insert(): Pass pointer to big_rec_vec to btr_cur_optimistic_insert(). trx_undo_prev_version_build(): Only invoke rec_set_field_extern_bits() if n_ext_vect > 0. row_ins_index_entry_low(): Simplify a debug assertion. page_copy_rec_list_end_no_locks(): Make the loop slightly more readable. page_delete_rec_list_end(): Delete records on compressed pages one by one.	20 years ago
marko	6ba1aed1d6	branches/zip: Minor improvements btr_page_get_father_for_rec(): Remove redundant assertion. Add UNIV_UNLIKELY to an assertion-like test. btr_validate_level(): Add debug assertions on page_zip_validate(). page_zip_compress(): Remove bogus assertion. page_zip_write_rec(): Assert that the record written is neither delete-marked nor deleted.	20 years ago
marko	9d135b3069	branches/zip: Make test-insert --small-test pass. btr_compress(): Pass the correct page_zip to btr_node_ptr_set_child_page_no(). page_mem_free(): Remove parameter mtr. Do not call page_zip_clear_rec() here. page_cur_delete_rec(): Call page_zip_clear_rec() here. Decrement PAGE_N_RECS only after calling page_mem_free(). Assert page_zip_validate().	20 years ago
marko	4ea9fe182f	branches/zip: Fix various bugs. btr_root_raise_and_insert(): Because btr_page_set_level() must not change level from non-zero to zero on compressed pages, invoke btr_page_set_level() with page_zip==NULL and compress the entire root page after creating it from the scratch. btr_attach_half_pages(): Simplify the computation of lower_page_zip and upper_page_zip. Invoke btr_node_ptr_set_child_page_no() with the correct page_zip. page0page.h: Add __attribute__((const)) to functions testing for infimum or supremum. page_zip_dir_delete(): Note that the third parameter may be NULL. Correct offset errors. page_zip_available(): Use n_heap instead of n_recs. page_zip_dir_find(), page_zip_dir_find_free(): Fix off-by-one error. page_zip_fields_encode(), page_zip_fields_decode(): Encode and decode index->n_nullable for non-leaf pages. page_zip_apply_log(): Write REC_NEW_HEAP_NO before calling rec_offs_make_valid(). page_zip_write_node_ptr(): Correct off-by-one error. page_cur_search_with_match(): Make use of page_is_leaf(). page_dir_add_slots(): Replaced with page_dir_add_slot(). Use memmove().	20 years ago
marko	4e22f34042	branches/zip: btr_page_reorganize_low(): Assert page_zip_validate() before and after the operation.	20 years ago
marko	7f2d91cba9	branches/zip: Fix some bugs in incremental compression. btr_create(): page_zip_compress() returns FALSE on failure. page_zip_write_header(): Write to page_zip->data[] instead of page_zip[]. buf_flush_init_for_writing(): Add parameter page_zip and set the fields also in the header of the compressed page. btr_cur_search_to_nth_level(): Add ut_ad() on page_zip_validate().	20 years ago
marko	a71a1e9c08	branches/zip: Make page_delete_rec_list_start() work on compressed pages, now that deletion of records on compressed pages is guaranteed to succeed.	20 years ago
marko	40b0bf7807	branches/zip: Merge revisions 236:247 from trunk.	20 years ago
marko	747c8fad44	branches/zip: Merge revisions 200:236 from trunk.	20 years ago
marko	47da8abc14	branches/zip: Try to synchronize the updates of uncompressed and compressed pages. btr_root_raise_and_insert(): Distinguish root_page_zip and new_page_zip. btr_cur_set_ownership_of_extern_field(): Do not log the write on the uncompressed page if it will be logged for page_zip. lock_rec_insert_check_and_lock(), lock_sec_rec_modify_check_and_lock(): Update the max_trx_id field also on the compressed page. mlog_write_ulint(): Add UNIV_UNLIKELY hints. Remove trailing white space. mlog_log_string(): Remove trailing white space. rec_set_field_extern_bits(): Remove parameter mtr, as the write will either occur in the heap, or it will be logged at a higher level. recv_parse_or_apply_log_rec_body(), page_zip_write_header(): Add log record type MLOG_ZIP_WRITE_HEADER. page_header_set_field(): Pass mtr=NULL to page_zip_write_header(). page_header_reset_last_insert(): Pass mtr to page_zip_write_header(). btr_page_set_index_id(), btr_page_set_level(), btr_page_set_next(), btr_page_set_prev(): Pass mtr to page_zip_write_header(). row_upd_rec_sys_fields(): Pass mtr=NULL to page_zip_write_trx_id() and page_zip_write_roll_ptr(), since the write will be logged at a higher level. page_zip_write_header(): Add parameter mtr. page_zip_write_header_log(): New function. Remove rec_set_nth_field_extern_bit(). Make rec_set_nth_field_extern_bit_old() static. Rename rec_set_nth_field_extern_bit_new() to rec_set_field_extern_bits_new() and make it static. row_ins_index_entry_low(): Remove bogus TODO comment.	20 years ago
marko	1b7710af93	branches/zip: Implement the compression of BLOB columns. This has not been extensively tested yet, because some other part of the code breaks in "ibtestblob". btr_free_page_low(): Add parameters "space" and "page_no", because they are omitted from compressed BLOB pages. btr0cur.c: Implement the compression and decompression of BLOB columns, enabled at compile-time (#define ZIP_BLOB TRUE) for now. btr_rec_free_externally_stored_fields(), btr_copy_externally_stored_field(): Made static mlog_log_string(): New function, split from mlog_write_string(), allows to avoid a dummy memcpy() of compressed BLOB pages.	20 years ago
marko	4b3be43c2a	branches/zip: Remove in-place updates of the "external storage" flag of records. The flags may only be updated in heap-allocated copies of records. btr_root_raise_and_insert(), btr_page_split_and_insert(), btr_cur_insert_if_possible(), btr_cur_optimistic_insert(), btr_cur_pessimistic_insert(), page_cur_tuple_insert(), page_cur_insert_rec_low(): Add parameters "ext" and "n_ext". dtuple_convert_big_rec(): Make parameter "ext" const.	20 years ago

1 2

59 Commits (44e33c235fda3772a942cd342b78c585b5c324dd)