database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Convert Partition_read_cursor to inherit from Table_read_cursor

Browse Source 
The 'IS A' relation is more appropriate for Partition_read_cursor. This
also helps with accessing methods available only to Table_read_cursor.
This commit is contained in:
Vicențiu Ciorbaru
2016-09-07 21:35:56 +03:00
parent 1adc3fab23
commit 3ba867be89
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sql/sql_window.cc
View File

@@ -647,7 +647,7 @@ private:
end, and it needs an explicit command to move to the next partition. end, and it needs an explicit command to move to the next partition.
*/ */
class Partition_read_cursor class Partition_read_cursor : public Table_read_cursor
{ {
public: public:
Partition_read_cursor(THD *thd, SQL_I_List<ORDER> *partition_list) : Partition_read_cursor(THD *thd, SQL_I_List<ORDER> *partition_list) :
@@ -655,7 +655,7 @@ public:
void init(READ_RECORD *info) void init(READ_RECORD *info)
{ {
tbl_cursor.init(info); Table_read_cursor::init(info);
bound_tracker.init(); bound_tracker.init();
end_of_partition= false; end_of_partition= false;
} }
@@ -676,7 +676,7 @@ public:
/* /*
Moves to a new row. The row is assumed to be within the current partition. Moves to a new row. The row is assumed to be within the current partition.
*/ */
void move_to(ha_rows rownum) { tbl_cursor.move_to(rownum); } void move_to(ha_rows rownum) { Table_read_cursor::move_to(rownum); }
/* /*
This returns -1 when end of partition was reached. This returns -1 when end of partition was reached.
@@ -686,7 +686,7 @@ public:
int res; int res;
if (end_of_partition) if (end_of_partition)
return -1; return -1;
if ((res= tbl_cursor.get_next())) if ((res= Table_read_cursor::get_next()))
return res; return res;
if (bound_tracker.compare_with_cache()) if (bound_tracker.compare_with_cache())
@@ -699,11 +699,10 @@ public:
bool restore_last_row() bool restore_last_row()
{ {
return tbl_cursor.restore_last_row(); return Table_read_cursor::restore_last_row();
} }
private: private:
Table_read_cursor tbl_cursor;
Group_bound_tracker bound_tracker; Group_bound_tracker bound_tracker;
bool end_of_partition; bool end_of_partition;
}; };