mirror of
https://github.com/MariaDB/server.git
synced 2026-05-16 11:57:38 +02:00
Merge 10.6 into 10.11
This commit is contained in:
Marko Mäkelä
commit
27a3366663
372 changed files with 7663 additions and 6515 deletions
|
|
@ -73,55 +73,55 @@ class federatedx_io_mysql :public federatedx_io
|
|||
bool test_all_restrict() const;
|
||||
public:
|
||||
federatedx_io_mysql(FEDERATEDX_SERVER *);
|
||||
~federatedx_io_mysql();
|
||||
~federatedx_io_mysql() override;
|
||||
|
||||
int simple_query(const char *fmt, ...);
|
||||
int query(const char *buffer, size_t length);
|
||||
virtual FEDERATEDX_IO_RESULT *store_result();
|
||||
int query(const char *buffer, size_t length) override;
|
||||
FEDERATEDX_IO_RESULT *store_result() override;
|
||||
|
||||
virtual size_t max_query_size() const;
|
||||
size_t max_query_size() const override;
|
||||
|
||||
virtual my_ulonglong affected_rows() const;
|
||||
virtual my_ulonglong last_insert_id() const;
|
||||
my_ulonglong affected_rows() const override;
|
||||
my_ulonglong last_insert_id() const override;
|
||||
|
||||
virtual int error_code();
|
||||
virtual const char *error_str();
|
||||
int error_code() override;
|
||||
const char *error_str() override;
|
||||
|
||||
void reset();
|
||||
int commit();
|
||||
int rollback();
|
||||
void reset() override;
|
||||
int commit() override;
|
||||
int rollback() override;
|
||||
|
||||
int savepoint_set(ulong sp);
|
||||
ulong savepoint_release(ulong sp);
|
||||
ulong savepoint_rollback(ulong sp);
|
||||
void savepoint_restrict(ulong sp);
|
||||
int savepoint_set(ulong sp) override;
|
||||
ulong savepoint_release(ulong sp) override;
|
||||
ulong savepoint_rollback(ulong sp) override;
|
||||
void savepoint_restrict(ulong sp) override;
|
||||
|
||||
ulong last_savepoint() const;
|
||||
ulong actual_savepoint() const;
|
||||
bool is_autocommit() const;
|
||||
ulong last_savepoint() const override;
|
||||
ulong actual_savepoint() const override;
|
||||
bool is_autocommit() const override;
|
||||
|
||||
bool table_metadata(ha_statistics *stats, const char *table_name,
|
||||
uint table_name_length, uint flag);
|
||||
uint table_name_length, uint flag) override;
|
||||
|
||||
/* resultset operations */
|
||||
|
||||
virtual void free_result(FEDERATEDX_IO_RESULT *io_result);
|
||||
virtual unsigned int get_num_fields(FEDERATEDX_IO_RESULT *io_result);
|
||||
virtual my_ulonglong get_num_rows(FEDERATEDX_IO_RESULT *io_result);
|
||||
virtual FEDERATEDX_IO_ROW *fetch_row(FEDERATEDX_IO_RESULT *io_result,
|
||||
FEDERATEDX_IO_ROWS **current= NULL);
|
||||
virtual ulong *fetch_lengths(FEDERATEDX_IO_RESULT *io_result);
|
||||
virtual const char *get_column_data(FEDERATEDX_IO_ROW *row,
|
||||
unsigned int column);
|
||||
virtual bool is_column_null(const FEDERATEDX_IO_ROW *row,
|
||||
unsigned int column) const;
|
||||
void free_result(FEDERATEDX_IO_RESULT *io_result) override;
|
||||
unsigned int get_num_fields(FEDERATEDX_IO_RESULT *io_result) override;
|
||||
my_ulonglong get_num_rows(FEDERATEDX_IO_RESULT *io_result) override;
|
||||
FEDERATEDX_IO_ROW *fetch_row(FEDERATEDX_IO_RESULT *io_result,
|
||||
FEDERATEDX_IO_ROWS **current= NULL) override;
|
||||
ulong *fetch_lengths(FEDERATEDX_IO_RESULT *io_result) override;
|
||||
const char *get_column_data(FEDERATEDX_IO_ROW *row,
|
||||
unsigned int column) override;
|
||||
bool is_column_null(const FEDERATEDX_IO_ROW *row,
|
||||
unsigned int column) const override;
|
||||
|
||||
virtual size_t get_ref_length() const;
|
||||
virtual void mark_position(FEDERATEDX_IO_RESULT *io_result,
|
||||
void *ref, FEDERATEDX_IO_ROWS *current);
|
||||
virtual int seek_position(FEDERATEDX_IO_RESULT **io_result,
|
||||
const void *ref);
|
||||
virtual void set_thd(void *thd);
|
||||
size_t get_ref_length() const override;
|
||||
void mark_position(FEDERATEDX_IO_RESULT *io_result,
|
||||
void *ref, FEDERATEDX_IO_ROWS *current) override;
|
||||
int seek_position(FEDERATEDX_IO_RESULT **io_result,
|
||||
const void *ref) override;
|
||||
void set_thd(void *thd) override;
|
||||
};
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -56,52 +56,52 @@ class federatedx_io_null :public federatedx_io
|
|||
{
|
||||
public:
|
||||
federatedx_io_null(FEDERATEDX_SERVER *);
|
||||
~federatedx_io_null();
|
||||
~federatedx_io_null() override;
|
||||
|
||||
int query(const char *buffer, size_t length);
|
||||
virtual FEDERATEDX_IO_RESULT *store_result();
|
||||
int query(const char *buffer, size_t length) override;
|
||||
FEDERATEDX_IO_RESULT *store_result() override;
|
||||
|
||||
virtual size_t max_query_size() const;
|
||||
size_t max_query_size() const override;
|
||||
|
||||
virtual my_ulonglong affected_rows() const;
|
||||
virtual my_ulonglong last_insert_id() const;
|
||||
my_ulonglong affected_rows() const override;
|
||||
my_ulonglong last_insert_id() const override;
|
||||
|
||||
virtual int error_code();
|
||||
virtual const char *error_str();
|
||||
int error_code() override;
|
||||
const char *error_str() override;
|
||||
|
||||
void reset();
|
||||
int commit();
|
||||
int rollback();
|
||||
void reset() override;
|
||||
int commit() override;
|
||||
int rollback() override;
|
||||
|
||||
int savepoint_set(ulong sp);
|
||||
ulong savepoint_release(ulong sp);
|
||||
ulong savepoint_rollback(ulong sp);
|
||||
void savepoint_restrict(ulong sp);
|
||||
int savepoint_set(ulong sp) override;
|
||||
ulong savepoint_release(ulong sp) override;
|
||||
ulong savepoint_rollback(ulong sp) override;
|
||||
void savepoint_restrict(ulong sp) override;
|
||||
|
||||
ulong last_savepoint() const;
|
||||
ulong actual_savepoint() const;
|
||||
bool is_autocommit() const;
|
||||
ulong last_savepoint() const override;
|
||||
ulong actual_savepoint() const override;
|
||||
bool is_autocommit() const override;
|
||||
|
||||
bool table_metadata(ha_statistics *stats, const char *table_name,
|
||||
uint table_name_length, uint flag);
|
||||
uint table_name_length, uint flag) override;
|
||||
|
||||
/* resultset operations */
|
||||
|
||||
virtual void free_result(FEDERATEDX_IO_RESULT *io_result);
|
||||
virtual unsigned int get_num_fields(FEDERATEDX_IO_RESULT *io_result);
|
||||
virtual my_ulonglong get_num_rows(FEDERATEDX_IO_RESULT *io_result);
|
||||
virtual FEDERATEDX_IO_ROW *fetch_row(FEDERATEDX_IO_RESULT *io_result,
|
||||
FEDERATEDX_IO_ROWS **current= NULL);
|
||||
virtual ulong *fetch_lengths(FEDERATEDX_IO_RESULT *io_result);
|
||||
virtual const char *get_column_data(FEDERATEDX_IO_ROW *row,
|
||||
unsigned int column);
|
||||
virtual bool is_column_null(const FEDERATEDX_IO_ROW *row,
|
||||
unsigned int column) const;
|
||||
virtual size_t get_ref_length() const;
|
||||
virtual void mark_position(FEDERATEDX_IO_RESULT *io_result,
|
||||
void *ref, FEDERATEDX_IO_ROWS *current);
|
||||
virtual int seek_position(FEDERATEDX_IO_RESULT **io_result,
|
||||
const void *ref);
|
||||
void free_result(FEDERATEDX_IO_RESULT *io_result) override;
|
||||
unsigned int get_num_fields(FEDERATEDX_IO_RESULT *io_result) override;
|
||||
my_ulonglong get_num_rows(FEDERATEDX_IO_RESULT *io_result) override;
|
||||
FEDERATEDX_IO_ROW *fetch_row(FEDERATEDX_IO_RESULT *io_result,
|
||||
FEDERATEDX_IO_ROWS **current= NULL) override;
|
||||
ulong *fetch_lengths(FEDERATEDX_IO_RESULT *io_result) override;
|
||||
const char *get_column_data(FEDERATEDX_IO_ROW *row,
|
||||
unsigned int column) override;
|
||||
bool is_column_null(const FEDERATEDX_IO_ROW *row,
|
||||
unsigned int column) const override;
|
||||
size_t get_ref_length() const override;
|
||||
void mark_position(FEDERATEDX_IO_RESULT *io_result,
|
||||
void *ref, FEDERATEDX_IO_ROWS *current) override;
|
||||
int seek_position(FEDERATEDX_IO_RESULT **io_result,
|
||||
const void *ref) override;
|
||||
};
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -33,10 +33,10 @@ private:
|
|||
public:
|
||||
ha_federatedx_derived_handler(THD* thd_arg, TABLE_LIST *tbl);
|
||||
~ha_federatedx_derived_handler();
|
||||
int init_scan();
|
||||
int next_row();
|
||||
int end_scan();
|
||||
void print_error(int, unsigned long);
|
||||
int init_scan() override;
|
||||
int next_row() override;
|
||||
int end_scan() override;
|
||||
void print_error(int, unsigned long) override;
|
||||
};
|
||||
|
||||
|
||||
|
|
@ -56,8 +56,8 @@ private:
|
|||
public:
|
||||
ha_federatedx_select_handler(THD* thd_arg, SELECT_LEX *sel);
|
||||
~ha_federatedx_select_handler();
|
||||
int init_scan();
|
||||
int next_row();
|
||||
int end_scan();
|
||||
void print_error(int, unsigned long);
|
||||
int init_scan() override;
|
||||
int next_row() override;
|
||||
int end_scan() override;
|
||||
void print_error(int, unsigned long) override;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1824,7 +1824,7 @@ public:
|
|||
public:
|
||||
bool handle_condition(THD *thd, uint sql_errno, const char* sqlstate,
|
||||
Sql_condition::enum_warning_level *level,
|
||||
const char* msg, Sql_condition ** cond_hdl)
|
||||
const char* msg, Sql_condition ** cond_hdl) override
|
||||
{
|
||||
return sql_errno >= ER_ABORTING_CONNECTION &&
|
||||
sql_errno <= ER_NET_WRITE_INTERRUPTED;
|
||||
|
|
|
|||
|
|
@ -322,13 +322,13 @@ public:
|
|||
don't implement this method unless you really have indexes
|
||||
*/
|
||||
// perhaps get index type
|
||||
const char *index_type(uint inx) { return "REMOTE"; }
|
||||
const char *index_type(uint inx) override { return "REMOTE"; }
|
||||
/*
|
||||
This is a list of flags that says what the storage engine
|
||||
implements. The current table flags are documented in
|
||||
handler.h
|
||||
*/
|
||||
ulonglong table_flags() const
|
||||
ulonglong table_flags() const override
|
||||
{
|
||||
/* fix server to be able to get remote server table flags */
|
||||
return (HA_PRIMARY_KEY_IN_READ_INDEX | HA_FILE_BASED
|
||||
|
|
@ -348,15 +348,15 @@ public:
|
|||
index up to and including 'part'.
|
||||
*/
|
||||
/* fix server to be able to get remote server index flags */
|
||||
ulong index_flags(uint inx, uint part, bool all_parts) const
|
||||
ulong index_flags(uint inx, uint part, bool all_parts) const override
|
||||
{
|
||||
return (HA_READ_NEXT | HA_READ_RANGE);
|
||||
}
|
||||
uint max_supported_record_length() const { return HA_MAX_REC_LENGTH; }
|
||||
uint max_supported_keys() const { return MAX_KEY; }
|
||||
uint max_supported_key_parts() const { return MAX_REF_PARTS; }
|
||||
uint max_supported_key_length() const { return FEDERATEDX_MAX_KEY_LENGTH; }
|
||||
uint max_supported_key_part_length() const { return FEDERATEDX_MAX_KEY_LENGTH; }
|
||||
uint max_supported_record_length() const override { return HA_MAX_REC_LENGTH; }
|
||||
uint max_supported_keys() const override { return MAX_KEY; }
|
||||
uint max_supported_key_parts() const override { return MAX_REF_PARTS; }
|
||||
uint max_supported_key_length() const override { return FEDERATEDX_MAX_KEY_LENGTH; }
|
||||
uint max_supported_key_part_length() const override { return FEDERATEDX_MAX_KEY_LENGTH; }
|
||||
/*
|
||||
Called in test_quick_select to determine if indexes should be used.
|
||||
Normally, we need to know number of blocks . For federatedx we need to
|
||||
|
|
@ -368,7 +368,7 @@ public:
|
|||
The reason for "records * 1000" is that such a large number forces
|
||||
this to use indexes "
|
||||
*/
|
||||
double scan_time()
|
||||
double scan_time() override
|
||||
{
|
||||
DBUG_PRINT("info", ("records %lu", (ulong) stats.records));
|
||||
return (double)(stats.records*1000);
|
||||
|
|
@ -376,7 +376,7 @@ public:
|
|||
/*
|
||||
The next method will never be called if you do not implement indexes.
|
||||
*/
|
||||
double read_time(uint index, uint ranges, ha_rows rows)
|
||||
double read_time(uint index, uint ranges, ha_rows rows) override
|
||||
{
|
||||
/*
|
||||
Per Brian, this number is bugus, but this method must be implemented,
|
||||
|
|
@ -385,33 +385,33 @@ public:
|
|||
return (double) rows / 20.0+1;
|
||||
}
|
||||
|
||||
const key_map *keys_to_use_for_scanning() { return &key_map_full; }
|
||||
const key_map *keys_to_use_for_scanning() override { return &key_map_full; }
|
||||
/*
|
||||
Everything below are methods that we implment in ha_federatedx.cc.
|
||||
|
||||
Most of these methods are not obligatory, skip them and
|
||||
MySQL will treat them as not implemented
|
||||
*/
|
||||
int open(const char *name, int mode, uint test_if_locked); // required
|
||||
int close(void); // required
|
||||
int open(const char *name, int mode, uint test_if_locked) override; // required
|
||||
int close(void) override; // required
|
||||
|
||||
void start_bulk_insert(ha_rows rows, uint flags);
|
||||
int end_bulk_insert();
|
||||
int write_row(const uchar *buf);
|
||||
int update_row(const uchar *old_data, const uchar *new_data);
|
||||
int delete_row(const uchar *buf);
|
||||
int index_init(uint keynr, bool sorted);
|
||||
ha_rows estimate_rows_upper_bound();
|
||||
void start_bulk_insert(ha_rows rows, uint flags) override;
|
||||
int end_bulk_insert() override;
|
||||
int write_row(const uchar *buf) override;
|
||||
int update_row(const uchar *old_data, const uchar *new_data) override;
|
||||
int delete_row(const uchar *buf) override;
|
||||
int index_init(uint keynr, bool sorted) override;
|
||||
ha_rows estimate_rows_upper_bound() override;
|
||||
int index_read(uchar *buf, const uchar *key,
|
||||
uint key_len, enum ha_rkey_function find_flag);
|
||||
uint key_len, enum ha_rkey_function find_flag) override;
|
||||
int index_read_idx(uchar *buf, uint idx, const uchar *key,
|
||||
uint key_len, enum ha_rkey_function find_flag);
|
||||
int index_next(uchar *buf);
|
||||
int index_end();
|
||||
int index_next(uchar *buf) override;
|
||||
int index_end() override;
|
||||
int read_range_first(const key_range *start_key,
|
||||
const key_range *end_key,
|
||||
bool eq_range, bool sorted);
|
||||
int read_range_next();
|
||||
bool eq_range, bool sorted) override;
|
||||
int read_range_next() override;
|
||||
/*
|
||||
unlike index_init(), rnd_init() can be called two times
|
||||
without rnd_end() in between (it only makes sense if scan=1).
|
||||
|
|
@ -420,16 +420,16 @@ public:
|
|||
position it to the start of the table, no need to deallocate
|
||||
and allocate it again
|
||||
*/
|
||||
int rnd_init(bool scan); //required
|
||||
int rnd_end();
|
||||
int rnd_next(uchar *buf); //required
|
||||
int rnd_pos(uchar *buf, uchar *pos); //required
|
||||
void position(const uchar *record); //required
|
||||
int rnd_init(bool scan) override; //required
|
||||
int rnd_end() override;
|
||||
int rnd_next(uchar *buf) override; //required
|
||||
int rnd_pos(uchar *buf, uchar *pos) override; //required
|
||||
void position(const uchar *record) override; //required
|
||||
/*
|
||||
A ref is a pointer inside a local buffer. It is not comparable to
|
||||
other ref's. This is never called as HA_NON_COMPARABLE_ROWID is set.
|
||||
*/
|
||||
int cmp_ref(const uchar *ref1, const uchar *ref2)
|
||||
int cmp_ref(const uchar *ref1, const uchar *ref2) override
|
||||
{
|
||||
#ifdef NOT_YET
|
||||
DBUG_ASSERT(0);
|
||||
|
|
@ -438,29 +438,29 @@ public:
|
|||
return handler::cmp_ref(ref1,ref2); /* Works if table scan is used */
|
||||
#endif
|
||||
}
|
||||
int info(uint); //required
|
||||
int extra(ha_extra_function operation);
|
||||
int info(uint) override; //required
|
||||
int extra(ha_extra_function operation) override;
|
||||
|
||||
void update_auto_increment(void);
|
||||
int repair(THD* thd, HA_CHECK_OPT* check_opt);
|
||||
int optimize(THD* thd, HA_CHECK_OPT* check_opt);
|
||||
int delete_table(const char *name)
|
||||
int repair(THD* thd, HA_CHECK_OPT* check_opt) override;
|
||||
int optimize(THD* thd, HA_CHECK_OPT* check_opt) override;
|
||||
int delete_table(const char *name) override
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
int delete_all_rows(void);
|
||||
int delete_all_rows(void) override;
|
||||
int create(const char *name, TABLE *form,
|
||||
HA_CREATE_INFO *create_info); //required
|
||||
HA_CREATE_INFO *create_info) override; //required
|
||||
ha_rows records_in_range(uint inx, const key_range *start_key,
|
||||
const key_range *end_key, page_range *pages);
|
||||
uint8 table_cache_type() { return HA_CACHE_TBL_NOCACHE; }
|
||||
const key_range *end_key, page_range *pages) override;
|
||||
uint8 table_cache_type() override { return HA_CACHE_TBL_NOCACHE; }
|
||||
|
||||
THR_LOCK_DATA **store_lock(THD *thd, THR_LOCK_DATA **to,
|
||||
enum thr_lock_type lock_type); //required
|
||||
bool get_error_message(int error, String *buf);
|
||||
int start_stmt(THD *thd, thr_lock_type lock_type);
|
||||
int external_lock(THD *thd, int lock_type);
|
||||
int reset(void);
|
||||
enum thr_lock_type lock_type) override; //required
|
||||
bool get_error_message(int error, String *buf) override;
|
||||
int start_stmt(THD *thd, thr_lock_type lock_type) override;
|
||||
int external_lock(THD *thd, int lock_type) override;
|
||||
int reset(void) override;
|
||||
int free_result(void);
|
||||
|
||||
const FEDERATEDX_SHARE *get_federatedx_share() const { return share; }
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue