diff options
Diffstat (limited to 'storage/innobase/include/page0page.ic')
| -rw-r--r-- | storage/innobase/include/page0page.ic | 54 |
1 files changed, 24 insertions, 30 deletions
diff --git a/storage/innobase/include/page0page.ic b/storage/innobase/include/page0page.ic index 781ad029e87..e73e547e92b 100644 --- a/storage/innobase/include/page0page.ic +++ b/storage/innobase/include/page0page.ic @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 1994, 2012, Oracle and/or its affiliates. All Rights Reserved. +Copyright (c) 1994, 2011, Oracle and/or its affiliates. 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 @@ -136,7 +136,7 @@ page_header_set_field( ut_ad(field != PAGE_N_HEAP || (val & 0x7fff) < UNIV_PAGE_SIZE); mach_write_to_2(page + PAGE_HEADER + field, val); - if (UNIV_LIKELY_NULL(page_zip)) { + if (page_zip) { page_zip_write_header(page_zip, page + PAGE_HEADER + field, 2, NULL); } @@ -211,7 +211,7 @@ page_header_reset_last_insert( { ut_ad(page && mtr); - if (UNIV_LIKELY_NULL(page_zip)) { + if (page_zip) { mach_write_to_2(page + (PAGE_HEADER + PAGE_LAST_INSERT), 0); page_zip_write_header(page_zip, page + (PAGE_HEADER + PAGE_LAST_INSERT), @@ -233,8 +233,7 @@ page_is_comp( /*=========*/ const page_t* page) /*!< in: index page */ { - return(UNIV_EXPECT(page_header_get_field(page, PAGE_N_HEAP) & 0x8000, - 0x8000)); + return(page_header_get_field(page, PAGE_N_HEAP) & 0x8000); } /************************************************************//** @@ -345,10 +344,10 @@ page_rec_is_user_rec_low( #endif ut_ad(offset <= UNIV_PAGE_SIZE - PAGE_EMPTY_DIR_START); - return(UNIV_LIKELY(offset != PAGE_NEW_SUPREMUM) - && UNIV_LIKELY(offset != PAGE_NEW_INFIMUM) - && UNIV_LIKELY(offset != PAGE_OLD_INFIMUM) - && UNIV_LIKELY(offset != PAGE_OLD_SUPREMUM)); + return(offset != PAGE_NEW_SUPREMUM + && offset != PAGE_NEW_INFIMUM + && offset != PAGE_OLD_INFIMUM + && offset != PAGE_OLD_SUPREMUM); } /************************************************************//** @@ -363,8 +362,8 @@ page_rec_is_supremum_low( ut_ad(offset >= PAGE_NEW_INFIMUM); ut_ad(offset <= UNIV_PAGE_SIZE - PAGE_EMPTY_DIR_START); - return(UNIV_UNLIKELY(offset == PAGE_NEW_SUPREMUM) - || UNIV_UNLIKELY(offset == PAGE_OLD_SUPREMUM)); + return(offset == PAGE_NEW_SUPREMUM + || offset == PAGE_OLD_SUPREMUM); } /************************************************************//** @@ -379,8 +378,7 @@ page_rec_is_infimum_low( ut_ad(offset >= PAGE_NEW_INFIMUM); ut_ad(offset <= UNIV_PAGE_SIZE - PAGE_EMPTY_DIR_START); - return(UNIV_UNLIKELY(offset == PAGE_NEW_INFIMUM) - || UNIV_UNLIKELY(offset == PAGE_OLD_INFIMUM)); + return(offset == PAGE_NEW_INFIMUM || offset == PAGE_OLD_INFIMUM); } /************************************************************//** @@ -484,12 +482,14 @@ page_cmp_dtuple_rec_with_match( rec_offset = page_offset(rec); - if (UNIV_UNLIKELY(rec_offset == PAGE_NEW_INFIMUM) - || UNIV_UNLIKELY(rec_offset == PAGE_OLD_INFIMUM)) { + if (rec_offset == PAGE_NEW_INFIMUM + || rec_offset == PAGE_OLD_INFIMUM) { + return(1); - } - if (UNIV_UNLIKELY(rec_offset == PAGE_NEW_SUPREMUM) - || UNIV_UNLIKELY(rec_offset == PAGE_OLD_SUPREMUM)) { + + } else if (rec_offset == PAGE_NEW_SUPREMUM + || rec_offset == PAGE_OLD_SUPREMUM) { + return(-1); } @@ -731,21 +731,19 @@ page_rec_get_next_low( offs = rec_get_next_offs(rec, comp); - if (UNIV_UNLIKELY(offs >= UNIV_PAGE_SIZE)) { + if (offs >= UNIV_PAGE_SIZE) { fprintf(stderr, "InnoDB: Next record offset is nonsensical %lu" " in record at offset %lu\n" "InnoDB: rec address %p, space id %lu, page %lu\n", - (ulong)offs, (ulong) page_offset(rec), + (ulong) offs, (ulong) page_offset(rec), (void*) rec, (ulong) page_get_space_id(page), (ulong) page_get_page_no(page)); buf_page_print(page, 0, 0); ut_error; - } - - if (UNIV_UNLIKELY(offs == 0)) { + } else if (offs == 0) { return(NULL); } @@ -797,11 +795,7 @@ page_rec_set_next( ut_ad(!next || !page_rec_is_infimum(next)); ut_ad(!next || page_align(rec) == page_align(next)); - if (UNIV_LIKELY(next != NULL)) { - offs = page_offset(next); - } else { - offs = 0; - } + offs = next != NULL ? page_offset(next) : 0; if (page_rec_is_comp(rec)) { rec_set_next_offs_new(rec, offs); @@ -976,7 +970,7 @@ page_get_free_space_of_empty( /*=========================*/ ulint comp) /*!< in: nonzero=compact page layout */ { - if (UNIV_LIKELY(comp)) { + if (comp) { return((ulint)(UNIV_PAGE_SIZE - PAGE_NEW_SUPREMUM_END - PAGE_DIR @@ -1111,7 +1105,7 @@ page_mem_free( page_header_set_field(page, page_zip, PAGE_GARBAGE, garbage + rec_offs_size(offsets)); - if (UNIV_LIKELY_NULL(page_zip)) { + if (page_zip) { page_zip_dir_delete(page_zip, rec, index, offsets, free); } else { page_header_set_field(page, page_zip, PAGE_N_RECS, |