From: Jorgen Loland Date: June 6 2011 12:46pm Subject: bzr commit into mysql-trunk branch (jorgen.loland:3157) WL#5860 List-Archive: http://lists.mysql.com/commits/138696 Message-Id: <20110606124619.9CF399E2@atum21.norway.sun.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5607038069033725966==" --===============5607038069033725966== 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:georgi.kodinov@stripped 3157 Jorgen Loland 2011-06-06 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-06-06 12:46:10 +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(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-06-01 09:11:28 +0000 +++ b/sql/handler.h 2011-06-06 12:46:10 +0000 @@ -1051,73 +1051,103 @@ 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. + + The class consists of PODs only: default operator=, copy constructor + and destructor are used. + */ +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() const { return io_cost + cpu_cost + import_cost; } + double get_io_cost() const { return io_cost; } + double get_cpu_cost() const { return cpu_cost; } + double get_import_cost() const { return import_cost; } + double get_mem_cost() const { return mem_cost; } + + /** + Whether or not all costs in the object are zero + + @return true if all costs are zero, false otherwise + */ + bool is_zero() const + { + 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) + 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 @@ -1577,9 +1607,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); @@ -2414,16 +2446,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-06-06 12:46:10 +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-06-06 12:46:10 +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-06-06 12:46:10 +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-06-06 12:46:10 +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-06-02 07:05:42 +0000 +++ b/storage/innobase/handler/ha_innodb.cc 2011-06-06 12:46:10 +0000 @@ -12754,7 +12754,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); @@ -12769,7 +12769,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-06-01 09:11:28 +0000 +++ b/storage/innobase/handler/ha_innodb.h 2011-06-06 12:46:10 +0000 @@ -265,7 +265,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 @@ -278,7 +278,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-06-06 12:46:10 +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-06-06 12:46:10 +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-06-06 12:46:10 +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-06-06 12:46:10 +0000 @@ -0,0 +1,122 @@ +/* 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 "handler.h" + +namespace { + +TEST(CostEstimateTest, Basics) +{ + Cost_estimate ce1; + + EXPECT_EQ(0, ce1.total_cost()); + EXPECT_TRUE(ce1.is_zero()); + + const double initial_io_cost= 4.5; + + ce1.add_io(initial_io_cost); + EXPECT_FALSE(ce1.is_zero()); + EXPECT_DOUBLE_EQ(initial_io_cost, ce1.total_cost()); + + const double initial_cpu_cost= 3.3; + ce1.add_cpu(initial_cpu_cost); + + EXPECT_DOUBLE_EQ(initial_cpu_cost, ce1.get_cpu_cost()); + EXPECT_DOUBLE_EQ(initial_io_cost, ce1.get_io_cost()); + EXPECT_DOUBLE_EQ(initial_io_cost + initial_cpu_cost, ce1.total_cost()); + + EXPECT_EQ(0, ce1.get_mem_cost()); + EXPECT_EQ(0, ce1.get_import_cost()); + + const double initial_mem_cost= 7; + const double initial_import_cost= 11; + ce1.add_mem(initial_mem_cost); + ce1.add_import(initial_import_cost); + + EXPECT_DOUBLE_EQ(initial_io_cost + initial_cpu_cost + initial_import_cost, + ce1.total_cost()); + + ce1.add_io(1.5); + EXPECT_DOUBLE_EQ(initial_io_cost + 1.5, ce1.get_io_cost()); + EXPECT_DOUBLE_EQ(20.3, ce1.total_cost()); + + EXPECT_FALSE(ce1.is_zero()); +} + +TEST(CostEstimateTest, Operators) +{ + Cost_estimate ce_io; + + EXPECT_EQ(0, ce_io.total_cost()); + EXPECT_TRUE(ce_io.is_zero()); + + const double initial_io_cost= 4.5; + ce_io.add_io(initial_io_cost); + EXPECT_DOUBLE_EQ(initial_io_cost, ce_io.total_cost()); + + Cost_estimate ce_cpu; + const double initial_cpu_cost= 3.3; + ce_cpu.add_cpu(initial_cpu_cost); + EXPECT_DOUBLE_EQ(initial_cpu_cost, ce_cpu.total_cost()); + EXPECT_EQ(0, ce_cpu.get_io_cost()); + + // Copy CTOR + Cost_estimate ce_copy= ce_io; + ce_io.add_io(1.5); // should not add to ce_copy + EXPECT_DOUBLE_EQ(initial_io_cost + 1.5, ce_io.total_cost()); + EXPECT_DOUBLE_EQ(initial_io_cost, ce_copy.total_cost()); + + // operator+= + ce_copy+= ce_cpu; + EXPECT_DOUBLE_EQ(initial_io_cost + initial_cpu_cost, ce_copy.total_cost()); + + // operator+ + Cost_estimate ce_copy2= ce_io + ce_cpu; + const double copy2_totcost= initial_io_cost + 1.5 + initial_cpu_cost; + EXPECT_DOUBLE_EQ(copy2_totcost, ce_copy2.total_cost()); + + Cost_estimate ce_mem_import1; + ce_mem_import1.add_mem(3); + ce_mem_import1.add_import(5); + + Cost_estimate ce_mem_import2; + ce_mem_import2.add_mem(11); + ce_mem_import2.add_import(13); + + // operator+ + Cost_estimate ce_mi_copy= ce_mem_import1 + ce_mem_import2; + EXPECT_DOUBLE_EQ(18, ce_mi_copy.total_cost()); + EXPECT_DOUBLE_EQ(14, ce_mi_copy.get_mem_cost()); + EXPECT_DOUBLE_EQ(18, ce_mi_copy.get_import_cost()); + + // operator+= + ce_mi_copy+= ce_mem_import1; + EXPECT_DOUBLE_EQ(23, ce_mi_copy.total_cost()); + EXPECT_DOUBLE_EQ(17, ce_mi_copy.get_mem_cost()); + EXPECT_DOUBLE_EQ(23, ce_mi_copy.get_import_cost()); + + // copy assignment + Cost_estimate ce_copy3; + ce_copy3= ce_copy2; + EXPECT_DOUBLE_EQ(copy2_totcost, ce_copy3.total_cost()); +} + + +} //namespace --===============5607038069033725966== 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\ # mcfesddadp0jlnau # target_branch: file:///export/home/jl208045/mysql/wl4774/mysql-\ # trunk-costvect-refact/ # testament_sha1: b013c253bde0b6842d3d26c2e1fd90d5a30a1ec3 # timestamp: 2011-06-06 14:46:19 +0200 # base_revision_id: georgi.kodinov@stripped\ # eqfo51a64b4qg7i7 # # Begin bundle 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 JBnuVlFA --===============5607038069033725966==--