database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Remove all comments starting with 'psergey'

Browse Source
This commit is contained in:
Sergei Petrunia
2016-03-02 13:08:55 +03:00
parent dedf87fdf4
commit 86acf267fe
4 changed files with 1 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/item_sum.h
View File

@ -546,7 +546,6 @@ public:
virtual bool add()= 0; virtual bool add()= 0;
virtual bool setup(THD *thd) { return false; } virtual bool setup(THD *thd) { return false; }
//psergey: for window functions:
virtual void remove() { DBUG_ASSERT(0); } virtual void remove() { DBUG_ASSERT(0); }
virtual void cleanup(); virtual void cleanup();
@ -555,7 +554,6 @@ public:
return trace_unsupported_by_check_vcol_func_processor(func_name()); return trace_unsupported_by_check_vcol_func_processor(func_name());
} }
//psergey-todo: this is ugly:
virtual void setup_window_func(THD *thd, Window_spec *window_spec) {} virtual void setup_window_func(THD *thd, Window_spec *window_spec) {}
}; };
@ -787,7 +785,6 @@ class Item_sum_count :public Item_sum_int
void clear(); void clear();
bool add(); bool add();
void cleanup(); void cleanup();
// psergey-added:
void remove(); void remove();
public: public:

2
sql/records.cc
View File

@ -531,7 +531,7 @@ static int rr_unpack_from_tempfile(READ_RECORD *info)
return 0; return 0;
} }
//psergey: make this 'static' again:
int rr_from_pointers(READ_RECORD *info) int rr_from_pointers(READ_RECORD *info)
{ {
int tmp; int tmp;

5
sql/sql_select.cc
View File

@ -3207,7 +3207,6 @@ void JOIN::exec_inner()
if (select_options & SELECT_DESCRIBE) if (select_options & SELECT_DESCRIBE)
{ {
do_select_call_count= 0; do_select_call_count= 0;
// psergey-merge-todo: what to do with this ^^^ ?
select_describe(this, need_tmp, select_describe(this, need_tmp,
order != 0 && !skip_sort_order, order != 0 && !skip_sort_order,
@ -8207,9 +8206,6 @@ prev_record_reads(POSITION *positions, uint idx, table_map found_ref)
static JOIN_TAB *next_breadth_first_tab(JOIN_TAB *first_top_tab, static JOIN_TAB *next_breadth_first_tab(JOIN_TAB *first_top_tab,
uint n_top_tabs_count, JOIN_TAB *tab) uint n_top_tabs_count, JOIN_TAB *tab)
{ {
/*
psergey-merge-todo: the following is UGLY:
*/
n_top_tabs_count += tab->join->aggr_tables; n_top_tabs_count += tab->join->aggr_tables;
if (!tab->bush_root_tab) if (!tab->bush_root_tab)
{ {
@ -8499,7 +8495,6 @@ bool JOIN::get_best_combination()
(order ? 1 : 0) + (order ? 1 : 0) +
(select_options & (SELECT_BIG_RESULT | OPTION_BUFFER_RESULT) ? 1 : 0) ; (select_options & (SELECT_BIG_RESULT | OPTION_BUFFER_RESULT) ? 1 : 0) ;
// psergey-temp:
if (select_lex->window_specs.elements) if (select_lex->window_specs.elements)
aggr_tables++; aggr_tables++;

5
sql/sql_window.cc
View File

@ -764,11 +764,6 @@ bool JOIN::process_window_functions(List<Item> *curr_fields_list)
#if 0 #if 0
bool can_compute_window_live = !need_tmp; bool can_compute_window_live = !need_tmp;
/*
psergey-winfunc: temporarily disabled the below because there is no
way to test it. Enable it back when we can.
*/
// Construct the window_functions item list and check if they can be // Construct the window_functions item list and check if they can be
// computed using only one sorting. // computed using only one sorting.
// //