Skip to content

M
MariaDB
Commit a5ffb981 authored by Will DeVries's avatar Will DeVries Committed by Sergei Petrunia
Browse files
Options

Buffer rows from Clustrix.

parent 17ee32fb
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 270 additions and 85 deletions
storage/clustrixdb/clustrix_connection.cc
View file @ a5ffb981
This diff is collapsed.
storage/clustrixdb/clustrix_connection.h
View file @ a5ffb981
......@@ -21,6 +21,7 @@ Copyright (c) 2019, MariaDB Corporation.
#define CLUSTRIX_SERVER_REQUEST 30
class clustrix_connection_cursor;
class clustrix_connection
{
private:
......@@ -28,7 +29,6 @@ class clustrix_connection
# define COMMAND_BUFFER_SIZE_INCREMENT_BITS 10
MYSQL clustrix_net;
MYSQL_RES *results;
uchar *command_buffer;
size_t command_buffer_length;
size_t command_length;
......@@ -111,24 +111,29 @@ class clustrix_connection
};
int scan_table(ulonglong clustrix_table_oid, uint index,
enum sort_order sort, MY_BITMAP *read_set,
ulonglong *scan_refid);
int scan_next(ulonglong scan_refid, uchar **rowdata, ulong *rowdata_length);
int scan_end(ulonglong scan_refid);
enum sort_order sort, MY_BITMAP *read_set, ushort row_req,
clustrix_connection_cursor **scan);
int scan_query(String &stmt, uchar *fieldtype, uint fields, uchar *null_bits,
uint null_bits_size, uchar *field_metadata,
uint field_metadata_size, ulonglong *scan_refid);
int scan_from_key(ulonglong clustrix_table_oid, uint index,
uint field_metadata_size, ushort row_req,
clustrix_connection_cursor **scan);
int scan_from_key(ulonglong clustrix_table_oid, uint index,
enum scan_type scan_dir, bool sorted_scan,
MY_BITMAP *read_set, uchar *packed_key,
ulong packed_key_length, ulonglong *scan_refid);
ulong packed_key_length, ushort row_req,
clustrix_connection_cursor **scan);
int scan_next(clustrix_connection_cursor *scan, uchar **rowdata,
ulong *rowdata_length);
int scan_end(clustrix_connection_cursor *scan);
int populate_table_list(LEX_CSTRING *db, handlerton::discovered_list *result);
int discover_table_details(LEX_CSTRING *db, LEX_CSTRING *name, THD *thd,
TABLE_SHARE *share);
private:
int expand_command_buffer(size_t add_length);
int add_command_operand_uchar(uchar value);
int add_command_operand_ushort(ushort value);
int add_command_operand_uint(uint value);
int add_command_operand_ulonglong(ulonglong value);
int add_command_operand_lcb(ulonglong value);
......
storage/clustrixdb/ha_clustrixdb.cc
View file @ a5ffb981
......@@ -90,6 +90,14 @@ static MYSQL_SYSVAR_STR
NULL, NULL, ""
);
static MYSQL_THDVAR_UINT
(
row_buffer,
PLUGIN_VAR_RQCMDARG,
"Clustrix rowstore row buffer size",
NULL, NULL, 20, 1, 65535, 0
);
// Per thread select handler knob
static MYSQL_THDVAR_BOOL(
select_handler,
......@@ -119,6 +127,11 @@ bool derived_handler_setting(THD* thd)
return ( thd == NULL ) ? false : THDVAR(thd, derived_handler);
}
uint row_buffer_setting(THD* thd)
{
return THDVAR(thd, row_buffer);
}
/****************************************************************************
** Utility functions
****************************************************************************/
......@@ -183,7 +196,7 @@ ha_clustrixdb::ha_clustrixdb(handlerton *hton, TABLE_SHARE *table_arg)
DBUG_ENTER("ha_clustrixdb::ha_clustrixdb");
rli = NULL;
rgi = NULL;
scan_refid = 0;
scan_cur = NULL;
clustrix_table_oid = 0;
DBUG_VOID_RETURN;
}
......@@ -526,7 +539,7 @@ int ha_clustrixdb::index_init(uint idx, bool sorted)
active_index = idx;
add_current_table_to_rpl_table_list();
scan_refid = 0;
scan_cur = NULL;
/* Return all columns until there is a better understanding of
requirements. */
......@@ -562,9 +575,9 @@ int ha_clustrixdb::index_read(uchar * buf, const uchar * key, uint key_len,
switch (find_flag) {
case HA_READ_KEY_EXACT:
//exact = true;
/* fall through */
/* fall through */
//DBUG_RETURN(ER_NOT_SUPPORTED_YET);
case HA_READ_KEY_OR_NEXT:
case HA_READ_KEY_OR_NEXT:
st = clustrix_connection::READ_KEY_OR_NEXT;
break;
case HA_READ_KEY_OR_PREV:
......@@ -589,7 +602,8 @@ int ha_clustrixdb::index_read(uchar * buf, const uchar * key, uint key_len,
error_code = trx->scan_from_key(clustrix_table_oid, active_index, st,
sorted_scan, &scan_fields, packed_key,
packed_key_len, &scan_refid);
packed_key_len, THDVAR(thd, row_buffer),
&scan_cur);
if (packed_key)
my_afree(packed_key);
......@@ -601,7 +615,7 @@ int ha_clustrixdb::index_read(uchar * buf, const uchar * key, uint key_len,
int ha_clustrixdb::index_first(uchar *buf)
{
DBUG_ENTER("ha_clustrixdb::index_read");
DBUG_ENTER("ha_clustrixdb::index_first");
int error_code = 0;
THD *thd = ha_thd();
clustrix_connection *trx = get_trx(thd, &error_code);
......@@ -609,9 +623,9 @@ int ha_clustrixdb::index_first(uchar *buf)
DBUG_RETURN(error_code);
if ((error_code = trx->scan_from_key(clustrix_table_oid, active_index,
clustrix_connection::READ_FROM_START,
clustrix_connection::READ_FROM_START,
sorted_scan, &scan_fields, NULL, 0,
&scan_refid)))
THDVAR(thd, row_buffer), &scan_cur)))
DBUG_RETURN(error_code);
DBUG_RETURN(rnd_next(buf));
......@@ -619,7 +633,7 @@ int ha_clustrixdb::index_first(uchar *buf)
int ha_clustrixdb::index_last(uchar *buf)
{
DBUG_ENTER("ha_clustrixdb::index_read");
DBUG_ENTER("ha_clustrixdb::index_last");
int error_code = 0;
THD *thd = ha_thd();
clustrix_connection *trx = get_trx(thd, &error_code);
......@@ -627,9 +641,9 @@ int ha_clustrixdb::index_last(uchar *buf)
DBUG_RETURN(error_code);
if ((error_code = trx->scan_from_key(clustrix_table_oid, active_index,
clustrix_connection::READ_FROM_LAST,
clustrix_connection::READ_FROM_LAST,
sorted_scan, &scan_fields, NULL, 0,
&scan_refid)))
THDVAR(thd, row_buffer), &scan_cur)))
DBUG_RETURN(error_code);
DBUG_RETURN(rnd_next(buf));
......@@ -658,7 +672,7 @@ int ha_clustrixdb::index_prev(uchar *buf)
int ha_clustrixdb::index_end()
{
DBUG_ENTER("index_prev");
if (scan_refid)
if (scan_cur)
DBUG_RETURN(rnd_end());
else
DBUG_RETURN(0);
......@@ -675,7 +689,7 @@ int ha_clustrixdb::rnd_init(bool scan)
add_current_table_to_rpl_table_list();
is_scan = scan;
scan_refid = 0;
scan_cur = NULL;
if (my_bitmap_init(&scan_fields, NULL, table->read_set->n_bits, false))
return ER_OUTOFMEMORY;
......@@ -694,7 +708,8 @@ int ha_clustrixdb::rnd_init(bool scan)
if ((error_code = trx->scan_table(clustrix_table_oid, 0,
clustrix_connection::SORT_NONE,
&scan_fields, &scan_refid)))
&scan_fields, THDVAR(thd, row_buffer),
&scan_cur)))
return error_code;
return 0;
......@@ -709,11 +724,11 @@ int ha_clustrixdb::rnd_next(uchar *buf)
return error_code;
assert(is_scan);
assert(scan_refid);
assert(scan_cur);
uchar *rowdata;
ulong rowdata_length;
if ((error_code = trx->scan_next(scan_refid, &rowdata, &rowdata_length)))
if ((error_code = trx->scan_next(scan_cur, &rowdata, &rowdata_length)))
return error_code;
if (has_hidden_key) {
......@@ -793,9 +808,9 @@ int ha_clustrixdb::rnd_end()
return error_code;
my_bitmap_free(&scan_fields);
if (scan_refid && (error_code = trx->scan_end(scan_refid)))
if (scan_cur && (error_code = trx->scan_end(scan_cur)))
return error_code;
scan_refid = 0;
scan_cur = NULL;
return 0;
}
......@@ -1063,6 +1078,7 @@ static struct st_mysql_sys_var* clustrixdb_system_variables[] =
MYSQL_SYSVAR(password),
MYSQL_SYSVAR(port),
MYSQL_SYSVAR(socket),
MYSQL_SYSVAR(row_buffer),
MYSQL_SYSVAR(select_handler),
MYSQL_SYSVAR(derived_handler),
NULL
......
storage/clustrixdb/ha_clustrixdb.h
View file @ a5ffb981
......@@ -38,7 +38,7 @@ class ha_clustrixdb : public handler
bool has_hidden_key;
ulonglong last_hidden_key;
ulonglong scan_refid;
clustrix_connection_cursor *scan_cur;
bool is_scan;
MY_BITMAP scan_fields;
bool sorted_scan;
......@@ -110,4 +110,5 @@ class ha_clustrixdb : public handler
bool select_handler_setting(THD* thd);
bool derived_handler_setting(THD* thd);
uint row_buffer_setting(THD* thd);
#endif // _ha_clustrixdb_h
storage/clustrixdb/ha_clustrixdb_pushdown.cc
View file @ a5ffb981
......@@ -6,6 +6,7 @@ Copyright (c) 2019, MariaDB Corporation.
#include "ha_clustrixdb_pushdown.h"
extern handlerton *clustrixdb_hton;
extern uint clustrix_row_buffer;
/*@brief Fills up array data types, metadata and nullability*/
/************************************************************
......@@ -111,7 +112,7 @@ create_clustrixdb_select_handler(THD* thd, SELECT_LEX* select_lex)
select_lex->print(thd, &query, QT_ORDINARY);
int error_code = 0;
int field_metadata_size = 0;
ulonglong scan_refid = 0;
clustrix_connection_cursor *scan = NULL;
clustrix_connection *trx = NULL;
// We presume this number is equal to types.elements in get_field_types
......@@ -138,12 +139,14 @@ create_clustrixdb_select_handler(THD* thd, SELECT_LEX* select_lex)
if (!trx)
goto err;
if ((error_code = trx->scan_query(query, fieldtype, items_number,
null_bits, num_null_bytes, field_metadata, field_metadata_size, &scan_refid))) {
if ((error_code = trx->scan_query(query, fieldtype, items_number, null_bits,
num_null_bytes, field_metadata,
field_metadata_size,
row_buffer_setting(thd), &scan))) {
goto err;
}
sh = new ha_clustrixdb_select_handler(thd, select_lex, scan_refid);
sh = new ha_clustrixdb_select_handler(thd, select_lex, scan);
err:
// deallocate buffers
......@@ -163,11 +166,11 @@ create_clustrixdb_select_handler(THD* thd, SELECT_LEX* select_lex)
ha_clustrixdb_select_handler::ha_clustrixdb_select_handler(
THD *thd,
SELECT_LEX* select_lex,
ulonglong scan_refid_)
clustrix_connection_cursor *scan_)
: select_handler(thd, clustrixdb_hton)
{
thd__ = thd;
scan_refid = scan_refid_;
scan = scan_;
select = select_lex;
rli = NULL;
rgi = NULL;
......@@ -186,8 +189,8 @@ ha_clustrixdb_select_handler::~ha_clustrixdb_select_handler()
if (!trx) {
// TBD Log this
}
if (trx && scan_refid)
trx->scan_end(scan_refid);
if (trx && scan)
trx->scan_end(scan);
// If the ::init_scan has been executed
if (table__)
......@@ -234,11 +237,11 @@ int ha_clustrixdb_select_handler::next_row()
if (!trx)
return error_code;
assert(scan_refid);
assert(scan);
uchar *rowdata;
ulong rowdata_length;
if ((error_code = trx->scan_next(scan_refid, &rowdata, &rowdata_length)))
if ((error_code = trx->scan_next(scan, &rowdata, &rowdata_length)))
return error_code;
uchar const *current_row_end;
......@@ -290,9 +293,8 @@ create_clustrixdb_derived_handler(THD* thd, TABLE_LIST *derived)
SELECT_LEX_UNIT *unit= derived->derived;
SELECT_LEX *select_lex = unit->first_select();
String query;
ulonglong scan_refid = 0;
dh = new ha_clustrixdb_derived_handler(thd, select_lex, scan_refid);
dh = new ha_clustrixdb_derived_handler(thd, select_lex, NULL);
return dh;
}
......@@ -307,11 +309,11 @@ create_clustrixdb_derived_handler(THD* thd, TABLE_LIST *derived)
ha_clustrixdb_derived_handler::ha_clustrixdb_derived_handler(
THD *thd,
SELECT_LEX* select_lex,
ulonglong scan_refid_)
clustrix_connection_cursor *scan_)
: derived_handler(thd, clustrixdb_hton)
{
thd__ = thd;
scan_refid = scan_refid_;
scan = scan_;
select = select_lex;
rli = NULL;
rgi = NULL;
......@@ -333,8 +335,8 @@ ha_clustrixdb_derived_handler::~ha_clustrixdb_derived_handler()
if (!trx) {
// TBD Log this.
}
if (trx && scan_refid)
trx->scan_end(scan_refid);
if (trx && scan)
trx->scan_end(scan);
// If the ::init_scan has been executed
if (table__)
......@@ -387,8 +389,10 @@ int ha_clustrixdb_derived_handler::init_scan()
if (!trx)
goto err;
if ((error_code = trx->scan_query(query, fieldtype, items_number,
null_bits, num_null_bytes, field_metadata, field_metadata_size, &scan_refid))) {
if ((error_code = trx->scan_query(query, fieldtype, items_number, null_bits,
num_null_bytes, field_metadata,
field_metadata_size,
row_buffer_setting(thd), &scan))) {
goto err;
}
......@@ -422,11 +426,11 @@ int ha_clustrixdb_derived_handler::next_row()
if (!trx)
return error_code;
assert(scan_refid);
assert(scan);
uchar *rowdata;
ulong rowdata_length;
if ((error_code = trx->scan_next(scan_refid, &rowdata, &rowdata_length)))
if ((error_code = trx->scan_next(scan, &rowdata, &rowdata_length)))
return error_code;
uchar const *current_row_end;
......@@ -502,7 +506,7 @@ void ha_clustrixdb_base_handler::add_current_table_to_rpl_table_list()
/*@brief clone of ha_clustrixdb method */
/***********************************************************
* DESCRIPTION:
* Deletes structures that are used to unpack RBR rows
* Deletes structures that are used to unpack RBR rows
* in ::next_row(). Called from dtor
* PARAMETERS:
* RETURN:
......
storage/clustrixdb/ha_clustrixdb_pushdown.h
View file @ a5ffb981
......@@ -30,7 +30,7 @@ class ha_clustrixdb_base_handler
rpl_group_info *rgi;
Relay_log_info *rli;
// CLX BE scan operation reference
ulonglong scan_refid;
clustrix_connection_cursor *scan;
// To unpack rows from CLX BE
void add_current_table_to_rpl_table_list();
void remove_current_table_from_rpl_table_list();
......@@ -50,7 +50,7 @@ class ha_clustrixdb_select_handler:
{
public:
ha_clustrixdb_select_handler(THD* thd_arg, SELECT_LEX* sel,
ulonglong scan_refid);
clustrix_connection_cursor *scan);
~ha_clustrixdb_select_handler();
int init_scan();
......@@ -73,7 +73,7 @@ class ha_clustrixdb_derived_handler:
{
public:
ha_clustrixdb_derived_handler(THD* thd_arg, SELECT_LEX* sel,
ulonglong scan_refid);
clustrix_connection_cursor *scan);
~ha_clustrixdb_derived_handler();
int init_scan();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7