From: Tor Didriksen Date: April 27 2011 2:54pm Subject: bzr commit into mysql-trunk branch (tor.didriksen:3329) WL#5774 List-Archive: http://lists.mysql.com/commits/136213 Message-Id: <20110427145412.55271376B@atum07.norway.sun.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1164115925098043496==" --===============1164115925098043496== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///export/home/didrik/repo/trunk-dynarray/ based on revid:magnus.blaudd@stripped 3329 Tor Didriksen 2011-04-27 WL#5774 Decrease number of malloc's for normal DML queries One of the malloc's was due to DYNAMIC_ARRAY keyuse; Replace it with an array in MEM_ROOT instead. This fix yields a 1-2% performance gain with sysbench if you have lots of cpus/threads. @ sql/mem_root_array.h A typesafe replacement for DYNAMIC_ARRAY. We use MEM_ROOT for allocating storage, rather than the C++ heap. The interface is chosen to be similar to std::vector. @ sql/sql_select.cc Use Key_use_array rather than DYNAMIC_ARRAY. @ sql/sql_select.h Use Key_use_array rather than DYNAMIC_ARRAY. @ sql/sql_test.cc Use Key_use_array rather than DYNAMIC_ARRAY. @ unittest/gunit/dynarray-t.cc Unit tests for Mem_root_array. Also performance testing comparing DYNAMIC_ARRAY with std::vector and Mem_root_array. added: sql/mem_root_array.h unittest/gunit/dynarray-t.cc modified: sql/sql_select.cc sql/sql_select.h sql/sql_test.cc sql/sql_test.h unittest/gunit/CMakeLists.txt === added file 'sql/mem_root_array.h' --- a/sql/mem_root_array.h 1970-01-01 00:00:00 +0000 +++ b/sql/mem_root_array.h 2011-04-27 14:54:04 +0000 @@ -0,0 +1,168 @@ +/* Copyright (c) 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 Foundation; version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + + +#ifndef MEM_ROOT_ARRAY_INCLUDED +#define MEM_ROOT_ARRAY_INCLUDED + +#include + +/** + A typesafe replacement for DYNAMIC_ARRAY. + We use MEM_ROOT for allocating storage, rather than the C++ heap. + The interface is chosen to be similar to std::vector. + + Note that MEM_ROOT has no facility for reusing free space, + so don't use this if multiple re-expansions are likely to happen. + + @param Element_type The type of the elements of the container. + Elements must be copyable. + @param has_trivial_destructor If true, we don't destroy elements. + We could have used type traits to determine this. + __has_trivial_destructor is supported by some (but not all) + compilers we use. +*/ +template +class Mem_root_array +{ +public: + Mem_root_array(MEM_ROOT *root) + : m_root(root), m_array(NULL), m_size(0), m_capacity(0) + {} + + ~Mem_root_array() + { + clear(); + } + + Element_type &at(size_t n) + { + DBUG_ASSERT(n < size()); + return m_array[n]; + } + + const Element_type &at(size_t n) const + { + DBUG_ASSERT(n < size()); + return m_array[n]; + } + + // Returns a pointer to the first element in the array. + Element_type *begin() { return &m_array[0]; } + + // Returns an pointer to the past-the-end element in the array. + Element_type *end() { return &m_array[size()]; } + + // Erases all of the elements. + void clear() + { + if (!empty()) + chop(0); + } + + /* + Chops the tail off the array, erasing all tail elements. + @param pos Index of first element to erase. + */ + void chop(const size_t pos) + { + DBUG_ASSERT(pos < m_size); + if (pos >= m_size) + return; + if (!has_trivial_destructor) + { + for (size_t ix= pos; ix < m_size; ++ix) + { + Element_type *p= &m_array[ix]; + p->~Element_type(); // Destroy discarded element. + } + } + m_size= pos; + } + + /* + Reserves space for array elements. + Copies over existing elements, in case we are re-expanding the array. + + @param n number of elements. + @retval true if out-of-memory, false otherwise. + */ + bool reserve(size_t n) + { + if (n <= m_capacity) + return false; + + DBUG_ASSERT(m_root != NULL); + + void *mem= alloc_root(m_root, n * element_size()); + if (!mem) + return true; + Element_type *array= static_cast(mem); + + // Copy all the existing elements into the new array. + for (size_t ix= 0; ix < m_size; ++ix) + { + Element_type *new_p= &array[ix]; + Element_type *old_p= &m_array[ix]; + new (new_p) Element_type(*old_p); // Copy into new location. + if (!has_trivial_destructor) + old_p->~Element_type(); // Destroy the old element. + } + + // Forget the old array. + m_array= array; + m_capacity= n; + return false; + } + + /* + Adds a new element at the end of the array, after its current last + element. The content of this new element is initialized to a copy of + the input argument. + + @param element Object to copy. + @retval true if out-of-memory, false otherwise. + */ + bool push_back(const Element_type &element) + { + const size_t min_capacity= 10; + const size_t expansion_factor= 2; + if (0 == m_capacity && reserve(min_capacity)) + return true; + if (m_size == m_capacity && reserve(m_capacity * expansion_factor)) + return true; + Element_type *p= &m_array[m_size++]; + new (p) Element_type(element); + return false; + } + + size_t capacity() const { return m_capacity; } + size_t element_size() const { return sizeof(Element_type); } + bool empty() const { return size() == 0; } + size_t size() const { return m_size; } + +private: + MEM_ROOT *m_root; + Element_type *m_array; + size_t m_size; + size_t m_capacity; + + // Not (yet) implemented. + Mem_root_array(const Mem_root_array&); + Mem_root_array &operator=(const Mem_root_array&); +}; + + +#endif // MEM_ROOT_ARRAY_INCLUDED === modified file 'sql/sql_select.cc' --- a/sql/sql_select.cc 2011-04-26 08:49:10 +0000 +++ b/sql/sql_select.cc 2011-04-27 14:54:04 +0000 @@ -38,8 +38,7 @@ #include "sql_parse.h" // check_stack_overrun #include "sql_partition.h" // make_used_partitions_str #include "sql_acl.h" // *_ACL -#include "sql_test.h" // print_where, print_keyuse_array, - // print_sjm, print_plan, TEST_join +#include "sql_test.h" // misc. debug printing utilities #include "records.h" // init_read_record, end_read_record #include "filesort.h" // filesort_free_buffers #include "sql_union.h" // mysql_union @@ -59,11 +58,11 @@ const char *join_type_str[]={ "UNKNOWN", struct st_sargable_param; -static void optimize_keyuse(JOIN *join, DYNAMIC_ARRAY *keyuse_array); +static void optimize_keyuse(JOIN *join, Key_use_array *keyuse_array); static bool make_join_statistics(JOIN *join, TABLE_LIST *leaves, Item *conds, - DYNAMIC_ARRAY *keyuse); + Key_use_array *keyuse); static bool optimize_semijoin_nests(JOIN *join, table_map all_table_map); -static bool update_ref_and_keys(THD *thd, DYNAMIC_ARRAY *keyuse, +static bool update_ref_and_keys(THD *thd, Key_use_array *keyuse, JOIN_TAB *join_tab, uint tables, Item *conds, COND_EQUAL *cond_equal, @@ -3466,7 +3465,7 @@ bool JOIN::destroy() while ((sj_nest= sj_list_it++)) sj_nest->sj_mat_exec= NULL; - delete_dynamic(&keyuse); + keyuse.clear(); delete procedure; DBUG_RETURN(test(error)); } @@ -4629,7 +4628,7 @@ static uint get_tmp_table_rec_length(Lis static bool make_join_statistics(JOIN *join, TABLE_LIST *tables_arg, Item *conds, - DYNAMIC_ARRAY *keyuse_array) + Key_use_array *keyuse_array) { int error; TABLE *table; @@ -6016,7 +6015,7 @@ max_part_bit(key_part_map bits) */ static bool -add_key_part(DYNAMIC_ARRAY *keyuse_array,KEY_FIELD *key_field) +add_key_part(Key_use_array *keyuse_array, KEY_FIELD *key_field) { Field *field=key_field->field; TABLE *form= field->table; @@ -6046,7 +6045,7 @@ add_key_part(DYNAMIC_ARRAY *keyuse_array key_field->null_rejecting, key_field->cond_guard, key_field->sj_pred_no); - if (insert_dynamic(keyuse_array, &keyuse)) + if (keyuse_array->push_back(keyuse)) return TRUE; } } @@ -6059,7 +6058,7 @@ add_key_part(DYNAMIC_ARRAY *keyuse_array #define FT_KEYPART (MAX_REF_PARTS+10) static bool -add_ft_keys(DYNAMIC_ARRAY *keyuse_array, +add_ft_keys(Key_use_array *keyuse_array, JOIN_TAB *stat,Item *cond,table_map usable_tables) { Item_func_match *cond_func=NULL; @@ -6121,7 +6120,7 @@ add_ft_keys(DYNAMIC_ARRAY *keyuse_array, false, // null_rejecting NULL, // cond_guard UINT_MAX); // sj_pred_no - return insert_dynamic(keyuse_array, &keyuse); + return keyuse_array->push_back(keyuse); } @@ -6237,7 +6236,7 @@ static void add_key_fields_for_nj(JOIN * */ static bool -update_ref_and_keys(THD *thd, DYNAMIC_ARRAY *keyuse,JOIN_TAB *join_tab, +update_ref_and_keys(THD *thd, Key_use_array *keyuse,JOIN_TAB *join_tab, uint tables, Item *cond, COND_EQUAL *cond_equal, table_map normal_tables, SELECT_LEX *select_lex, SARGABLE_PARAM **sargables) @@ -6280,8 +6279,6 @@ update_ref_and_keys(THD *thd, DYNAMIC_AR /* set a barrier for the array of SARGABLE_PARAM */ (*sargables)[0].field= 0; - if (my_init_dynamic_array(keyuse, sizeof(Key_use), 20, 64)) - return TRUE; if (cond) { add_key_fields(join_tab->join, &end, &and_level, cond, normal_tables, @@ -6355,21 +6352,21 @@ update_ref_and_keys(THD *thd, DYNAMIC_AR used in the query, we drop the partial key parts from consideration). Special treatment for ft-keys. */ - if (keyuse->elements) + if (!keyuse->empty()) { Key_use *save_pos, *use; - my_qsort(keyuse->buffer, keyuse->elements, sizeof(Key_use), + my_qsort(keyuse->begin(), keyuse->size(), keyuse->element_size(), reinterpret_cast(sort_keyuse)); const Key_use key_end(NULL, NULL, 0, 0, 0, 0, 0, 0, false, NULL, 0); - if (insert_dynamic(keyuse, &key_end)) // added for easy testing + if (keyuse->push_back(key_end)) // added for easy testing return TRUE; - use= save_pos= dynamic_element(keyuse, 0, Key_use *); + use= save_pos= keyuse->begin(); const Key_use *prev= &key_end; found_eq_constant=0; - for (i=0 ; i < keyuse->elements-1 ; i++,use++) + for (i=0 ; i < keyuse->size()-1 ; i++,use++) { if (!use->used_tables && use->optimize != KEY_OPTIMIZE_REF_OR_NULL) use->table->const_key_parts[use->key]|= use->keypart_map; @@ -6402,9 +6399,9 @@ update_ref_and_keys(THD *thd, DYNAMIC_AR use->table->reginfo.join_tab->checked_keys.set_bit(use->key); save_pos++; } - i= (uint) (save_pos - (Key_use *)keyuse->buffer); - (void) set_dynamic(keyuse, &key_end, i); - keyuse->elements=i; + i= (uint) (save_pos - keyuse->begin()); + keyuse->at(i) = key_end; + keyuse->chop(i); } DBUG_EXECUTE("opt", print_keyuse_array(keyuse);); return FALSE; @@ -6414,12 +6411,11 @@ update_ref_and_keys(THD *thd, DYNAMIC_AR Update some values in keyuse for faster choose_plan() loop. */ -static void optimize_keyuse(JOIN *join, DYNAMIC_ARRAY *keyuse_array) +static void optimize_keyuse(JOIN *join, Key_use_array *keyuse_array) { - Key_use *end, *keyuse= dynamic_element(keyuse_array, 0, Key_use *); - - for (end= keyuse+ keyuse_array->elements ; keyuse < end ; keyuse++) + for (size_t ix= 0; ix < keyuse_array->size(); ++ix) { + Key_use *keyuse= &keyuse_array->at(ix); table_map map; /* If we find a ref, assume this table matches a proportional === modified file 'sql/sql_select.h' --- a/sql/sql_select.h 2011-04-26 08:49:10 +0000 +++ b/sql/sql_select.h 2011-04-27 14:54:04 +0000 @@ -30,6 +30,7 @@ #include "records.h" /* READ_RECORD */ #include "opt_range.h" /* SQL_SELECT, QUICK_SELECT_I */ +#include "mem_root_array.h" /* Values in optimize */ #define KEY_OPTIMIZE_EXISTS 1 @@ -37,12 +38,12 @@ /** Information about usage of an index to satisfy an equality condition. - - @note such objects are stored in DYNAMIC_ARRAY which uses sizeof(), so keep - this class as POD as possible. */ class Key_use { public: + // We need the default constructor for unit testing. + Key_use() { memset(this, 0, sizeof(*this)); } + Key_use(TABLE *table_arg, Item *val_arg, table_map used_tables_arg, uint key_arg, uint keypart_arg, uint optimize_arg, key_part_map keypart_map_arg, ha_rows ref_table_rows_arg, @@ -93,6 +94,10 @@ public: uint sj_pred_no; }; + +// Key_use has a trivial destructor, no need to run it from Mem_root_array. +typedef Mem_root_array Key_use_array; + class store_key; typedef struct st_table_ref : public Sql_alloc @@ -1802,7 +1807,9 @@ public: bool skip_sort_order; bool need_tmp, hidden_group_fields; - DYNAMIC_ARRAY keyuse; + + Key_use_array keyuse; + List all_fields; ///< to store all fields that used in query ///Above list changed to use temporary table List tmp_all_fields1, tmp_all_fields2, tmp_all_fields3; @@ -1878,7 +1885,9 @@ public: JOIN(THD *thd_arg, List &fields_arg, ulonglong select_options_arg, select_result *result_arg) - :fields_list(fields_arg), sj_subselects(thd_arg->mem_root, 4) + : keyuse(thd_arg->mem_root), + fields_list(fields_arg), + sj_subselects(thd_arg->mem_root, 4) { init(thd_arg, fields_arg, select_options_arg, result_arg); } @@ -1932,7 +1941,7 @@ public: all_fields= fields_arg; if (&fields_list != &fields_arg) /* Avoid valgrind-warning */ fields_list= fields_arg; - bzero((char*) &keyuse,sizeof(keyuse)); + keyuse.clear(); tmp_table_param.init(); tmp_table_param.end_write_records= HA_POS_ERROR; rollup.state= ROLLUP::STATE_NONE; === modified file 'sql/sql_test.cc' --- a/sql/sql_test.cc 2010-11-05 22:19:41 +0000 +++ b/sql/sql_test.cc 2011-04-27 14:54:04 +0000 @@ -239,7 +239,7 @@ TEST_join(JOIN *join) #define FT_KEYPART (MAX_REF_PARTS+10) -void print_keyuse(Key_use *keyuse) +void print_keyuse(const Key_use *keyuse) { char buff[256]; char buf2[64]; @@ -266,14 +266,14 @@ void print_keyuse(Key_use *keyuse) /* purecov: begin inspected */ -void print_keyuse_array(DYNAMIC_ARRAY *keyuse_array) +void print_keyuse_array(const Key_use_array *keyuse_array) { DBUG_LOCK_FILE; - fprintf(DBUG_FILE, "Key_use array (%d elements)\n", keyuse_array->elements); + fprintf(DBUG_FILE, "Key_use array (%d elements)\n", + (int) keyuse_array->size()); DBUG_UNLOCK_FILE; - for(uint i=0; i < keyuse_array->elements; i++) - print_keyuse(reinterpret_cast - (dynamic_array_ptr(keyuse_array, i))); + for(uint i=0; i < keyuse_array->size(); i++) + print_keyuse(&keyuse_array->at(i)); } === modified file 'sql/sql_test.h' --- a/sql/sql_test.h 2010-08-19 07:10:58 +0000 +++ b/sql/sql_test.h 2011-04-27 14:54:04 +0000 @@ -17,6 +17,7 @@ #define SQL_TEST_INCLUDED #include "mysqld.h" +#include "sql_select.h" class JOIN; struct TABLE_LIST; @@ -31,7 +32,7 @@ void print_plan(JOIN* join,uint idx, dou double current_read_time, const char *info); void dump_TABLE_LIST_graph(SELECT_LEX *select_lex, TABLE_LIST* tl); void print_sjm(TABLE_LIST *emb_sj_nest); -void print_keyuse_array(DYNAMIC_ARRAY *keyuse_array); +void print_keyuse_array(const Key_use_array *keyuse_array); #endif void mysql_print_status(); === modified file 'unittest/gunit/CMakeLists.txt' --- a/unittest/gunit/CMakeLists.txt 2011-04-13 11:31:44 +0000 +++ b/unittest/gunit/CMakeLists.txt 2011-04-27 14:54:04 +0000 @@ -206,6 +206,7 @@ ENDIF() SET(TESTS bounded_queue dbug + dynarray mdl mdl_mytap my_bitmap === added file 'unittest/gunit/dynarray-t.cc' --- a/unittest/gunit/dynarray-t.cc 1970-01-01 00:00:00 +0000 +++ b/unittest/gunit/dynarray-t.cc 2011-04-27 14:54:04 +0000 @@ -0,0 +1,408 @@ +/* Copyright (c) 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 Foundation; version 2 of the License. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + +// First include (the generated) my_config.h, to get correct platform defines, +// then gtest.h (before any other MySQL headers), to avoid min() macros etc ... +#include "my_config.h" +#include + +#include +#include +#include + +#include "sql_select.h" +#include "mem_root_array.h" + +/** + WL#5774 Decrease number of malloc's for normal DML queries. + One of the malloc's was due to DYNAMIC_ARRAY keyuse; + We replace the DYNAMIC_ARRAY with a std::vector-like class Mem_root_array. + + Below are unit tests for comparing performance, and for testing + functionality of Mem_root_array. +*/ + +pthread_key(MEM_ROOT**, THR_MALLOC); +pthread_key(THD*, THR_THD); + +extern "C" void sql_alloc_error_handler(void) +{ + ADD_FAILURE(); +} + + +/* + Rewrite of sort_keyuse() to comparison operator for use by std::less<> + It is a template argument, so static rather than in unnamed namespace. +*/ +static inline bool operator<(const Key_use &a, const Key_use &b) +{ + if (a.table->tablenr != b.table->tablenr) + return a.table->tablenr < b.table->tablenr; + if (a.key != b.key) + return a.key < b.key; + if (a.keypart != b.keypart) + return a.keypart < b.keypart; + const bool atab = test((a.used_tables & ~OUTER_REF_TABLE_BIT)); + const bool btab = test((b.used_tables & ~OUTER_REF_TABLE_BIT)); + if (atab != btab) + return atab < btab; + return + ((a.optimize & KEY_OPTIMIZE_REF_OR_NULL) < + (b.optimize & KEY_OPTIMIZE_REF_OR_NULL)); +} + + +/* + Compare for equality. + It is a template argument, so static rather than in unnamed namespace. +*/ +static inline bool operator==(const Key_use &lhs, const Key_use &rhs) +{ + return + lhs.table->tablenr == rhs.table->tablenr && + lhs.key == rhs.key && + lhs.keypart == rhs.keypart && + test((lhs.used_tables & ~OUTER_REF_TABLE_BIT)) + == + test((rhs.used_tables & ~OUTER_REF_TABLE_BIT)) && + (lhs.optimize & KEY_OPTIMIZE_REF_OR_NULL) + == + (rhs.optimize & KEY_OPTIMIZE_REF_OR_NULL); +} + + +namespace { + +/* + Cut'n paste this function from sql_select.cc, + to avoid linking in the entire server for this unit test. +*/ +inline int sort_keyuse(Key_use *a, Key_use *b) +{ + int res; + if (a->table->tablenr != b->table->tablenr) + return (int) (a->table->tablenr - b->table->tablenr); + if (a->key != b->key) + return (int) (a->key - b->key); + if (a->keypart != b->keypart) + return (int) (a->keypart - b->keypart); + // Place const values before other ones + if ((res= test((a->used_tables & ~OUTER_REF_TABLE_BIT)) - + test((b->used_tables & ~OUTER_REF_TABLE_BIT)))) + return res; + /* Place rows that are not 'OPTIMIZE_REF_OR_NULL' first */ + return (int) ((a->optimize & KEY_OPTIMIZE_REF_OR_NULL) - + (b->optimize & KEY_OPTIMIZE_REF_OR_NULL)); +} + + +std::ostream &operator<<(std::ostream &s, const Key_use &v) +{ + return s << "{" + << v.table->tablenr << ", " + << v.key << ", " + << v.keypart << ", " + << v.used_tables << ", " + << v.optimize + << "}" + ; +} + + +// We generate some random data at startup, for testing of sorting. +void generate_test_data(Key_use *keys, TABLE *tables, int n) +{ + int ix; + for (ix= 0; ix < n; ++ix) + { + tables[ix].tablenr= ix % 3; + keys[ix]= + Key_use(&tables[ix], + NULL, // Item *val + 0, // table_map used_tables + ix % 4, // uint key + ix % 2, // uint keypart + 0, // uint optimize + 0, // keypart_map + 0, // ha_rows ref_table_rows + true, // bool null_rejecting + NULL, // bool *cond_guard + 0 // uint sj_pred_no + ); + } + std::random_shuffle(&keys[0], &keys[n]); +} + + +// Play around with these constants to see std::sort speedup vs. my_qsort. +const int num_elements= 200; +const int num_iterations= 10; + +/* + This class is used for comparing performance of + std::vector<> and std::sort() + vs + DYNAMIC_ARRAY and my_qsort() + */ +class DynArrayTest : public ::testing::Test +{ +public: + DynArrayTest() {} + + static void SetUpTestCase() + { + generate_test_data(test_data, table_list, num_elements); + } + + virtual void SetUp() + { + my_init_dynamic_array(&m_keyuse_dyn, sizeof(Key_use), num_elements, 64); + m_keyuse_vec.reserve(num_elements); + } + + void insert_and_sort_dynamic() + { + reset_dynamic(&m_keyuse_dyn); + for (int ix= 0; ix < num_elements; ++ix) + { + insert_dynamic(&m_keyuse_dyn, &test_data[ix]); + } + my_qsort(m_keyuse_dyn.buffer, m_keyuse_dyn.elements, sizeof(Key_use), + reinterpret_cast(sort_keyuse)); + } + + void insert_and_sort_vector() + { + m_keyuse_vec.clear(); + for (int ix= 0; ix < num_elements; ++ix) + { + m_keyuse_vec.push_back(test_data[ix]); + } + std::sort(m_keyuse_vec.begin(), m_keyuse_vec.end(), std::less()); + } + + DYNAMIC_ARRAY m_keyuse_dyn; + std::vector m_keyuse_vec; +private: + static Key_use test_data[num_elements]; + static TABLE table_list[num_elements]; + + GTEST_DISALLOW_COPY_AND_ASSIGN_(DynArrayTest); +}; + +Key_use DynArrayTest::test_data[num_elements]; +TABLE DynArrayTest::table_list[num_elements]; + + +// Test insert_dynamic() and my_qsort(). +TEST_F(DynArrayTest, DynArray) +{ + for (int ix= 0; ix < num_iterations; ++ix) + insert_and_sort_dynamic(); +} + + +// Test vector::push_back() and std::sort() +TEST_F(DynArrayTest, Vector) +{ + for (int ix= 0; ix < num_iterations; ++ix) + insert_and_sort_vector(); +} + + +/* + This class is for unit testing of Mem_root_array. + */ +class MemRootTest : public ::testing::Test +{ +protected: + MemRootTest() + : m_mem_root_p(&m_mem_root), + m_array_mysys(m_mem_root_p), + m_array_std(m_mem_root_p) + {} + + virtual void SetUp() + { + init_sql_alloc(&m_mem_root, 1024, 0); + ASSERT_EQ(0, my_pthread_setspecific_ptr(THR_MALLOC, &m_mem_root_p)); + MEM_ROOT *root= *my_pthread_getspecific_ptr(MEM_ROOT**, THR_MALLOC); + ASSERT_EQ(root, m_mem_root_p); + + m_array_mysys.reserve(num_elements); + m_array_std.reserve(num_elements); + } + + virtual void TearDown() + { + free_root(&m_mem_root, MYF(0)); + } + + static void SetUpTestCase() + { + generate_test_data(test_data, table_list, num_elements); + ASSERT_EQ(0, pthread_key_create(&THR_THD, NULL)); + ASSERT_EQ(0, pthread_key_create(&THR_MALLOC, NULL)); + } + + static void TearDownTestCase() + { + pthread_key_delete(THR_THD); + pthread_key_delete(THR_MALLOC); + } + + void insert_and_sort_mysys() + { + m_array_mysys.clear(); + for (int ix= 0; ix < num_elements; ++ix) + { + m_array_mysys.push_back(test_data[ix]); + } + my_qsort(m_array_mysys.begin(), m_array_mysys.size(), + m_array_mysys.element_size(), + reinterpret_cast(sort_keyuse)); + } + + void insert_and_sort_std() + { + m_array_std.clear(); + for (int ix= 0; ix < num_elements; ++ix) + { + m_array_std.push_back(test_data[ix]); + } + std::sort(m_array_std.begin(), m_array_std.end(), std::less()); + } + + MEM_ROOT m_mem_root; + MEM_ROOT *m_mem_root_p; + Key_use_array m_array_mysys; + Key_use_array m_array_std; +private: + static Key_use test_data[num_elements]; + static TABLE table_list[num_elements]; + + GTEST_DISALLOW_COPY_AND_ASSIGN_(MemRootTest); +}; + +Key_use MemRootTest::test_data[num_elements]; +TABLE MemRootTest::table_list[num_elements]; + + +// Test Mem_root_array::push_back() and my_qsort() +TEST_F(MemRootTest, KeyUseMysys) +{ + for (int ix= 0; ix < num_iterations; ++ix) + insert_and_sort_mysys(); +} + + +// Test Mem_root_array::push_back() and std::sort() +TEST_F(MemRootTest, KeyUseStd) +{ + for (int ix= 0; ix < num_iterations; ++ix) + insert_and_sort_std(); +} + + +// Test that my_qsort() and std::sort() generate same order. +TEST_F(MemRootTest, KeyUseCompare) +{ + insert_and_sort_mysys(); + insert_and_sort_std(); + for (int ix= 0; ix < num_elements; ++ix) + { + Key_use k1= m_array_mysys.at(ix); + Key_use k2= m_array_std.at(ix); + EXPECT_EQ(k1, k2); + } +} + + +// Test that Mem_root_array re-expanding works. +TEST_F(MemRootTest, Reserve) +{ + Mem_root_array intarr(m_mem_root_p); + intarr.reserve(2); + const uint num_pushes= 20; + for (uint ix=0; ix < num_pushes; ++ix) + { + EXPECT_EQ(ix, intarr.size()); + EXPECT_FALSE(intarr.push_back(ix)); + EXPECT_EQ(ix, intarr.at(ix)); + } + for (uint ix=0; ix < num_pushes; ++ix) + { + EXPECT_EQ(ix, intarr.at(ix)); + } + EXPECT_EQ(sizeof(uint), intarr.element_size()); + EXPECT_EQ(num_pushes, intarr.size()); + EXPECT_LE(num_pushes, intarr.capacity()); +} + + +class DestroyCounter +{ +public: + DestroyCounter(const DestroyCounter &rhs) : p_counter(rhs.p_counter) {} + DestroyCounter(size_t *p) : p_counter(p) {} + ~DestroyCounter() { (*p_counter)+= 1; } +private: + size_t *p_counter; +}; + + +// Test chop() and clear() and that destructors are executed. +TEST_F(MemRootTest, ChopAndClear) +{ + Mem_root_array array(m_mem_root_p); + const size_t nn= 4; + array.reserve(nn); + size_t counter= 0; + DestroyCounter foo(&counter); + for (size_t ix= 0; ix < array.capacity(); ++ix) + array.push_back(foo); + + EXPECT_EQ(0U, counter); + array.chop(nn / 2); + EXPECT_EQ(nn / 2, counter); + EXPECT_EQ(nn / 2, array.size()); + + array.clear(); + EXPECT_EQ(nn, counter); +} + + +// Test that elements are destroyed if push_back() needs to call reserve(). +TEST_F(MemRootTest, ReserveDestroy) +{ + Mem_root_array array(m_mem_root_p); + const size_t nn= 4; + array.reserve(nn / 2); + size_t counter= 0; + DestroyCounter foo(&counter); + for (size_t ix= 0; ix < nn; ++ix) + array.push_back(foo); + + EXPECT_EQ(nn / 2, counter); + EXPECT_EQ(nn, array.size()); + + counter= 0; + array.clear(); + EXPECT_EQ(nn, counter); +} + + +} --===============1164115925098043496== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/tor.didriksen@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: tor.didriksen@stripped\ # izjtaa7gtotnimzw # target_branch: file:///export/home/didrik/repo/trunk-dynarray/ # testament_sha1: 6592276e8afad6693a7b996738cb54e3ea41fce6 # timestamp: 2011-04-27 16:54:12 +0200 # base_revision_id: magnus.blaudd@stripped\ # oph0wpcvwpb94nrv # # Begin bundle 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 --===============1164115925098043496==--