mariadb

Tree: d1ef07b308

Author	SHA1	Message	Date
marko	d1ef07b308	branches/zip: Check that page_zip->data is defined, not page_zip itself.	18 years ago
marko	589393da83	branches/zip: Improve Valgrind instrumentation. btr_cur_optimistic_insert(): On compressed tablespaces, check that both the compressed and the uncompressed page are completely initialized in the beginning of the function. page_zip_compress(): After successful compression, check that the compressed page is completely initialized.	18 years ago
marko	43becedf54	branches/zip: Cast void* pointers to byte* when doing pointer arithmetics.	18 years ago
marko	e7267909d7	branches/zip: Initialize dfield_t::ext as soon as possible. This should fix the bugs introduced in r1591. row_rec_to_index_entry_low(): Clear "n_ext". Do not allow it to be NULL. Add const qualifier to dict_index_t*. row_rec_to_index_entry(): Add the parameters "offsets" and "n_ext". btr_cur_optimistic_update(): Add an assertion that there are no externally stored columns. Remove the unreachable call to btr_cur_unmark_extern_fields() and the preceding unnecessary call to rec_get_offsets(). btr_push_update_extern_fields(): Remove the parameters index, offsets. Only report the additional externally stored columns of the update vector. row_build(), trx_undo_rec_get_partial_row(): Flag externally stored columns also with dfield_set_ext(). rec_copy_prefix_to_dtuple(): Assert that there are no externally stored columns in the prefix. row_build_row_ref(): Note and assert that the index is a secondary index, and assert that there are no externally stored columns. row_build_row_ref_fast(): Assert that there are no externally stored columns. rec_offs_get_n_alloc(): Expose the function. row_build_row_ref_in_tuple(): Assert that there are no externally stored columns in a record of a secondary index. row_build_row_ref_from_row(): Assert that there are no externally stored columns. row_upd_check_references_constraints(): Add the parameter offsets, to avoid a redundant call to rec_get_offsets(). row_upd_del_mark_clust_rec(): Add the parameter offsets. Remove duplicated code. row_ins_index_entry_set_vals(): Copy the external storage flag. sel_pop_prefetched_row(): Assert that there are no externally stored columns. row_scan_and_check_index(): Copy offsets to a temporary heap across the invocation of row_rec_to_index_entry().	18 years ago
marko	c6f5ea288a	branches/zip: btr_push_update_extern_fields(): Add parameter "index" and use it for flagging externally stored columns in the data tuple. The data tuple contains the same columns as the clustered index record, but in a different order. This error was introduced in r1591. TODO: the assertion ut_ad(!dfield_is_ext()) may fail in btr_cur_pessimistic_update().	18 years ago
marko	46b7cec164	branches/zip: btr_cur_mark_dtuple_inherited_extern(): Fix the loop condition that was broken in r1591. Spotted by Heikki and Vasil.	18 years ago
marko	2561797bb9	branches/zip: On compressed pages, always update the insert buffer bitmap. Do not assume anything about the contents of the bitmap. ibuf_update_free_bits_low(): Use this function only for uncompressed pages. Remove the parameter zip_size. This function avoids latching the bitmap page and updating the bitmap when the bits do not change. ibuf_update_free_bits_zip(): New function based on ibuf_update_free_bits_low(), for use on compressed pages. Remove the parameter max_insert_size that was used for computing the before image of the free bits. Always update the bitmap. ibuf_index_page_calc_free_zip(): New function, factored out from ibuf_index_page_calc_free(). ibuf_update_free_bits_if_full(): Document that this function must only be invoked on uncompressed pages. Add a debug assertion about this.	18 years ago
marko	2ddbc912e7	branches/zip: Silence most GCC 4.2.1 warnings about const pointers. For some reason, GCC 4.2.1 ignores casts (for removing constness) in calls to inline functions. page_align(), ut_align_down(): Make the parameter const void*, but still return a non-const pointer. This is ugly, but these functions cannot be replaced with a const-preserving macro in a portable way, given that the pointer argument is not always pointing to bytes. buf_block_get_page_zip(): Implement as a const-preserving macro. buf_frame_get_page_zip(), buf_block_align(): Add const qualifiers. lock_rec_get_prev(): Silence GCC 4.2.1 warnings. mlog_write_initial_log_record(), mlog_write_initial_log_record_fast(), mtr_memo_contains(): Add const qualifier to the pointer. page_header_get_ptr(): Rewrite as page_header_get_offs(), and implement as a macro that calls this function.	18 years ago
marko	3877f6910f	branches/zip: Define the macro rec_offs_init() and use it for initializing offsets_[] arrays, as suggested by Vasil. rec_offs_set_n_alloc(): Declare as a public function. Assert that n_alloc > REC_OFFS_HEADER_SIZE. rec_offs_get_n_alloc(): Assert that n_alloc > REC_OFFS_HEADER_SIZE.	18 years ago
marko	c09dd214be	branches/zip: Add const qualifiers to the upd_t* parameters of some functions.	18 years ago
marko	8634d343f7	branches/zip: Rename mem_heap_calloc() and mem_calloc() to mem_heap_zalloc() and mem_zalloc(), because calloc() in the C runtime library takes two size parameters, not one. mem_heap_zalloc(): Add debug assertions. Document that the return value is never NULL.	18 years ago
marko	f68d3656dc	branches/zip: Use mem_calloc and mem_heap_calloc when possible. row_ext_create(): After a memset() inside UNIV_DEBUG, flag the memory uninitialized with UNIV_MEM_ALLOC().	18 years ago
marko	e507ea0dd4	branches/zip: btr_cur_mark_dtuple_inherited_extern(): Initialize len. This was broken in r1591.	18 years ago
marko	632ec54002	branches/zip: Make merge sort handle externally stored columns. Some things still fail in innodb-index.test, and there seems to be a race condition (data dictionary lock wait) when running with --valgrind. dfield_t: Add an "external storage" flag, dfield->ext. dfield_is_null(), dfield_is_ext(), dfield_set_ext(), dfield_set_null(): New functions. dfield_copy(), dfield_copy_data(): Add const qualifiers, fix in/out comments. data_write_sql_null(): Use memset(). big_rec_field_t: Replace byte* data with const void* data. ut_ulint_sort(): Remove. upd_field_t: Remove extern_storage. upd_node_t: Replace ext_vec, n_ext_vec with n_ext. row_merge_copy_blobs(): New function. row_ins_index_entry(): Add the parameter "ibool foreign" for suppressing foreign key checks during fast index creation or when inserting into secondary indexes. btr_page_insert_fits(): Add const qualifiers. btr_cur_add_ext(), upd_ext_vec_contains(): Remove. dfield_print_also_hex(), dfield_print(): Replace if...else if with switch. Observe dfield_is_ext().	19 years ago
marko	96f554c52a	branches/zip: btr_rec_copy_externally_stored_field(): Add const qualifier to rec_t*. Remove the ut_ad(rec_offs_validate()), because this function will be called from row0merge.c on a record that lacks the REC_N_NEW_EXTRA_BYTES.	19 years ago
marko	7e687905be	branches/zip: Add some const qualifiers, mainly to upd_t*. upd_get_n_fields(), upd_get_nth_field(): Add const qualifiers.	19 years ago
marko	efb7461351	branches/zip: btr_cur_optimistic_insert(): Set the insert buffer free bits exactly. Rename the local variable "ulint level" to "ibool leaf". Document that if the function returns DB_SUCCESS on a compressed page that is covered by the insert buffer, the mini-transaction must be committed before latching any further pages. Verify that this is the case on all execution paths.	19 years ago
marko	382cb9fdf1	branches/zip: Document and obey the rules for modifying the free bits in the insert buffer bitmap. ibuf_set_free_bits_func(): Never disable redo logging. ibuf_update_free_bits_zip(): Remove. btr_page_reorganize_low(), page_zip_reorganize(): Do not update the insert buffer bitmap. Instead, document that callers will have to take care of it, and adapt the callers. btr_compress(): On error, reset the insert buffer free bits. btr_cur_insert_if_possible(): Do not modify the insert buffer bitmap. btr_compress(), btr_cur_optimistic_insert(): On compressed pages, reset the insert buffer bitmap. Document why. btr_cur_update_alloc_zip(): Document why it is necessary and sufficient to reset the insert buffer free bits. btr_cur_update_in_place(), btr_cur_optimistic_update(), btr_cur_pessimistic_update(): Update the free bits in the same mini-transaction. Document that the mini-transaction must be committed before latching any further pages. Verify that this is the case in all execution paths. row_ins_sec_index_entry_by_modify(), row_ins_clust_index_entry_by_modify(), row_undo_mod_clust_low(): Because these functions call btr_cur_update_in_place(), btr_cur_optimistic_update(), or btr_cur_pessimistic_update(), document that the mini-transaction must be committed before latching any further pages. Verify that this is the case in all execution paths.	19 years ago
marko	4df65a761e	branches/zip: ibuf_set_free_bits_func(): Disable redo logging when crash recovery is in progress. This avoids a hang when btr_parse_page_reorganize(), called from an I/O handler thread, attempts to acquire log_sys->mutex while it is being held by the main thread (the one that runs innobase_init()). This change was committed accidentally. It may be unsafe to clear mtr.modifications, because buf_page_release() at mtr_commit() may forget to put modified pages to the flush list. Cleanup: Remove the "type" parameter from many ibuf functions. Let the caller check that !dict_index_is_clust(). This should avoid function calls and register spilling. ibuf_set_free_bits_func(), ibuf_set_free_bits(): Remove the parameter "type". ibuf_reset_free_bits_with_type(): Rename to ibuf_reset_free_bits(). Remove the parameter "type". ibuf_update_free_bits_if_full(), ibuf_update_free_bits_zip(), ibuf_update_free_bits_low(), ibuf_update_free_bits_for_two_pages_low(): Remove the parameter "index".	19 years ago
marko	a369b00981	branches/zip: btr_cur_pessimistic_update(): Add parameter heap. Previously, when big_rec was returned, the fields would point to freed memory. The memory heap was allocated locally, and the data tuple was allocated from the heap, and the big_rec would point to some fields in the data tuple. row_ins_clust_index_entry_by_modify(): Add parameter heap, for the same reason.	19 years ago
marko	94d4f12919	branches/zip: Minor cleanup. btr_rec_free_updated_extern_fields(): Remove the parameter do_not_free_inherited, which is always passed as TRUE. btr_cur_unmark_extern_fields(): Invoke rec_offs_any_extern(). btr_cur_unmark_dtuple_extern_fields(): Remove a local variable.	19 years ago
marko	5f44e6b308	branches/zip: ibuf_update_free_bits_if_full(): Remove the zip_size parameter. Add ibuf_update_free_bits_zip() for compressed pages.	19 years ago
marko	abc7f6c997	btr_cur_optimistic_insert(): When inserting into a compressed page, pass max_ins_size=UNIV_PAGE_SIZE and increase=ULINT_UNDEFINED to ibuf_update_free_bits_if_full(). Otherwise, a bogus assertion failure may occur when the page is recompressed and there is more space available in the modification log after inserting the record.	19 years ago
marko	d32cd9647b	branches/zip: Note that page_cur_tuple_insert() can fail without attempting to reorganize a compressed page. This mistake was made in r1308.	19 years ago
marko	d52f32b31f	branches/zip: Prepare for a negative return from page_zip_max_ins_size().	19 years ago
marko	71cbde3b08	branches/zip: btr_cur_insert_if_possible(): Update the free bits on compressed secondary index pages after attempting the insert. btr_cur_update_alloc_zip(): Reset the insert buffer free bits if there is insufficient space available on secondary index pages. Do not update the bits after successful operation. btr_cur_update_in_place(): Update the free bits in the index buffer. btr_cur_optimistic_update(): First check rec_offs_any_extern(), because checking it is cheaper than checking the "external storage" flags of the update vector. Update the insert buffer free bits in any case after successfully calling btr_cur_update_alloc_zip().	19 years ago
marko	62db6d6b37	branches/zip: Update the insert buffer free bits when recompressing a page during update-in-place. page_zip_alloc(): Rename to btr_cur_update_alloc_zip(). Invoke ibuf_update_free_bits_if_full().	19 years ago
marko	0f792cb278	branches/zip: Many places: Avoid re-reorganizing compressed pages after failing insert. Reorganization will have been attempted in page_cur_tuple_insert() or page_cur_rec_insert(). page_zip_reorganize(): Recompute the insert buffer free bits for leaf pages of secondary indexes. ibuf_data_enough_free_for_insert(): Simplify.	19 years ago
marko	cef74ef732	branches/zip: Fix bugs related to the insert buffering of compressed tablespaces. btr_page_reorganize_low(): Recompute the insert buffer free bits for compressed pages belonging to a non-clustered index. btr_cur_optimistic_insert(): Determine if the page was reorganized by page_cur_tuple_insert(). Do not attempt to reorganize compressed pages, because that will be attempted by page_cur_tuple_insert().	19 years ago
marko	92193389c3	branches/zip: btr_cur_optimistic_insert(): If btr_page_reorganize() fails, reset the insert buffer free bits for the page.	19 years ago
marko	efd79c7a86	branches/zip: Enable the insert buffer on compressed tablespaces. page_zip_max_ins_size(): New function. btr_cur_optimistic_insert(), btr_cur_optimistic_delete(), btr_page_split_and_insert(), btr_compress(): Do not update the ibuf free bits for non-leaf pages or pages belonging to a clustered index. The insert buffer only covers operations on leaf pages of secondary indexes. For pages covered by the insert buffer, limit the max_ins_size to page_zip_max_ins_size(). buf_page_get_gen(): Merge the insert buffer after decompressing the page. buf_page_io_complete(): Relax the assertion about ibuf_count. For compressed-only pages, the insert buffer merge takes place in buf_page_get_gen(). ibuf_index_page_calc_free_bits(), ibuf_index_page_calc_free_from_bits(), ibuf_index_page_calc_free(), ibuf_update_free_bits_if_full(), ibuf_update_free_bits_low(), ibuf_update_free_bits_for_two_pages_low(), ibuf_set_free_bits_low(): Add the parameter zip_size. Limit the maximum insert size to page_zip_max_ins_size().	19 years ago
marko	9b2643705a	branches/zip: btr_cur_optimistic_insert(): After dtuple_convert_big_rec(), invoke btr_cur_add_ext() so that rec_size will be computed correctly. Prepare to free the memory heap when handling errors.	19 years ago
marko	36734f3420	branches/zip: btr_cur_optimistic_insert(): Optimize some tests, eliminate some local variables, and add branching hints.	19 years ago
marko	6e2c59d421	branches/zip: Make zlib use InnoDB memory heaps when processing BLOBs. page_zip_set_alloc(): New function, to configure zlib to use a memory heap. btr_store_big_rec_extern_fields(): Reduce memLevel, so that a heap of 256 kilobytes will suffice. Use page_zip_set_alloc(). btr_copy_externally_stored_field_prefix_low(): Use page_zip_set_alloc(). page_zip_compress(), page_zip_decompress(): Use page_zip_set_alloc().	19 years ago
marko	adbd5c3a85	branches/zip: When retrieving compressed BLOBs, avoid allocating uncompressed page frames. buf_page_get_zip(), buf_page_release_zip(): New functions, used by btr_copy_zblob_prefix(). btr_copy_zblob_prefix(): Do not call inflateEnd().	19 years ago
marko	ffc0bc3eaf	branches/zip: Free buffer blocks that are no longer needed for BLOB storage. btr_blob_free(): New function to commit a mini-transaction and to free an uncompressed BLOB block, or the entire block. btr_store_big_rec_extern_fields(): Replace the existing code with btr_blob_free(). The old code may have contained a race condition. btr_free_externally_stored_field(): Completely free the buffer blocks allocated for the freed BLOB.	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	fd687bbedd	branches/zip: btr_cur_pessimistic_delete(): Correct a comment.	19 years ago
marko	ccbb93c016	branches/zip: btr_copy_externally_stored_field_prefix_low(): Split the code to subroutines. btr_copy_blob_prefix(): New function: copy the prefix of the externally stored part of an uncompressed BLOB. btr_copy_zblob_prefix(): New function: copy the prefix of the externally stored part of a compressed BLOB. btr_blob_get_part_len(), btr_blob_get_next_page_no(): Add const qualifier to the parameter.	19 years ago
marko	631a11391e	branches/zip: btr0cur.c: Add missing #include "buf0lru.h" that should have been added in r1218.	19 years ago
marko	ccd2090964	branches/zip: btr_store_big_rec_extern_fields(): Release the uncompressed page frame to save memory.	19 years ago
marko	0d7111c9cd	branches/zip: page_zip_des_t: Rename "size" to "ssize" and reduce the storage size from 16 to 3 bits. page_zip_get_size(), page_zip_set_size(): New functions. Replace direct references to page_zip_des_t:size with calls to buf_block_get_zip_size(), page_zip_get_size(), and page_zip_set_size().	19 years ago
marko	97c15d9fe5	branches/zip: When shrinking the buffer pool, disable and purge the adaptive hash index, because it might occupy the chunk we would like to free. TODO: In btr_search_check_free_space_in_heap(), release the block if btr_search_latch is not immediately available. buf_pool_shrink(): Split from buf_pool_resize(). btr_search_disabled: New variable, similar to srv_use_adaptive_hash_indexes that was removed earlier. btr_search_disable(): New function: disable and purge the adaptive hash index. btr_search_enable(): New function: enable the adaptive hash index. ha_clear(): New function: Empty a hash table and free the memory heaps.	19 years ago
marko	620f54ee69	branches/zip: btr_store_big_rec_extern_fields(): Remove the incomplete statement that was accidentally checked in in r1022.	19 years ago
marko	60e9ce2fe2	btr_store_big_rec_extern_fields(): Write the (space_id, page_no) of the record on every compressed BLOB page header, so that compressed BLOBs can be relocated or the chain of BLOB pages can be validated.	19 years ago
marko	89bacf3402	branches/zip: Remove support for AWE (Intel PAE on Win32). Removal of the variable innobase_buffer_pool_awe_mem_mb requires coordination with MySQL AB.	19 years ago
marko	92f2a6801f	branches/zip: btr_store_big_rec_extern_fields(): Replace page_get_page_no(page_align(field_ref)) calls with a local variable rec_page_no = buf_block_get_page_no(rec_block).	19 years ago
marko	0d6c2414a7	branches/zip: Remove a few buf_block_align() calls from debug builds. btr_check_node_ptr(): Replace page_t* parameter with buf_block_t*. btr_free_externally_stored_field(): Add const qualifier to rec. Remove an explicit buf_block_align() call, but replace an mtr_memo_contains() with mtr_memo_contains_page(). row_upd_rec_sys_fields(): Reorder an assertion containing buf_block_align() so that the costly call can be avoided in some cases.	19 years ago
marko	c1ffbbd90f	branches/zip: Remove all references to buf_block_align() except those from the adaptive hash index [btr_search_guess_on_hash() and btr_search_validate()]. Some references to buf_block_align() remain in debug builds. btr_store_big_rec_extern_fields(): Add the parameter rec_block. page_rec_get_next_low(): Do not assume that the page has been allocated from the buffer pool when printing the diagnostic information. page_cur_insert_rec_low(): Replace the parameter page_zip_des_t* page_zip with the parameter buf_block_t* block.	19 years ago
marko	438cb8a6c1	branches/zip: Remove all buf_block_align() calls from lock0lock.c. Replace all page_t* parameters with buf_block_t, and replace many rec_t parameters with heap_no. This eliminates also many rec_get_heap_no() calls, which became more expensive with the introduction of ROW_FORMAT=COMPACT in MySQL/InnoDB 5.0.3. page_rec_get_heap_no(), lock_get_min_heap_no(): New functions.	19 years ago

1 2 3

138 Commits (d1ef07b30845f4b80e5e19322c500c558d9dfc15)