From: Jorgen Loland Date: June 27 2011 10:58am Subject: bzr commit into mysql-trunk branch (jorgen.loland:3237) WL#5860 List-Archive: http://lists.mysql.com/commits/139895 Message-Id: <20110627105845.1C63597E@atum21.norway.sun.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8456956483221211663==" --===============8456956483221211663== 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:tor.didriksen@stripped 3237 Jorgen Loland 2011-06-27 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-06-09 08:58:41 +0000 +++ b/sql/handler.cc 2011-06-27 10:58:36 +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,8 @@ 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; bool res; THD *thd= current_thd; if (!thd->optimizer_switch_flag(OPTIMIZER_SWITCH_MRR) || @@ -5200,6 +5203,7 @@ bool DsMrr_impl::choose_mrr_impl(uint ke uint add_len= table->key_info[keyno].key_length + h->ref_length; *bufsz -= add_len; + Cost_estimate dsmrr_cost; if (get_disk_sweep_mrr_cost(keyno, rows, *flags, bufsz, &dsmrr_cost)) return TRUE; *bufsz += add_len; @@ -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-27 10:58:36 +0000 @@ -1051,73 +1051,92 @@ 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 + { + return !(io_cost || cpu_cost || import_cost || mem_cost); } + /// 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 +1596,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 +2435,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-27 10:58:36 +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-06-24 09:29:07 +0000 +++ b/sql/sql_select.cc 2011-06-27 10:58:36 +0000 @@ -5296,7 +5296,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; @@ -5357,19 +5357,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); } } } @@ -10766,7 +10768,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; @@ -14109,7 +14111,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); + pos->prefix_cost.zero(); + pos->prefix_cost.add_io(*current_read_time); pos->prefix_record_count= *current_record_count; pos->sj_strategy= SJ_OPT_NONE; @@ -14347,14 +14350,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-06-24 09:29:07 +0000 +++ b/sql/sql_select.h 2011-06-27 10:58:36 +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-06-16 06:30:16 +0000 +++ b/sql/table.h 2011-06-27 10:58:36 +0000 @@ -2024,11 +2024,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-23 06:48:48 +0000 +++ b/storage/innobase/handler/ha_innodb.cc 2011-06-27 10:58:36 +0000 @@ -12881,7 +12881,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); @@ -12896,7 +12896,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-27 10:58:36 +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-27 10:58:36 +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-27 10:58:36 +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-06-24 09:29:07 +0000 +++ b/unittest/gunit/CMakeLists.txt 2011-06-27 10:58:36 +0000 @@ -216,6 +216,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-27 10:58:36 +0000 @@ -0,0 +1,136 @@ +/* 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); + + const double total_initial_cost= + initial_io_cost + initial_cpu_cost + initial_import_cost; + EXPECT_DOUBLE_EQ(total_initial_cost, ce1.total_cost()); + + const double added_io_cost= 1.5; + ce1.add_io(added_io_cost); + EXPECT_DOUBLE_EQ(initial_io_cost + added_io_cost, ce1.get_io_cost()); + EXPECT_DOUBLE_EQ(total_initial_cost + added_io_cost, 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); + const double added_io_cost= 1.5; + ce_io.add_io(added_io_cost); // should not add to ce_copy + EXPECT_DOUBLE_EQ(initial_io_cost + added_io_cost, 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 + added_io_cost + initial_cpu_cost; + EXPECT_DOUBLE_EQ(copy2_totcost, ce_copy2.total_cost()); + + Cost_estimate ce_mem_import1; + const double import1_mem_cost= 3; + const double import1_import_cost= 5; + ce_mem_import1.add_mem(import1_mem_cost); + ce_mem_import1.add_import(import1_import_cost); + + Cost_estimate ce_mem_import2; + const double import2_mem_cost= 11; + const double import2_import_cost= 13; + ce_mem_import2.add_mem(import2_mem_cost); + ce_mem_import2.add_import(import2_import_cost); + + // operator+ + Cost_estimate ce_mi_copy= ce_mem_import1 + ce_mem_import2; + EXPECT_DOUBLE_EQ(import1_import_cost + import2_import_cost, + ce_mi_copy.total_cost()); + EXPECT_DOUBLE_EQ(import1_mem_cost + import2_mem_cost, + ce_mi_copy.get_mem_cost()); + EXPECT_DOUBLE_EQ(import1_import_cost + import2_import_cost, + ce_mi_copy.get_import_cost()); + + // operator+= + ce_mi_copy+= ce_mem_import1; + EXPECT_DOUBLE_EQ(2*import1_import_cost + import2_import_cost, + ce_mi_copy.total_cost()); + EXPECT_DOUBLE_EQ(2*import1_mem_cost + import2_mem_cost, + ce_mi_copy.get_mem_cost()); + EXPECT_DOUBLE_EQ(2*import1_import_cost + import2_import_cost, + 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 --===============8456956483221211663== 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\ # 16ti2nh4fr5p7sgn # target_branch: file:///export/home/jl208045/mysql/wl4774/mysql-\ # trunk-costvect-refact/ # testament_sha1: 92977094be6d5e80139fb044e8d5456114ae3e7e # timestamp: 2011-06-27 12:58:45 +0200 # base_revision_id: tor.didriksen@stripped\ # sy16mrj8w9vz6266 # # Begin bundle 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 --===============8456956483221211663==--