From a8b6524b149a3cfbd7d0af3bb6c3f4f68927ccf8 Mon Sep 17 00:00:00 2001 From: marko <> Date: Fri, 18 May 2007 11:01:58 +0000 Subject: [PATCH] branches/zip: Use ut_dulint_zero and ut_dulint_is_zero whenever possible. --- dict/dict0mem.c | 4 ++-- fsp/fsp0fsp.c | 28 +++++++++++----------------- lock/lock0lock.c | 3 +-- read/read0read.c | 5 ++--- row/row0undo.c | 2 +- row/row0vers.c | 2 +- trx/trx0purge.c | 2 +- trx/trx0trx.c | 4 ++-- trx/trx0undo.c | 2 +- 9 files changed, 22 insertions(+), 30 deletions(-) diff --git a/dict/dict0mem.c b/dict/dict0mem.c index 204e5cc6398..5f0bd402343 100644 --- a/dict/dict0mem.c +++ b/dict/dict0mem.c @@ -238,7 +238,7 @@ dict_mem_index_create( heap = mem_heap_create(DICT_HEAP_SIZE); index = mem_heap_alloc(heap, sizeof(dict_index_t)); - index->id = ut_dulint_create(0, 0); + index->id = ut_dulint_zero; index->heap = heap; index->type = type; @@ -257,7 +257,7 @@ dict_mem_index_create( index->cached = FALSE; index->to_be_dropped = FALSE; - index->trx_id = ut_dulint_create(0, 0); + index->trx_id = ut_dulint_zero; memset(&index->lock, 0, sizeof index->lock); #ifdef UNIV_DEBUG index->magic_n = DICT_INDEX_MAGIC_N; diff --git a/fsp/fsp0fsp.c b/fsp/fsp0fsp.c index b814007314e..f7331b8fbfb 100644 --- a/fsp/fsp0fsp.c +++ b/fsp/fsp0fsp.c @@ -1789,8 +1789,7 @@ fsp_seg_inode_page_find_used( inode = fsp_seg_inode_page_get_nth_inode( page, i, zip_size, mtr); - if (ut_dulint_cmp(mach_read_from_8(inode + FSEG_ID), - ut_dulint_zero) != 0) { + if (!ut_dulint_is_zero(mach_read_from_8(inode + FSEG_ID))) { /* This is used */ return(i); @@ -1820,8 +1819,7 @@ fsp_seg_inode_page_find_free( inode = fsp_seg_inode_page_get_nth_inode( page, i, zip_size, mtr); - if (ut_dulint_cmp(mach_read_from_8(inode + FSEG_ID), - ut_dulint_zero) == 0) { + if (ut_dulint_is_zero(mach_read_from_8(inode + FSEG_ID))) { /* This is unused */ return(i); @@ -2507,7 +2505,7 @@ fseg_alloc_free_page_low( == FSEG_MAGIC_N_VALUE); seg_id = mtr_read_dulint(seg_inode + FSEG_ID, mtr); - ut_ad(ut_dulint_cmp(seg_id, ut_dulint_zero) > 0); + ut_ad(!ut_dulint_is_zero(seg_id)); reserved = fseg_n_reserved_pages_low(seg_inode, &used, mtr); @@ -3955,9 +3953,8 @@ fsp_validate( seg_inode = fsp_seg_inode_page_get_nth_inode( seg_inode_page, n, zip_size, &mtr); - ut_a(ut_dulint_cmp( - mach_read_from_8(seg_inode + FSEG_ID), - ut_dulint_zero) != 0); + ut_a(!ut_dulint_is_zero( + mach_read_from_8(seg_inode + FSEG_ID))); fseg_validate_low(seg_inode, &mtr); descr_count += flst_get_len(seg_inode + FSEG_FREE, @@ -4002,9 +3999,8 @@ fsp_validate( seg_inode = fsp_seg_inode_page_get_nth_inode( seg_inode_page, n, zip_size, &mtr); - if (ut_dulint_cmp( - mach_read_from_8(seg_inode + FSEG_ID), - ut_dulint_zero) != 0) { + if (!ut_dulint_is_zero( + mach_read_from_8(seg_inode + FSEG_ID))) { fseg_validate_low(seg_inode, &mtr); descr_count += flst_get_len( @@ -4142,9 +4138,8 @@ fsp_print( seg_inode = fsp_seg_inode_page_get_nth_inode( seg_inode_page, n, zip_size, &mtr); - ut_a(ut_dulint_cmp( - mach_read_from_8(seg_inode + FSEG_ID), - ut_dulint_zero) != 0); + ut_a(!ut_dulint_is_zero( + mach_read_from_8(seg_inode + FSEG_ID))); fseg_print_low(seg_inode, &mtr); n_segs++; @@ -4181,9 +4176,8 @@ fsp_print( seg_inode = fsp_seg_inode_page_get_nth_inode( seg_inode_page, n, zip_size, &mtr); - if (ut_dulint_cmp( - mach_read_from_8(seg_inode + FSEG_ID), - ut_dulint_zero) != 0) { + if (!ut_dulint_is_zero( + mach_read_from_8(seg_inode + FSEG_ID))) { fseg_print_low(seg_inode, &mtr); n_segs++; diff --git a/lock/lock0lock.c b/lock/lock0lock.c index 8403ca45f76..c01ac176ae1 100644 --- a/lock/lock0lock.c +++ b/lock/lock0lock.c @@ -4054,8 +4054,7 @@ lock_release_off_kernel( ut_ad(lock_get_type(lock) & LOCK_TABLE); if (lock_get_mode(lock) != LOCK_IS - && 0 != ut_dulint_cmp(trx->undo_no, - ut_dulint_zero)) { + && !ut_dulint_is_zero(trx->undo_no)) { /* The trx may have modified the table. We block the use of the MySQL query cache for diff --git a/read/read0read.c b/read/read0read.c index 10a6e07e96a..b0373529118 100644 --- a/read/read0read.c +++ b/read/read0read.c @@ -173,8 +173,7 @@ read_view_oldest_copy_or_open_new( n = old_view->n_trx_ids; - if (ut_dulint_cmp(old_view->creator_trx_id, - ut_dulint_create(0,0)) != 0) { + if (!ut_dulint_is_zero(old_view->creator_trx_id)) { n++; } else { needs_insert = FALSE; @@ -251,7 +250,7 @@ read_view_open_now( view->creator_trx_id = cr_trx_id; view->type = VIEW_NORMAL; - view->undo_no = ut_dulint_create(0, 0); + view->undo_no = ut_dulint_zero; /* No future transactions should be visible in the view */ diff --git a/row/row0undo.c b/row/row0undo.c index cedf198e90d..b96a6472dc9 100644 --- a/row/row0undo.c +++ b/row/row0undo.c @@ -526,7 +526,7 @@ row_undo_build_dict_undo_list( } /* We will do our own deletes */ - trx->table_id = ut_dulint_create(0, 0); + trx->table_id = ut_dulint_zero; if (trx->dict_undo_list == NULL) { dict_undo_create_list(trx); diff --git a/row/row0vers.c b/row/row0vers.c index 9ae8f06f3c3..23a3e113d5e 100644 --- a/row/row0vers.c +++ b/row/row0vers.c @@ -561,7 +561,7 @@ row_vers_build_for_semi_consistent_read( mem_heap_t* heap = NULL; byte* buf; ulint err; - dulint rec_trx_id = ut_dulint_create(0, 0); + dulint rec_trx_id = ut_dulint_zero; ut_ad(dict_index_is_clust(index)); ut_ad(mtr_memo_contains_page(mtr, rec, MTR_MEMO_PAGE_X_FIX) diff --git a/trx/trx0purge.c b/trx/trx0purge.c index 2cc72a3d8be..84bd059b9dc 100644 --- a/trx/trx0purge.c +++ b/trx/trx0purge.c @@ -541,7 +541,7 @@ trx_purge_truncate_history(void) trx_purge_arr_get_biggest(purge_sys->arr, &limit_trx_no, &limit_undo_no); - if (ut_dulint_cmp(limit_trx_no, ut_dulint_zero) == 0) { + if (ut_dulint_is_zero(limit_trx_no)) { limit_trx_no = purge_sys->purge_trx_no; limit_undo_no = purge_sys->purge_undo_no; diff --git a/trx/trx0trx.c b/trx/trx0trx.c index f59497f9027..a2476af04be 100644 --- a/trx/trx0trx.c +++ b/trx/trx0trx.c @@ -127,7 +127,7 @@ trx_create( trx->must_flush_log_later = FALSE; trx->dict_operation = FALSE; - trx->table_id = ut_dulint_create(0, 0); + trx->table_id = ut_dulint_zero; trx->dict_undo_list = NULL; trx->dict_redo_list = NULL; trx->sync_cb = NULL; @@ -1774,7 +1774,7 @@ trx_print( fputs(", holds adaptive hash latch", f); } - if (ut_dulint_cmp(trx->undo_no, ut_dulint_zero) != 0) { + if (!ut_dulint_is_zero(trx->undo_no)) { newline = TRUE; fprintf(f, ", undo log entries %lu", (ulong) ut_dulint_get_low(trx->undo_no)); diff --git a/trx/trx0undo.c b/trx/trx0undo.c index c88fdcec4af..78458a4a170 100644 --- a/trx/trx0undo.c +++ b/trx/trx0undo.c @@ -1120,7 +1120,7 @@ trx_undo_truncate_start( ut_ad(mutex_own(&(rseg->mutex))); - if (0 == ut_dulint_cmp(limit, ut_dulint_zero)) { + if (ut_dulint_is_zero(limit)) { return; }