From: Tor Didriksen Date: April 28 2011 12:46pm Subject: bzr commit into mysql-trunk branch (tor.didriksen:3338) WL#5774 List-Archive: http://lists.mysql.com/commits/136299 Message-Id: <20110428124633.A445437FC@atum07.norway.sun.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6620548819620291356==" --===============6620548819620291356== 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:georgi.kodinov@stripped 3338 Tor Didriksen 2011-04-28 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-28 12:46:28 +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) + { + DBUG_ASSERT(m_root != NULL); + } + + ~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; + + 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 *const 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-28 08:28:18 +0000 +++ b/sql/sql_select.cc 2011-04-28 12:46:28 +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); -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, @@ -3546,7 +3545,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)); } @@ -4709,7 +4708,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; @@ -6091,7 +6090,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; @@ -6121,7 +6120,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; } } @@ -6134,7 +6133,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; @@ -6196,7 +6195,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); } @@ -6312,7 +6311,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) @@ -6355,8 +6354,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, @@ -6430,21 +6427,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; @@ -6477,9 +6474,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; @@ -6489,12 +6486,11 @@ update_ref_and_keys(THD *thd, DYNAMIC_AR Update some values in keyuse for faster choose_table_order() 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-28 08:28:18 +0000 +++ b/sql/sql_select.h 2011-04-28 12:46:28 +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 @@ -1796,7 +1801,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; @@ -1872,7 +1879,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); } @@ -1926,7 +1935,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-28 12:46:28 +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-28 12:46:28 +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-28 12:46:28 +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-28 12:46:28 +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); +} + + +} --===============6620548819620291356== 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\ # ch95ngiarbx6zedp # target_branch: file:///export/home/didrik/repo/trunk-dynarray/ # testament_sha1: 1d681c12562ede878218e31458541651641ba424 # timestamp: 2011-04-28 14:46:33 +0200 # base_revision_id: georgi.kodinov@stripped\ # az8w55v7ki6z3j7s # # Begin bundle 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 hsJwC+TbSk5MVMDJFUD9gmb/4u5IpwoSGS5wL8A= --===============6620548819620291356==--