From: Jon Olav Hauglid Date: February 10 2011 10:36am Subject: bzr commit into mysql-5.5 branch (jon.hauglid:3321) Bug#43152 List-Archive: http://lists.mysql.com/commits/131004 X-Bug: 43152 Message-Id: <201102101036.p1A4UTDf012203@rcsinet13.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7685761708444630132==" --===============7685761708444630132== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///home/jh234568/repo/mysql-5.5/ based on revid:georgi.kodinov@stripped 3321 Jon Olav Hauglid 2011-02-10 Bug #43152 Assertion `bitmap_is_set_all(&table->s->all_set)' failed in handler::ha_reset This assertion could be triggered if two connections simultaneously executed two bitmap test functions on the same bitmap. For example, the assertion could be triggered if one connection executed UPDATE while a second connection executed SELECT on the same table. Even if bitmap test functions have read-only schematics and have const bitmaps as parameter, several of them modified the internal state of the bitmap. With interleaved execution of two such functions it was possible for one function to modify the state of the same bitmap that the other function had just modified. This lead to an inconsistent state and could trigger the assert. Internally the bitmap uses 32 bit words for storage. Since bitmaps can contain any number of bits, the last word in the bitmap may not be fully used. A 32 bit mask is maintained where a bit is set if the corresponding bit in the last bitmap word is unused. The problem was that several test functions applies this mask to the last word. Sometimes the mask wass negated and used to zero out the remainder of the last word and sometimes the mask wass used as-is to fill the remainder of the last word with 1's. This meant that if a function first used the negated mask and another function then used the mask as-is (or vice-versa), the first function would then get the wrong result. This patch fixes the problem by changing the implementation of 9 bitmap functions that modified the bitmap state even if the bitmap was declared const. These functions now preserve the internal state of the bitmap. This makes it possible for two connections to concurrently execute two of these functions on the same bitmap without issues. The patch also removes dead testing code from my_bitmap.c. These tests have already been moved to unittest/mysys/bitmap-t.c. Existing test coverage of my_bitmap has been extended. No MTR test case added as this would require adding several sync points to the bitmap functions. The patch has been tested with a non-deterministic test case posted on the bug report. modified: include/my_bit.h include/my_bitmap.h mysys/my_bitmap.c unittest/mysys/bitmap-t.c === modified file 'include/my_bit.h' --- a/include/my_bit.h 2010-07-23 20:18:36 +0000 +++ b/include/my_bit.h 2011-02-10 10:35:57 +0000 @@ -44,9 +44,12 @@ static inline uint my_count_bits(ulonglo #endif } -static inline uint my_count_bits_ushort(ushort v) +static inline uint my_count_bits_uint32(uint32 v) { - return _my_bits_nbits[v]; + return (uint) (uchar) (_my_bits_nbits[(uchar) v] + + _my_bits_nbits[(uchar) (v >> 8)] + + _my_bits_nbits[(uchar) (v >> 16)] + + _my_bits_nbits[(uchar) (v >> 24)]); } === modified file 'include/my_bitmap.h' --- a/include/my_bitmap.h 2011-01-11 09:07:37 +0000 +++ b/include/my_bitmap.h 2011-02-10 10:35:57 +0000 @@ -1,4 +1,4 @@ -/* Copyright (C) 2000 MySQL AB, 2009 Sun Microsystems, Inc +/* Copyright (c) 2000, 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 @@ -125,9 +125,10 @@ bitmap_is_set(const MY_BITMAP *map,uint static inline my_bool bitmap_cmp(const MY_BITMAP *map1, const MY_BITMAP *map2) { - *(map1)->last_word_ptr|= (map1)->last_word_mask; - *(map2)->last_word_ptr|= (map2)->last_word_mask; - return memcmp((map1)->bitmap, (map2)->bitmap, 4*no_words_in_map((map1)))==0; + if (memcmp(map1->bitmap, map2->bitmap, 4*(no_words_in_map(map1)-1)) != 0) + return FALSE; + return ((*map1->last_word_ptr | map1->last_word_mask) == + (*map2->last_word_ptr | map2->last_word_mask)); } #define bitmap_clear_all(MAP) \ === modified file 'mysys/my_bitmap.c' --- a/mysys/my_bitmap.c 2011-01-11 09:07:37 +0000 +++ b/mysys/my_bitmap.c 2011-02-10 10:35:57 +0000 @@ -1,4 +1,4 @@ -/* Copyright (C) 2000 MySQL AB, 2008-2009 Sun Microsystems, Inc +/* Copyright (c) 2000, 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 @@ -259,28 +259,49 @@ void bitmap_set_prefix(MY_BITMAP *map, u my_bool bitmap_is_prefix(const MY_BITMAP *map, uint prefix_size) { - uint prefix_bits= prefix_size & 0x7, res; - uchar *m= (uchar*)map->bitmap; - uchar *end_prefix= m+prefix_size/8; - uchar *end; - DBUG_ASSERT(m && prefix_size <= map->n_bits); - end= m+no_bytes_in_map(map); - - while (m < end_prefix) - if (*m++ != 0xff) - return 0; - - *map->last_word_ptr&= ~map->last_word_mask; /*Clear bits*/ - res= 0; - if (prefix_bits && *m++ != (1 << prefix_bits)-1) - goto ret; - - while (m < end) - if (*m++ != 0) - goto ret; - res= 1; -ret: - return res; + uint prefix_bits= prefix_size % 8, byte_pos, prefix_bytes; + my_bitmap_map *word_ptr= map->bitmap, last_word; + my_bitmap_map *end_prefix= word_ptr + prefix_size / 32; + uchar *byte_ptr; + DBUG_ASSERT(word_ptr && prefix_size <= map->n_bits); + + // 1: Words that should be filled with 1 + while (word_ptr < end_prefix) + if (*word_ptr++ != 0xFFFFFFFF) + return FALSE; + + // 2: Word which contains the end of the prefix (if any) + last_word= *map->last_word_ptr & ~map->last_word_mask; + if (prefix_size % 32) + { + prefix_bytes= (prefix_size - 32 * (prefix_size / 32)) / 8; + byte_ptr= (uchar*)word_ptr; + if (word_ptr == map->last_word_ptr) + byte_ptr= (uchar*)&last_word; + for (byte_pos= 0; byte_pos < prefix_bytes; byte_ptr++, byte_pos++) + if (*byte_ptr != 0xFF) + return FALSE; + if (prefix_bits) + { + if (*byte_ptr++ != (1 << prefix_bits)-1) + return FALSE; + byte_pos++; + } + for (; byte_pos < 4; byte_ptr++, byte_pos++) + if (*byte_ptr != 0) + return FALSE; + word_ptr++; + } + + // 3: Words that should be filled with 0 + while (word_ptr < map->last_word_ptr) + if (*word_ptr++ != 0) + return FALSE; + + if (word_ptr == map->last_word_ptr && last_word != 0) + return FALSE; + + return TRUE; } @@ -288,10 +309,11 @@ my_bool bitmap_is_set_all(const MY_BITMA { my_bitmap_map *data_ptr= map->bitmap; my_bitmap_map *end= map->last_word_ptr; - *map->last_word_ptr |= map->last_word_mask; - for (; data_ptr <= end; data_ptr++) + for (; data_ptr < end; data_ptr++) if (*data_ptr != 0xFFFFFFFF) return FALSE; + if ((*map->last_word_ptr | map->last_word_mask) != 0xFFFFFFFF) + return FALSE; return TRUE; } @@ -319,14 +341,17 @@ my_bool bitmap_is_subset(const MY_BITMAP map1->n_bits==map2->n_bits); end= map1->last_word_ptr; - *map1->last_word_ptr &= ~map1->last_word_mask; - *map2->last_word_ptr &= ~map2->last_word_mask; - while (m1 <= end) + while (m1 < end) { if ((*m1++) & ~(*m2++)) - return 0; + return FALSE; } - return 1; + + if ((*map1->last_word_ptr & ~map1->last_word_mask) & + ~(*map2->last_word_ptr & ~map2->last_word_mask)) + return FALSE; + + return TRUE; } /* True if bitmaps has any common bits */ @@ -339,14 +364,17 @@ my_bool bitmap_is_overlapping(const MY_B map1->n_bits==map2->n_bits); end= map1->last_word_ptr; - *map1->last_word_ptr &= ~map1->last_word_mask; - *map2->last_word_ptr &= ~map2->last_word_mask; - while (m1 <= end) + while (m1 < end) { if ((*m1++) & (*m2++)) - return 1; + return TRUE; } - return 0; + + if ((*map1->last_word_ptr & ~map1->last_word_mask) & + (*map2->last_word_ptr & ~map2->last_word_mask)) + return TRUE; + + return FALSE; } @@ -358,10 +386,12 @@ void bitmap_intersect(MY_BITMAP *map, co DBUG_ASSERT(map->bitmap && map2->bitmap); end= to+min(len,len2); - *map2->last_word_ptr&= ~map2->last_word_mask; /*Clear last bits in map2*/ while (to < end) *to++ &= *from++; + if (len >= len2) + map->bitmap[len2 - 1] &= ~map2->last_word_mask; + if (len2 < len) { end+=len-len2; @@ -451,15 +481,16 @@ void bitmap_invert(MY_BITMAP *map) uint bitmap_bits_set(const MY_BITMAP *map) -{ - uchar *m= (uchar*)map->bitmap; - uchar *end= m + no_bytes_in_map(map); +{ + my_bitmap_map *data_ptr= map->bitmap; + my_bitmap_map *end= map->last_word_ptr; uint res= 0; DBUG_ASSERT(map->bitmap); - *map->last_word_ptr&= ~map->last_word_mask; /*Reset last bits to zero*/ - while (m < end) - res+= my_count_bits_ushort(*m++); + while (data_ptr < end) + res+= my_count_bits_uint32(*data_ptr++); + /*Reset last bits to zero*/ + res+= my_count_bits_uint32(*map->last_word_ptr & ~map->last_word_mask); return res; } @@ -479,31 +510,44 @@ void bitmap_copy(MY_BITMAP *map, const M uint bitmap_get_first_set(const MY_BITMAP *map) { uchar *byte_ptr; - uint i,j,k; - my_bitmap_map *data_ptr, *end= map->last_word_ptr; + uint word_pos, byte_pos, bit_pos; + my_bitmap_map *data_ptr, *end= map->last_word_ptr, last_word; DBUG_ASSERT(map->bitmap); data_ptr= map->bitmap; - *map->last_word_ptr &= ~map->last_word_mask; - for (i=0; data_ptr <= end; data_ptr++, i++) + for (word_pos=0; data_ptr < end; data_ptr++, word_pos++) { if (*data_ptr) { byte_ptr= (uchar*)data_ptr; - for (j=0; ; j++, byte_ptr++) + for (byte_pos=0; byte_pos < 4; byte_ptr++, byte_pos++) { if (*byte_ptr) { - for (k=0; ; k++) + for (bit_pos=0; bit_pos < 8; bit_pos++) { - if (*byte_ptr & (1 << k)) - return (i*32) + (j*8) + k; + if (*byte_ptr & (1 << bit_pos)) + return (word_pos*32) + (byte_pos*8) + bit_pos; } } } } } + last_word= *map->last_word_ptr & ~map->last_word_mask; + byte_ptr= (uchar*)&last_word; + for (byte_pos=0; byte_pos < 4; byte_ptr++, byte_pos++) + { + if (*byte_ptr) + { + for (bit_pos=0; bit_pos < 8; bit_pos++) + { + if (*byte_ptr & (1 << bit_pos)) + return (word_pos*32) + (byte_pos*8) + bit_pos; + } + } + } + return MY_BIT_NONE; } @@ -511,31 +555,44 @@ uint bitmap_get_first_set(const MY_BITMA uint bitmap_get_first(const MY_BITMAP *map) { uchar *byte_ptr; - uint i,j,k; - my_bitmap_map *data_ptr, *end= map->last_word_ptr; + uint word_pos, byte_pos, bit_pos; + my_bitmap_map *data_ptr, *end= map->last_word_ptr, last_word; DBUG_ASSERT(map->bitmap); data_ptr= map->bitmap; - *map->last_word_ptr|= map->last_word_mask; - for (i=0; data_ptr <= end; data_ptr++, i++) + for (word_pos=0; data_ptr < end; data_ptr++, word_pos++) { if (*data_ptr != 0xFFFFFFFF) { byte_ptr= (uchar*)data_ptr; - for (j=0; ; j++, byte_ptr++) + for (byte_pos=0; byte_pos < 4; byte_ptr++, byte_pos++) { if (*byte_ptr != 0xFF) { - for (k=0; ; k++) + for (bit_pos=0; bit_pos < 8; bit_pos++) { - if (!(*byte_ptr & (1 << k))) - return (i*32) + (j*8) + k; + if (!(*byte_ptr & (1 << bit_pos))) + return (word_pos*32) + (byte_pos*8) + bit_pos; } } } } } + last_word= *map->last_word_ptr | map->last_word_mask; + byte_ptr= (uchar*)&last_word; + for (byte_pos=0; byte_pos < 4; byte_ptr++, byte_pos++) + { + if (*byte_ptr != 0xFF) + { + for (bit_pos=0; bit_pos < 8; bit_pos++) + { + if (!(*byte_ptr & (1 << bit_pos))) + return (word_pos*32) + (byte_pos*8) + bit_pos; + } + } + } + return MY_BIT_NONE; } @@ -557,376 +614,3 @@ void bitmap_lock_clear_bit(MY_BITMAP *ma bitmap_clear_bit(map, bitmap_bit); bitmap_unlock(map); } - -#ifdef MAIN - -uint get_rand_bit(uint bitsize) -{ - return (rand() % bitsize); -} - -bool test_set_get_clear_bit(MY_BITMAP *map, uint bitsize) -{ - uint i, test_bit; - uint no_loops= bitsize > 128 ? 128 : bitsize; - for (i=0; i < no_loops; i++) - { - test_bit= get_rand_bit(bitsize); - bitmap_set_bit(map, test_bit); - if (!bitmap_is_set(map, test_bit)) - goto error1; - bitmap_clear_bit(map, test_bit); - if (bitmap_is_set(map, test_bit)) - goto error2; - } - return FALSE; -error1: - printf("Error in set bit, bit %u, bitsize = %u", test_bit, bitsize); - return TRUE; -error2: - printf("Error in clear bit, bit %u, bitsize = %u", test_bit, bitsize); - return TRUE; -} - -bool test_flip_bit(MY_BITMAP *map, uint bitsize) -{ - uint i, test_bit; - uint no_loops= bitsize > 128 ? 128 : bitsize; - for (i=0; i < no_loops; i++) - { - test_bit= get_rand_bit(bitsize); - bitmap_flip_bit(map, test_bit); - if (!bitmap_is_set(map, test_bit)) - goto error1; - bitmap_flip_bit(map, test_bit); - if (bitmap_is_set(map, test_bit)) - goto error2; - } - return FALSE; -error1: - printf("Error in flip bit 1, bit %u, bitsize = %u", test_bit, bitsize); - return TRUE; -error2: - printf("Error in flip bit 2, bit %u, bitsize = %u", test_bit, bitsize); - return TRUE; -} - -bool test_operators(MY_BITMAP *map __attribute__((unused)), - uint bitsize __attribute__((unused))) -{ - return FALSE; -} - -bool test_get_all_bits(MY_BITMAP *map, uint bitsize) -{ - uint i; - bitmap_set_all(map); - if (!bitmap_is_set_all(map)) - goto error1; - if (!bitmap_is_prefix(map, bitsize)) - goto error5; - bitmap_clear_all(map); - if (!bitmap_is_clear_all(map)) - goto error2; - if (!bitmap_is_prefix(map, 0)) - goto error6; - for (i=0; i 128 ? 128 : bitsize; - MY_BITMAP map2_obj, map3_obj; - MY_BITMAP *map2= &map2_obj, *map3= &map3_obj; - my_bitmap_map map2buf[1024]; - my_bitmap_map map3buf[1024]; - bitmap_init(&map2_obj, map2buf, bitsize, FALSE); - bitmap_init(&map3_obj, map3buf, bitsize, FALSE); - bitmap_clear_all(map2); - bitmap_clear_all(map3); - for (i=0; i < no_loops; i++) - { - test_bit1=get_rand_bit(bitsize); - bitmap_set_prefix(map, test_bit1); - test_bit2=get_rand_bit(bitsize); - bitmap_set_prefix(map2, test_bit2); - bitmap_intersect(map, map2); - test_bit3= test_bit2 < test_bit1 ? test_bit2 : test_bit1; - bitmap_set_prefix(map3, test_bit3); - if (!bitmap_cmp(map, map3)) - goto error1; - bitmap_clear_all(map); - bitmap_clear_all(map2); - bitmap_clear_all(map3); - test_bit1=get_rand_bit(bitsize); - test_bit2=get_rand_bit(bitsize); - test_bit3=get_rand_bit(bitsize); - bitmap_set_prefix(map, test_bit1); - bitmap_set_prefix(map2, test_bit2); - test_bit3= test_bit2 > test_bit1 ? test_bit2 : test_bit1; - bitmap_set_prefix(map3, test_bit3); - bitmap_union(map, map2); - if (!bitmap_cmp(map, map3)) - goto error2; - bitmap_clear_all(map); - bitmap_clear_all(map2); - bitmap_clear_all(map3); - test_bit1=get_rand_bit(bitsize); - test_bit2=get_rand_bit(bitsize); - test_bit3=get_rand_bit(bitsize); - bitmap_set_prefix(map, test_bit1); - bitmap_set_prefix(map2, test_bit2); - bitmap_xor(map, map2); - test_bit3= test_bit2 > test_bit1 ? test_bit2 : test_bit1; - test_bit4= test_bit2 < test_bit1 ? test_bit2 : test_bit1; - bitmap_set_prefix(map3, test_bit3); - for (j=0; j < test_bit4; j++) - bitmap_clear_bit(map3, j); - if (!bitmap_cmp(map, map3)) - goto error3; - bitmap_clear_all(map); - bitmap_clear_all(map2); - bitmap_clear_all(map3); - test_bit1=get_rand_bit(bitsize); - test_bit2=get_rand_bit(bitsize); - test_bit3=get_rand_bit(bitsize); - bitmap_set_prefix(map, test_bit1); - bitmap_set_prefix(map2, test_bit2); - bitmap_subtract(map, map2); - if (test_bit2 < test_bit1) - { - bitmap_set_prefix(map3, test_bit1); - for (j=0; j < test_bit2; j++) - bitmap_clear_bit(map3, j); - } - if (!bitmap_cmp(map, map3)) - goto error4; - bitmap_clear_all(map); - bitmap_clear_all(map2); - bitmap_clear_all(map3); - test_bit1=get_rand_bit(bitsize); - bitmap_set_prefix(map, test_bit1); - bitmap_invert(map); - bitmap_set_all(map3); - for (j=0; j < test_bit1; j++) - bitmap_clear_bit(map3, j); - if (!bitmap_cmp(map, map3)) - goto error5; - bitmap_clear_all(map); - bitmap_clear_all(map3); - } - return FALSE; -error1: - printf("intersect error bitsize=%u,size1=%u,size2=%u", bitsize, - test_bit1,test_bit2); - return TRUE; -error2: - printf("union error bitsize=%u,size1=%u,size2=%u", bitsize, - test_bit1,test_bit2); - return TRUE; -error3: - printf("xor error bitsize=%u,size1=%u,size2=%u", bitsize, - test_bit1,test_bit2); - return TRUE; -error4: - printf("subtract error bitsize=%u,size1=%u,size2=%u", bitsize, - test_bit1,test_bit2); - return TRUE; -error5: - printf("invert error bitsize=%u,size=%u", bitsize, - test_bit1); - return TRUE; -} - -bool test_count_bits_set(MY_BITMAP *map, uint bitsize) -{ - uint i, bit_count=0, test_bit; - uint no_loops= bitsize > 128 ? 128 : bitsize; - for (i=0; i < no_loops; i++) - { - test_bit=get_rand_bit(bitsize); - if (!bitmap_is_set(map, test_bit)) - { - bitmap_set_bit(map, test_bit); - bit_count++; - } - } - if (bit_count==0 && bitsize > 0) - goto error1; - if (bitmap_bits_set(map) != bit_count) - goto error2; - return FALSE; -error1: - printf("No bits set bitsize = %u", bitsize); - return TRUE; -error2: - printf("Wrong count of bits set, bitsize = %u", bitsize); - return TRUE; -} - -bool test_get_first_bit(MY_BITMAP *map, uint bitsize) -{ - uint i, test_bit; - uint no_loops= bitsize > 128 ? 128 : bitsize; - for (i=0; i < no_loops; i++) - { - test_bit=get_rand_bit(bitsize); - bitmap_set_bit(map, test_bit); - if (bitmap_get_first_set(map) != test_bit) - goto error1; - bitmap_set_all(map); - bitmap_clear_bit(map, test_bit); - if (bitmap_get_first(map) != test_bit) - goto error2; - bitmap_clear_all(map); - } - return FALSE; -error1: - printf("get_first_set error bitsize=%u,prefix_size=%u",bitsize,test_bit); - return TRUE; -error2: - printf("get_first error bitsize= %u, prefix_size= %u",bitsize,test_bit); - return TRUE; -} - -bool test_get_next_bit(MY_BITMAP *map, uint bitsize) -{ - uint i, j, test_bit; - uint no_loops= bitsize > 128 ? 128 : bitsize; - for (i=0; i < no_loops; i++) - { - test_bit=get_rand_bit(bitsize); - for (j=0; j < test_bit; j++) - bitmap_set_next(map); - if (!bitmap_is_prefix(map, test_bit)) - goto error1; - bitmap_clear_all(map); - } - return FALSE; -error1: - printf("get_next error bitsize= %u, prefix_size= %u", bitsize,test_bit); - return TRUE; -} - -bool test_prefix(MY_BITMAP *map, uint bitsize) -{ - uint i, j, test_bit; - uint no_loops= bitsize > 128 ? 128 : bitsize; - for (i=0; i < no_loops; i++) - { - test_bit=get_rand_bit(bitsize); - bitmap_set_prefix(map, test_bit); - if (!bitmap_is_prefix(map, test_bit)) - goto error1; - bitmap_clear_all(map); - for (j=0; j < test_bit; j++) - bitmap_set_bit(map, j); - if (!bitmap_is_prefix(map, test_bit)) - goto error2; - bitmap_set_all(map); - for (j=bitsize - 1; ~(j-test_bit); j--) - bitmap_clear_bit(map, j); - if (!bitmap_is_prefix(map, test_bit)) - goto error3; - bitmap_clear_all(map); - } - return FALSE; -error1: - printf("prefix1 error bitsize = %u, prefix_size = %u", bitsize,test_bit); - return TRUE; -error2: - printf("prefix2 error bitsize = %u, prefix_size = %u", bitsize,test_bit); - return TRUE; -error3: - printf("prefix3 error bitsize = %u, prefix_size = %u", bitsize,test_bit); - return TRUE; -} - - -bool do_test(uint bitsize) -{ - MY_BITMAP map; - my_bitmap_map buf[1024]; - if (bitmap_init(&map, buf, bitsize, FALSE)) - { - printf("init error for bitsize %d", bitsize); - goto error; - } - if (test_set_get_clear_bit(&map,bitsize)) - goto error; - bitmap_clear_all(&map); - if (test_flip_bit(&map,bitsize)) - goto error; - bitmap_clear_all(&map); - if (test_operators(&map,bitsize)) - goto error; - bitmap_clear_all(&map); - if (test_get_all_bits(&map, bitsize)) - goto error; - bitmap_clear_all(&map); - if (test_compare_operators(&map,bitsize)) - goto error; - bitmap_clear_all(&map); - if (test_count_bits_set(&map,bitsize)) - goto error; - bitmap_clear_all(&map); - if (test_get_first_bit(&map,bitsize)) - goto error; - bitmap_clear_all(&map); - if (test_get_next_bit(&map,bitsize)) - goto error; - if (test_prefix(&map,bitsize)) - goto error; - return FALSE; -error: - printf("\n"); - return TRUE; -} - -int main() -{ - int i; - for (i= 1; i < 4096; i++) - { - printf("Start test for bitsize=%u\n",i); - if (do_test(i)) - return -1; - } - printf("OK\n"); - return 0; -} - -/* - In directory mysys: - make test_bitmap - will build the bitmap tests and ./test_bitmap will execute it -*/ - -#endif === modified file 'unittest/mysys/bitmap-t.c' --- a/unittest/mysys/bitmap-t.c 2008-02-18 22:29:39 +0000 +++ b/unittest/mysys/bitmap-t.c 2011-02-10 10:35:57 +0000 @@ -1,4 +1,4 @@ -/* Copyright (C) 2006 MySQL AB +/* Copyright (c) 2000, 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 @@ -24,6 +24,8 @@ #include #include +#define MAX_TESTED_BITMAP_SIZE 1024 + uint get_rand_bit(uint bitsize) { return (rand() % bitsize); @@ -75,12 +77,6 @@ error2: return TRUE; } -my_bool test_operators(MY_BITMAP *map __attribute__((unused)), - uint bitsize __attribute__((unused))) -{ - return FALSE; -} - my_bool test_get_all_bits(MY_BITMAP *map, uint bitsize) { uint i; @@ -129,8 +125,8 @@ my_bool test_compare_operators(MY_BITMAP uint no_loops= bitsize > 128 ? 128 : bitsize; MY_BITMAP map2_obj, map3_obj; MY_BITMAP *map2= &map2_obj, *map3= &map3_obj; - uint32 map2buf[1024]; - uint32 map3buf[1024]; + uint32 map2buf[MAX_TESTED_BITMAP_SIZE]; + uint32 map3buf[MAX_TESTED_BITMAP_SIZE]; bitmap_init(&map2_obj, map2buf, bitsize, FALSE); bitmap_init(&map3_obj, map3buf, bitsize, FALSE); bitmap_clear_all(map2); @@ -259,6 +255,19 @@ my_bool test_get_first_bit(MY_BITMAP *ma { uint i, test_bit; uint no_loops= bitsize > 128 ? 128 : bitsize; + + bitmap_set_all(map); + for (i=0; i < bitsize; i++) + bitmap_clear_bit(map, i); + if (bitmap_get_first_set(map) != MY_BIT_NONE) + goto error1; + bitmap_clear_all(map); + for (i=0; i < bitsize; i++) + bitmap_set_bit(map, i); + if (bitmap_get_first(map) != MY_BIT_NONE) + goto error2; + bitmap_clear_all(map); + for (i=0; i < no_loops; i++) { test_bit=get_rand_bit(bitsize); @@ -321,6 +330,24 @@ my_bool test_prefix(MY_BITMAP *map, uint goto error3; bitmap_clear_all(map); } + for (i=0; i < bitsize; i++) + { + if (bitmap_is_prefix(map, i + 1)) + goto error4; + bitmap_set_bit(map, i); + if (!bitmap_is_prefix(map, i + 1)) + goto error5; + test_bit=get_rand_bit(bitsize); + bitmap_set_bit(map, test_bit); + if (test_bit <= i && !bitmap_is_prefix(map, i + 1)) + goto error5; + else if (test_bit > i) + { + if (bitmap_is_prefix(map, i + 1)) + goto error4; + bitmap_clear_bit(map, test_bit); + } + } return FALSE; error1: diag("prefix1 error bitsize = %u, prefix_size = %u", bitsize,test_bit); @@ -331,13 +358,127 @@ error2: error3: diag("prefix3 error bitsize = %u, prefix_size = %u", bitsize,test_bit); return TRUE; +error4: + diag("prefix4 error bitsize = %u, i = %u", bitsize,i); + return TRUE; +error5: + diag("prefix5 error bitsize = %u, i = %u", bitsize,i); + return TRUE; +} + +my_bool test_compare(MY_BITMAP *map, uint bitsize) +{ + MY_BITMAP map2; + uint32 map2buf[MAX_TESTED_BITMAP_SIZE]; + uint i, test_bit; + uint no_loops= bitsize > 128 ? 128 : bitsize; + if (bitmap_init(&map2, map2buf, bitsize, FALSE)) + { + diag("init error for bitsize %d", bitsize); + return TRUE; + } + /* Test all 4 possible combinations of set/unset bits. */ + for (i=0; i < no_loops; i++) + { + test_bit=get_rand_bit(bitsize); + bitmap_clear_bit(map, test_bit); + bitmap_clear_bit(&map2, test_bit); + if (!bitmap_is_subset(map, &map2)) + goto error_is_subset; + bitmap_set_bit(map, test_bit); + if (bitmap_is_subset(map, &map2)) + goto error_is_subset; + bitmap_set_bit(&map2, test_bit); + if (!bitmap_is_subset(map, &map2)) + goto error_is_subset; + bitmap_clear_bit(map, test_bit); + if (!bitmap_is_subset(map, &map2)) + goto error_is_subset; + /* Note that test_bit is not cleared i map2. */ + } + bitmap_clear_all(map); + bitmap_clear_all(&map2); + /* Test all 4 possible combinations of set/unset bits. */ + for (i=0; i < no_loops; i++) + { + test_bit=get_rand_bit(bitsize); + if (bitmap_is_overlapping(map, &map2)) + goto error_is_overlapping; + bitmap_set_bit(map, test_bit); + if (bitmap_is_overlapping(map, &map2)) + goto error_is_overlapping; + bitmap_set_bit(&map2, test_bit); + if (!bitmap_is_overlapping(map, &map2)) + goto error_is_overlapping; + bitmap_clear_bit(map, test_bit); + if (bitmap_is_overlapping(map, &map2)) + goto error_is_overlapping; + bitmap_clear_bit(&map2, test_bit); + /* Note that test_bit is not cleared i map2. */ + } + return FALSE; +error_is_subset: + diag("is_subset error bitsize = %u", bitsize); + return TRUE; +error_is_overlapping: + diag("is_overlapping error bitsize = %u", bitsize); + return TRUE; } +my_bool test_intersect(MY_BITMAP *map, uint bitsize) +{ + uint bitsize2 = 1 + get_rand_bit(MAX_TESTED_BITMAP_SIZE - 1); + MY_BITMAP map2; + uint32 map2buf[bitsize2]; + uint i, test_bit1, test_bit2, test_bit3; + if (bitmap_init(&map2, map2buf, bitsize2, FALSE)) + { + diag("init error for bitsize %d", bitsize2); + return TRUE; + } + test_bit1= get_rand_bit(bitsize); + test_bit2= get_rand_bit(bitsize); + bitmap_set_bit(map, test_bit1); + bitmap_set_bit(map, test_bit2); + test_bit3= get_rand_bit(bitsize2); + bitmap_set_bit(&map2, test_bit3); + if (test_bit2 < bitsize2) + bitmap_set_bit(&map2, test_bit2); + + bitmap_intersect(map, &map2); + if (test_bit2 < bitsize2) + { + if (!bitmap_is_set(map, test_bit2)) + goto error; + bitmap_clear_bit(map, test_bit2); + } + if (test_bit1 == test_bit3) + { + if (!bitmap_is_set(map, test_bit1)) + goto error; + bitmap_clear_bit(map, test_bit1); + } + if (!bitmap_is_clear_all(map)) + goto error; + + bitmap_set_all(map); + bitmap_set_all(&map2); + for (i=0; i < bitsize2; i++) + bitmap_clear_bit(&map2, i); + bitmap_intersect(map, &map2); + if (!bitmap_is_clear_all(map)) + goto error; + return FALSE; +error: + diag("intersect error bitsize = %u, bit1 = %u, bit2 = %u, bit3 = %u", + bitsize, test_bit1, test_bit2, test_bit3); + return TRUE; +} my_bool do_test(uint bitsize) { MY_BITMAP map; - uint32 buf[1024]; + uint32 buf[MAX_TESTED_BITMAP_SIZE]; if (bitmap_init(&map, buf, bitsize, FALSE)) { diag("init error for bitsize %d", bitsize); @@ -349,9 +490,6 @@ my_bool do_test(uint bitsize) if (test_flip_bit(&map,bitsize)) goto error; bitmap_clear_all(&map); - if (test_operators(&map,bitsize)) - goto error; - bitmap_clear_all(&map); if (test_get_all_bits(&map, bitsize)) goto error; bitmap_clear_all(&map); @@ -366,8 +504,15 @@ my_bool do_test(uint bitsize) bitmap_clear_all(&map); if (test_get_next_bit(&map,bitsize)) goto error; + bitmap_clear_all(&map); if (test_prefix(&map,bitsize)) goto error; + bitmap_clear_all(&map); + if (test_compare(&map,bitsize)) + goto error; + bitmap_clear_all(&map); + if (test_intersect(&map,bitsize)) + goto error; return FALSE; error: return TRUE; @@ -377,7 +522,7 @@ int main() { int i; int const min_size = 1; - int const max_size = 1024; + int const max_size = MAX_TESTED_BITMAP_SIZE; MY_INIT("bitmap-t"); plan(max_size - min_size); --===============7685761708444630132== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/jon.hauglid@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: jon.hauglid@stripped # target_branch: file:///home/jh234568/repo/mysql-5.5/ # testament_sha1: 3a4e8be5e47b3def995760aa08ce6854577d177e # timestamp: 2011-02-10 11:36:02 +0100 # base_revision_id: georgi.kodinov@stripped\ # uz4ib7uq120rr2vp # # Begin bundle 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 Ex6DAoJyB1zpTADMYMEstA/8XckU4UJAVH0r1A== --===============7685761708444630132==--