From: Jorgen Loland Date: May 31 2011 1:13pm Subject: bzr commit into mysql-trunk branch (jorgen.loland:3134) WL#5860 List-Archive: http://lists.mysql.com/commits/138452 Message-Id: <20110531131351.CDF824B3@atum21.norway.sun.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4939245873647307720==" --===============4939245873647307720== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///export/home/jl208045/mysql/wl4774/mysql-trunk-costvect-refact/ based on revid:jimmy.yang@stripped 3134 Jorgen Loland 2011-05-31 WL#5860: Make COST_VECT a properly encapsulated C++ class This changeset: * Changes name of COST_VECT to Cost_estimate * Encapsulates variables * Merges io_count and io_avg_cost into one variable: io_cost * Modifies code that used COST_VECT to use Cost_estimate instead * Adds unit tests for the Cost_estimate class This changeset does NOT change any cost calculations. It is purely a refactoring to an encapsulated C++ class following our coding guidelines. @ sql/handler.cc Refactoring: Move from COST_VECT to Cost_estimate @ sql/handler.h Refactoring: Make COST_VECT a properly encapsulated C++ class with name Cost_estimate @ sql/opt_range.cc Refactoring: Move from COST_VECT to Cost_estimate @ sql/sql_select.cc Refactoring: Move from COST_VECT to Cost_estimate @ sql/sql_select.h Refactoring: Move from COST_VECT to Cost_estimate @ sql/table.h Refactoring: Move from COST_VECT to Cost_estimate @ storage/innobase/handler/ha_innodb.cc Refactoring: Move from COST_VECT to Cost_estimate @ storage/innobase/handler/ha_innodb.h Refactoring: Move from COST_VECT to Cost_estimate @ storage/myisam/ha_myisam.cc Refactoring: Move from COST_VECT to Cost_estimate @ storage/myisam/ha_myisam.h Refactoring: Move from COST_VECT to Cost_estimate @ unittest/gunit/CMakeLists.txt Added gunit test file: cost_estimate @ unittest/gunit/cost_estimate-t.cc Unit tests for class Cost_estimate added: unittest/gunit/cost_estimate-t.cc modified: sql/handler.cc sql/handler.h sql/opt_range.cc sql/sql_select.cc sql/sql_select.h sql/table.h storage/innobase/handler/ha_innodb.cc storage/innobase/handler/ha_innodb.h storage/myisam/ha_myisam.cc storage/myisam/ha_myisam.h unittest/gunit/CMakeLists.txt === modified file 'sql/handler.cc' --- a/sql/handler.cc 2011-05-31 09:30:59 +0000 +++ b/sql/handler.cc 2011-05-31 13:13:42 +0000 @@ -4506,7 +4506,8 @@ bool key_uses_partial_cols(TABLE *table, ha_rows handler::multi_range_read_info_const(uint keyno, RANGE_SEQ_IF *seq, void *seq_init_param, uint n_ranges_arg, - uint *bufsz, uint *flags, COST_VECT *cost) + uint *bufsz, uint *flags, + Cost_estimate *cost) { KEY_MULTI_RANGE range; range_seq_t seq_it; @@ -4556,13 +4557,14 @@ handler::multi_range_read_info_const(uin { /* The following calculation is the same as in multi_range_read_info(): */ *flags |= HA_MRR_USE_DEFAULT_IMPL; - cost->zero(); - cost->avg_io_cost= 1; /* assume random seeks */ + DBUG_ASSERT(cost->is_zero()); if ((*flags & HA_MRR_INDEX_ONLY) && total_rows > 2) - cost->io_count= index_only_read_time(keyno, total_rows); + cost->add_io(index_only_read_time(keyno, total_rows) * + Cost_estimate::IO_BLOCK_READ_COST); else - cost->io_count= read_time(keyno, n_ranges, total_rows); - cost->cpu_cost= total_rows * ROW_EVALUATE_COST + 0.01; + cost->add_io(read_time(keyno, n_ranges, total_rows) * + Cost_estimate::IO_BLOCK_READ_COST); + cost->add_cpu((double)total_rows * ROW_EVALUATE_COST + 0.01); } return total_rows; } @@ -4603,20 +4605,22 @@ handler::multi_range_read_info_const(uin */ ha_rows handler::multi_range_read_info(uint keyno, uint n_ranges, uint n_rows, - uint *bufsz, uint *flags, COST_VECT *cost) + uint *bufsz, uint *flags, + Cost_estimate *cost) { *bufsz= 0; /* Default implementation doesn't need a buffer */ *flags |= HA_MRR_USE_DEFAULT_IMPL; - cost->zero(); - cost->avg_io_cost= 1; /* assume random seeks */ + DBUG_ASSERT(cost->is_zero()); /* Produce the same cost as non-MRR code does */ if (*flags & HA_MRR_INDEX_ONLY) - cost->io_count= index_only_read_time(keyno, n_rows); + cost->add_io(index_only_read_time(keyno, n_rows) * + Cost_estimate::IO_BLOCK_READ_COST); else - cost->io_count= read_time(keyno, n_ranges, n_rows); + cost->add_io(read_time(keyno, n_ranges, n_rows) * + Cost_estimate::IO_BLOCK_READ_COST); return 0; } @@ -5088,7 +5092,7 @@ end: DS-MRR implementation: multi_range_read_info() function */ ha_rows DsMrr_impl::dsmrr_info(uint keyno, uint n_ranges, uint rows, - uint *bufsz, uint *flags, COST_VECT *cost) + uint *bufsz, uint *flags, Cost_estimate *cost) { ha_rows res; uint def_flags= *flags; @@ -5122,7 +5126,7 @@ ha_rows DsMrr_impl::dsmrr_info(uint keyn ha_rows DsMrr_impl::dsmrr_info_const(uint keyno, RANGE_SEQ_IF *seq, void *seq_init_param, uint n_ranges, - uint *bufsz, uint *flags, COST_VECT *cost) + uint *bufsz, uint *flags, Cost_estimate *cost) { ha_rows rows; uint def_flags= *flags; @@ -5183,9 +5187,9 @@ ha_rows DsMrr_impl::dsmrr_info_const(uin */ bool DsMrr_impl::choose_mrr_impl(uint keyno, ha_rows rows, uint *flags, - uint *bufsz, COST_VECT *cost) + uint *bufsz, Cost_estimate *cost) { - COST_VECT dsmrr_cost; + Cost_estimate dsmrr_cost; bool res; THD *thd= current_thd; if (!thd->optimizer_switch_flag(OPTIMIZER_SWITCH_MRR) || @@ -5217,7 +5221,7 @@ bool DsMrr_impl::choose_mrr_impl(uint ke dsmrr_cost.total_cost() > cost->total_cost()) dsmrr_cost= *cost; - if (force_dsmrr || dsmrr_cost.total_cost() <= cost->total_cost()) + if (force_dsmrr || (dsmrr_cost.total_cost() <= cost->total_cost())) { *flags &= ~HA_MRR_USE_DEFAULT_IMPL; /* Use the DS-MRR implementation */ *flags &= ~HA_MRR_SORTED; /* We will return unordered output */ @@ -5233,7 +5237,8 @@ bool DsMrr_impl::choose_mrr_impl(uint ke } -static void get_sort_and_sweep_cost(TABLE *table, ha_rows nrows, COST_VECT *cost); +static void get_sort_and_sweep_cost(TABLE *table, ha_rows nrows, + Cost_estimate *cost); /** @@ -5251,7 +5256,8 @@ static void get_sort_and_sweep_cost(TABL */ bool DsMrr_impl::get_disk_sweep_mrr_cost(uint keynr, ha_rows rows, uint flags, - uint *buffer_size, COST_VECT *cost) + uint *buffer_size, + Cost_estimate *cost) { ulong max_buff_entries, elem_size; ha_rows rows_in_full_step, rows_in_last_step; @@ -5275,6 +5281,7 @@ bool DsMrr_impl::get_disk_sweep_mrr_cost rows_in_full_step= max_buff_entries; rows_in_last_step= rows % max_buff_entries; + DBUG_ASSERT(cost->is_zero()); /* Adjust buffer size if we expect to use only part of the buffer */ if (n_full_steps) { @@ -5283,24 +5290,35 @@ bool DsMrr_impl::get_disk_sweep_mrr_cost } else { - cost->zero(); *buffer_size= max(*buffer_size, (size_t)(1.2*rows_in_last_step) * elem_size + h->ref_length + table->key_info[keynr].key_length); } - COST_VECT last_step_cost; + Cost_estimate last_step_cost; get_sort_and_sweep_cost(table, rows_in_last_step, &last_step_cost); - cost->add(&last_step_cost); + (*cost)+= last_step_cost; + /* + With the old COST_VECT, memory cost was part of total_cost() but + that's not the case with Cost_estimate. Introducing Cost_estimate + shall not change any costs, hence the memory cost is added as if + it was CPU cost below. To be reconsidered when DsMRR costs are + refactored. + */ if (n_full_steps != 0) - cost->mem_cost= *buffer_size; + { + cost->add_mem(*buffer_size); + cost->add_cpu(*buffer_size); + } else - cost->mem_cost= rows_in_last_step * elem_size; - + { + cost->add_mem(rows_in_last_step * elem_size); + cost->add_cpu(rows_in_last_step * elem_size); + } /* Total cost of all index accesses */ index_read_cost= h->index_only_read_time(keynr, rows); - cost->add_io(index_read_cost, 1 /* Random seeks */); + cost->add_io(index_read_cost * Cost_estimate::IO_BLOCK_READ_COST); return FALSE; } @@ -5321,8 +5339,9 @@ bool DsMrr_impl::get_disk_sweep_mrr_cost */ static -void get_sort_and_sweep_cost(TABLE *table, ha_rows nrows, COST_VECT *cost) +void get_sort_and_sweep_cost(TABLE *table, ha_rows nrows, Cost_estimate *cost) { + DBUG_ASSERT(cost->is_zero()); if (nrows) { get_sweep_read_cost(table, nrows, FALSE, cost); @@ -5330,10 +5349,8 @@ void get_sort_and_sweep_cost(TABLE *tabl double cmp_op= rows2double(nrows) * ROWID_COMPARE_COST; if (cmp_op < 3) cmp_op= 3; - cost->cpu_cost += cmp_op * log2(cmp_op); + cost->add_cpu(cmp_op * log2(cmp_op)); } - else - cost->zero(); } @@ -5381,15 +5398,16 @@ void get_sort_and_sweep_cost(TABLE *tabl */ void get_sweep_read_cost(TABLE *table, ha_rows nrows, bool interrupted, - COST_VECT *cost) + Cost_estimate *cost) { DBUG_ENTER("get_sweep_read_cost"); - cost->zero(); + DBUG_ASSERT(cost->is_zero()); if (table->file->primary_key_is_clustered()) { - cost->io_count= table->file->read_time(table->s->primary_key, (uint)nrows, - nrows); + cost->add_io(table->file->read_time(table->s->primary_key, + (uint)nrows, nrows) * + Cost_estimate::IO_BLOCK_READ_COST); } else { @@ -5404,14 +5422,13 @@ void get_sweep_read_cost(TABLE *table, h DBUG_PRINT("info",("sweep: nblocks=%g, busy_blocks=%g", n_blocks, busy_blocks)); - cost->io_count= busy_blocks; - - if (!interrupted) - { + if (interrupted) + cost->add_io(busy_blocks * Cost_estimate::IO_BLOCK_READ_COST); + else /* Assume reading is done in one 'sweep' */ - cost->avg_io_cost= (DISK_SEEK_BASE_COST + - DISK_SEEK_PROP_COST*n_blocks/busy_blocks); - } + cost->add_io(busy_blocks * + (DISK_SEEK_BASE_COST + + DISK_SEEK_PROP_COST * n_blocks / busy_blocks)); } DBUG_PRINT("info",("returning cost=%g", cost->total_cost())); DBUG_VOID_RETURN; === modified file 'sql/handler.h' --- a/sql/handler.h 2011-05-12 17:29:19 +0000 +++ b/sql/handler.h 2011-05-31 13:13:42 +0000 @@ -1051,73 +1051,107 @@ typedef struct st_range_seq_if uint16 &mrr_persistent_flag_storage(range_seq_t seq, uint idx); char* &mrr_get_ptr_by_idx(range_seq_t seq, uint idx); -class COST_VECT +/** + Used to store optimizer cost estimates +*/ +class Cost_estimate { -public: - double io_count; /* number of I/O */ - double avg_io_cost; /* cost of an average I/O oper. */ - double cpu_cost; /* cost of operations in CPU */ - double mem_cost; /* cost of used memory */ - double import_cost; /* cost of remote operations */ +private: + double io_cost; ///< cost of I/O operations + double cpu_cost; ///< cost of CPU operations + double import_cost; ///< cost of remote operations + double mem_cost; ///< memory used (bytes) - enum { IO_COEFF=1 }; - enum { CPU_COEFF=1 }; - enum { MEM_COEFF=1 }; - enum { IMPORT_COEFF=1 }; +public: - COST_VECT() { zero(); } // keep gcc happy + /** + The cost of one I/O operation. + */ + static const double IO_BLOCK_READ_COST= 1.0; - double total_cost() - { - return IO_COEFF*io_count*avg_io_cost + CPU_COEFF * cpu_cost + - MEM_COEFF*mem_cost + IMPORT_COEFF*import_cost; - } + Cost_estimate() : + io_cost(0), + cpu_cost(0), + import_cost(0), + mem_cost(0) + {} - void zero() - { - avg_io_cost= 1.0; - io_count= cpu_cost= mem_cost= import_cost= 0.0; + /** + Returns sum of time-consuming costs, i.e., not counting memory + cost + */ + double total_cost() { return io_cost + cpu_cost + import_cost; } + double get_io_cost() { return io_cost; } + double get_cpu_cost() { return cpu_cost; } + double get_import_cost() { return import_cost; } + double get_mem_cost() { return mem_cost; } + + /** + Reset all costs to zero + */ + void zero() { io_cost= cpu_cost= import_cost= mem_cost= 0; } + + /** + Whether or not all costs in the object are zero + + @return true if all costs are zero, false otherwise + */ + bool is_zero() + { + if (io_cost || cpu_cost || import_cost || mem_cost) + return false; + return true; } + /** + Multiply io, cpu and import costs by parameter + */ void multiply(double m) { - io_count *= m; + io_cost *= m; cpu_cost *= m; import_cost *= m; /* Don't multiply mem_cost */ } - void add(const COST_VECT* cost) + Cost_estimate& operator+= (const Cost_estimate &other) { - double io_count_sum= io_count + cost->io_count; - add_io(cost->io_count, cost->avg_io_cost); - io_count= io_count_sum; - cpu_cost += cost->cpu_cost; - } - void add_io(double add_io_cnt, double add_avg_cost) - { - double io_count_sum= io_count + add_io_cnt; - if (io_count_sum != 0.0) - avg_io_cost= (io_count * avg_io_cost + - add_io_cnt * add_avg_cost) / io_count_sum; - DBUG_ASSERT(!isnan(avg_io_cost)); - io_count= io_count_sum; + io_cost+= other.io_cost; + cpu_cost+= other.cpu_cost; + import_cost+= other.import_cost; + mem_cost+= other.mem_cost; + + return *this; } - /* - To be used when we go from old single value-based cost calculations to - the new COST_VECT-based. - */ - void convert_from_cost(double cost) + const Cost_estimate operator+ (const Cost_estimate &other) { - zero(); - avg_io_cost= 1.0; - io_count= cost; + Cost_estimate result= *this; + result+= other; + return result; } + + /** + Add to IO cost + */ + void add_io(double add_io_cost) { io_cost+= add_io_cost; } + /** + Add to CPU cost + */ + void add_cpu(double add_cpu_cost) { cpu_cost+= add_cpu_cost; } + /** + Add to import cost + */ + void add_import(double add_import_cost) { import_cost+= add_import_cost; } + /** + Add to memory cost + */ + void add_mem(double add_mem_cost) { mem_cost+= add_mem_cost; } + }; void get_sweep_read_cost(TABLE *table, ha_rows nrows, bool interrupted, - COST_VECT *cost); + Cost_estimate *cost); /* The below two are not used (and not handled) in this milestone of this WL @@ -1556,9 +1590,11 @@ public: virtual ha_rows multi_range_read_info_const(uint keyno, RANGE_SEQ_IF *seq, void *seq_init_param, uint n_ranges, uint *bufsz, - uint *flags, COST_VECT *cost); + uint *flags, + Cost_estimate *cost); virtual ha_rows multi_range_read_info(uint keyno, uint n_ranges, uint keys, - uint *bufsz, uint *flags, COST_VECT *cost); + uint *bufsz, uint *flags, + Cost_estimate *cost); virtual int multi_range_read_init(RANGE_SEQ_IF *seq, void *seq_init_param, uint n_ranges, uint mode, HANDLER_BUFFER *buf); @@ -2365,16 +2401,16 @@ public: int dsmrr_next(char **range_info); ha_rows dsmrr_info(uint keyno, uint n_ranges, uint keys, uint *bufsz, - uint *flags, COST_VECT *cost); + uint *flags, Cost_estimate *cost); ha_rows dsmrr_info_const(uint keyno, RANGE_SEQ_IF *seq, void *seq_init_param, uint n_ranges, uint *bufsz, - uint *flags, COST_VECT *cost); + uint *flags, Cost_estimate *cost); private: bool choose_mrr_impl(uint keyno, ha_rows rows, uint *flags, uint *bufsz, - COST_VECT *cost); + Cost_estimate *cost); bool get_disk_sweep_mrr_cost(uint keynr, ha_rows rows, uint flags, - uint *buffer_size, COST_VECT *cost); + uint *buffer_size, Cost_estimate *cost); }; /* Some extern variables used with handlers */ === modified file 'sql/opt_range.cc' --- a/sql/opt_range.cc 2011-05-30 07:00:39 +0000 +++ b/sql/opt_range.cc 2011-05-31 13:13:42 +0000 @@ -771,7 +771,7 @@ static bool is_key_scan_ror(PARAM *param static ha_rows check_quick_select(PARAM *param, uint idx, bool index_only, SEL_ARG *tree, bool update_tbl_stats, uint *mrr_flags, uint *bufsize, - COST_VECT *cost); + Cost_estimate *cost); QUICK_RANGE_SELECT *get_quick_select(PARAM *param,uint index, SEL_ARG *key_tree, uint mrr_flags, uint mrr_buf_size, MEM_ROOT *alloc); @@ -3882,7 +3882,7 @@ TABLE_READ_PLAN *get_best_disjunct_quick /* Calculate cost(rowid_to_row_scan) */ { - COST_VECT sweep_cost; + Cost_estimate sweep_cost; JOIN *join= param->thd->lex->select_lex.join; bool is_interrupted= test(join && join->tables != 1); get_sweep_read_cost(param->table, non_cpk_scan_records, is_interrupted, @@ -4007,7 +4007,7 @@ skip_to_ror_scan: */ double roru_total_cost; { - COST_VECT sweep_cost; + Cost_estimate sweep_cost; JOIN *join= param->thd->lex->select_lex.join; bool is_interrupted= test(join && join->tables != 1); get_sweep_read_cost(param->table, roru_total_records, is_interrupted, @@ -4492,7 +4492,7 @@ static bool ror_intersect_add(ROR_INTERS DBUG_PRINT("info", ("info->total_cost: %g", info->total_cost)); if (!info->is_covering) { - COST_VECT sweep_cost; + Cost_estimate sweep_cost; JOIN *join= info->param->thd->lex->select_lex.join; bool is_interrupted= test(join && join->tables == 1); get_sweep_read_cost(info->param->table, double2rows(info->out_rows), @@ -4940,7 +4940,7 @@ static TRP_RANGE *get_key_scans_params(P if (*key) { ha_rows found_records; - COST_VECT cost; + Cost_estimate cost; double found_read_time; uint mrr_flags, buf_size; uint keynr= param->real_keynr[idx]; @@ -8109,7 +8109,7 @@ walk_up_n_right: static ha_rows check_quick_select(PARAM *param, uint idx, bool index_only, SEL_ARG *tree, bool update_tbl_stats, - uint *mrr_flags, uint *bufsize, COST_VECT *cost) + uint *mrr_flags, uint *bufsize, Cost_estimate *cost) { SEL_ARG_RANGE_SEQ seq; RANGE_SEQ_IF seq_if = {sel_arg_range_seq_init, sel_arg_range_seq_next, 0, 0}; @@ -8605,7 +8605,7 @@ QUICK_RANGE_SELECT *get_quick_select_for QUICK_RANGE *range; uint part; bool create_err= FALSE; - COST_VECT cost; + Cost_estimate cost; old_root= thd->mem_root; /* The following call may change thd->mem_root */ @@ -10292,7 +10292,7 @@ get_best_group_min_max(PARAM *param, SEL cur_index_tree= get_index_range_tree(cur_index, tree, param, &cur_param_idx); /* Check if this range tree can be used for prefix retrieval. */ - COST_VECT dummy_cost; + Cost_estimate dummy_cost; uint mrr_flags= HA_MRR_USE_DEFAULT_IMPL; uint mrr_bufsize=0; cur_quick_prefix_records= check_quick_select(param, cur_param_idx, === modified file 'sql/sql_select.cc' --- a/sql/sql_select.cc 2011-05-26 15:20:09 +0000 +++ b/sql/sql_select.cc 2011-05-31 13:13:42 +0000 @@ -5292,7 +5292,7 @@ static bool optimize_semijoin_nests(JOIN &subjoin_read_time, &subjoin_out_rows); sj_nest->nested_join->sjm.materialization_cost - .convert_from_cost(subjoin_read_time); + .add_io(subjoin_read_time); sj_nest->nested_join->sjm.expected_rowcount= subjoin_out_rows; List &inner_expr_list= sj_nest->nested_join->sj_inner_exprs; @@ -5353,19 +5353,21 @@ static bool optimize_semijoin_nests(JOIN Let materialization cost include the cost to write the data into the temporary table: */ + DBUG_ASSERT(sj_nest->nested_join->sjm.materialization_cost.is_zero()); sj_nest->nested_join->sjm.materialization_cost - .add_io(subjoin_out_rows, lookup_cost); + .add_io(subjoin_out_rows * lookup_cost); /* Set the cost to do a full scan of the temptable (will need this to consider doing sjm-scan): */ - sj_nest->nested_join->sjm.scan_cost.zero(); + DBUG_ASSERT(sj_nest->nested_join->sjm.scan_cost.is_zero()); if (sj_nest->nested_join->sjm.expected_rowcount > 0.0) sj_nest->nested_join->sjm.scan_cost - .add_io(sj_nest->nested_join->sjm.expected_rowcount, lookup_cost); + .add_io(sj_nest->nested_join->sjm.expected_rowcount * lookup_cost); - sj_nest->nested_join->sjm.lookup_cost.convert_from_cost(lookup_cost); + DBUG_ASSERT(sj_nest->nested_join->sjm.lookup_cost.is_zero()); + sj_nest->nested_join->sjm.lookup_cost.add_io(lookup_cost); } } } @@ -10762,7 +10764,7 @@ uint check_join_cache_usage(JOIN_TAB *ta bool *icp_other_tables_ok) { uint flags; - COST_VECT cost; + Cost_estimate cost; ha_rows rows; uint bufsz= 4096; JOIN_CACHE *prev_cache=0; @@ -14105,7 +14107,8 @@ void Optimize_table_order::advance_sj_st DBUG_ENTER("Optimize_table_order::advance_sj_state"); - pos->prefix_cost.convert_from_cost(*current_read_time); + DBUG_ASSERT(pos->prefix_cost.is_zero()); + pos->prefix_cost.add_io(*current_read_time); pos->prefix_record_count= *current_record_count; pos->sj_strategy= SJ_OPT_NONE; @@ -14343,14 +14346,11 @@ void Optimize_table_order::advance_sj_st } else if (sjm_strategy == SJ_OPT_MATERIALIZE_LOOKUP) { - COST_VECT prefix_cost; + Cost_estimate prefix_cost; int first_tab= (int)idx - my_count_bits(emb_sj_nest->sj_inner_tables); double prefix_rec_count; if (first_tab < (int)join->const_tables) - { - prefix_cost.zero(); prefix_rec_count= 1.0; - } else { prefix_cost= join->positions[first_tab].prefix_cost; === modified file 'sql/sql_select.h' --- a/sql/sql_select.h 2011-05-26 15:20:09 +0000 +++ b/sql/sql_select.h 2011-05-31 13:13:42 +0000 @@ -1511,7 +1511,7 @@ typedef struct st_position : public Sql_ /* These form a stack of partial join order costs and output sizes */ - COST_VECT prefix_cost; + Cost_estimate prefix_cost; double prefix_record_count; /* === modified file 'sql/table.h' --- a/sql/table.h 2011-05-26 15:20:09 +0000 +++ b/sql/table.h 2011-05-31 13:13:42 +0000 @@ -2023,11 +2023,11 @@ struct Semijoin_mat_optimize /* Expected #rows in the materialized table */ double expected_rowcount; /* Materialization cost - execute sub-join and write rows to temp.table */ - COST_VECT materialization_cost; + Cost_estimate materialization_cost; /* Cost to make one lookup in the temptable */ - COST_VECT lookup_cost; + Cost_estimate lookup_cost; /* Cost of scanning the materialized table */ - COST_VECT scan_cost; + Cost_estimate scan_cost; }; typedef struct st_nested_join === modified file 'storage/innobase/handler/ha_innodb.cc' --- a/storage/innobase/handler/ha_innodb.cc 2011-05-31 09:30:59 +0000 +++ b/storage/innobase/handler/ha_innodb.cc 2011-05-31 13:13:42 +0000 @@ -12752,7 +12752,7 @@ ha_innobase::multi_range_read_info_const uint n_ranges, uint* bufsz, uint* flags, - COST_VECT* cost) + Cost_estimate* cost) { /* See comments in ha_myisam::multi_range_read_info_const */ ds_mrr.init(this, table); @@ -12767,7 +12767,7 @@ ha_innobase::multi_range_read_info( uint keys, uint* bufsz, uint* flags, - COST_VECT* cost) + Cost_estimate* cost) { ds_mrr.init(this, table); return(ds_mrr.dsmrr_info(keyno, n_ranges, keys, bufsz, flags, cost)); === modified file 'storage/innobase/handler/ha_innodb.h' --- a/storage/innobase/handler/ha_innodb.h 2011-04-11 14:57:47 +0000 +++ b/storage/innobase/handler/ha_innodb.h 2011-05-31 13:13:42 +0000 @@ -263,7 +263,7 @@ public: ha_rows multi_range_read_info_const(uint keyno, RANGE_SEQ_IF* seq, void* seq_init_param, uint n_ranges, uint* bufsz, - uint* flags, COST_VECT* cost); + uint* flags, Cost_estimate* cost); /** Initialize multi range read and get information. * @see DsMrr_impl::dsmrr_info * @param keyno @@ -276,7 +276,7 @@ public: */ ha_rows multi_range_read_info(uint keyno, uint n_ranges, uint keys, uint* bufsz, uint* flags, - COST_VECT* cost); + Cost_estimate* cost); /** Attempt to push down an index condition. * @param[in] keyno MySQL key number === modified file 'storage/myisam/ha_myisam.cc' --- a/storage/myisam/ha_myisam.cc 2011-05-26 15:20:09 +0000 +++ b/storage/myisam/ha_myisam.cc 2011-05-31 13:13:42 +0000 @@ -2128,7 +2128,7 @@ int ha_myisam::multi_range_read_next(cha ha_rows ha_myisam::multi_range_read_info_const(uint keyno, RANGE_SEQ_IF *seq, void *seq_init_param, uint n_ranges, uint *bufsz, - uint *flags, COST_VECT *cost) + uint *flags, Cost_estimate *cost) { /* This call is here because there is no location where this->table would @@ -2142,7 +2142,7 @@ ha_rows ha_myisam::multi_range_read_info ha_rows ha_myisam::multi_range_read_info(uint keyno, uint n_ranges, uint keys, uint *bufsz, uint *flags, - COST_VECT *cost) + Cost_estimate *cost) { ds_mrr.init(this, table); return ds_mrr.dsmrr_info(keyno, n_ranges, keys, bufsz, flags, cost); === modified file 'storage/myisam/ha_myisam.h' --- a/storage/myisam/ha_myisam.h 2011-04-23 20:44:45 +0000 +++ b/storage/myisam/ha_myisam.h 2011-05-31 13:13:42 +0000 @@ -160,9 +160,9 @@ public: ha_rows multi_range_read_info_const(uint keyno, RANGE_SEQ_IF *seq, void *seq_init_param, uint n_ranges, uint *bufsz, - uint *flags, COST_VECT *cost); + uint *flags, Cost_estimate *cost); ha_rows multi_range_read_info(uint keyno, uint n_ranges, uint keys, - uint *bufsz, uint *flags, COST_VECT *cost); + uint *bufsz, uint *flags, Cost_estimate *cost); /* Index condition pushdown implementation */ Item *idx_cond_push(uint keyno, Item* idx_cond); === modified file 'unittest/gunit/CMakeLists.txt' --- a/unittest/gunit/CMakeLists.txt 2011-05-18 08:29:46 +0000 +++ b/unittest/gunit/CMakeLists.txt 2011-05-31 13:13:42 +0000 @@ -215,6 +215,7 @@ SET(TESTS sql_list sql_plist thread_utils + cost_estimate ) # Add tests (link them with gunit library and the server libraries) === added file 'unittest/gunit/cost_estimate-t.cc' --- a/unittest/gunit/cost_estimate-t.cc 1970-01-01 00:00:00 +0000 +++ b/unittest/gunit/cost_estimate-t.cc 2011-05-31 13:13:42 +0000 @@ -0,0 +1,127 @@ +/* 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 "item.h" +// #include "sql_class.h" +// #include "rpl_handler.h" // delegates_init() +#include "handler.h" + +namespace { + +class CostEstimateTest : public ::testing::Test +{ +protected: + /* + This is the part of the server global things which have to be initialized + for this (very simple) unit test. Presumably the list will grow once + we start writing tests for more advanced classes. + TODO: Move to a common library. + */ + static void SetUpTestCase() {} + static void TearDownTestCase() {} + + CostEstimateTest() {} + + virtual void SetUp() {} + virtual void TearDown() {} +}; + + +TEST_F(CostEstimateTest, Basics) +{ + Cost_estimate cv1; + + EXPECT_EQ(0, cv1.total_cost()); + EXPECT_TRUE(cv1.is_zero()); + + cv1.add_io(4.5); + EXPECT_FALSE(cv1.is_zero()); + EXPECT_EQ(4.5, cv1.total_cost()); + + cv1.add_cpu(3.3); + + EXPECT_EQ(3.3, cv1.get_cpu_cost()); + EXPECT_EQ(4.5, cv1.get_io_cost()); + EXPECT_EQ(7.8, cv1.total_cost()); + + EXPECT_EQ(0, cv1.get_mem_cost()); + EXPECT_EQ(0, cv1.get_import_cost()); + + cv1.add_mem(7); + cv1.add_import(11); + + EXPECT_EQ(18.8, cv1.total_cost()); + + cv1.add_io(1.5); + EXPECT_EQ(6, cv1.get_io_cost()); + EXPECT_EQ(20.3, cv1.total_cost()); + + EXPECT_FALSE(cv1.is_zero()); + cv1.zero(); + EXPECT_TRUE(cv1.is_zero()); +} + +TEST_F(CostEstimateTest, Operators) +{ + Cost_estimate cv_io; + + EXPECT_EQ(0, cv_io.total_cost()); + EXPECT_TRUE(cv_io.is_zero()); + + cv_io.add_io(4.5); + EXPECT_EQ(4.5, cv_io.total_cost()); + + Cost_estimate cv_cpu; + cv_cpu.add_cpu(3.3); + EXPECT_EQ(3.3, cv_cpu.total_cost()); + EXPECT_EQ(0, cv_cpu.get_io_cost()); + + Cost_estimate cv_copy= cv_io; + cv_io.add_io(1.5); + EXPECT_EQ(4.5, cv_copy.total_cost()); + EXPECT_EQ(6, cv_io.total_cost()); + + cv_copy+= cv_cpu; + EXPECT_EQ(7.8, cv_copy.total_cost()); + + Cost_estimate cv_copy2= cv_io + cv_cpu; + EXPECT_EQ(7.8, cv_copy.total_cost()); + + Cost_estimate cv_mem_import1; + cv_mem_import1.add_mem(3); + cv_mem_import1.add_import(5); + + Cost_estimate cv_mem_import2; + cv_mem_import2.add_mem(11); + cv_mem_import2.add_import(13); + + Cost_estimate cv_mi_copy= cv_mem_import1 + cv_mem_import2; + EXPECT_EQ(18, cv_mi_copy.total_cost()); + EXPECT_EQ(14, cv_mi_copy.get_mem_cost()); + EXPECT_EQ(18, cv_mi_copy.get_import_cost()); + + cv_mi_copy+= cv_mem_import1; + EXPECT_EQ(23, cv_mi_copy.total_cost()); + EXPECT_EQ(17, cv_mi_copy.get_mem_cost()); + EXPECT_EQ(23, cv_mi_copy.get_import_cost()); +} + + +} //namespace --===============4939245873647307720== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/jorgen.loland@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: jorgen.loland@stripped\ # jdicfycmin61rsso # target_branch: file:///export/home/jl208045/mysql/wl4774/mysql-\ # trunk-costvect-refact/ # testament_sha1: befaa187028f5447ba3d7e19e1b55b87e0db57e9 # timestamp: 2011-05-31 15:13:51 +0200 # base_revision_id: jimmy.yang@stripped\ # 3x1f93rnspltp3h6 # # Begin bundle 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 --===============4939245873647307720==--