mirror of
https://github.com/MariaDB/server.git
synced 2025-01-31 02:51:44 +01:00
71d263a198
This commit fixed the problems with S3 after the "DROP TABLE FORCE" changes. It also fixes all failing replication S3 tests. A slave is delayed if it is trying to execute replicated queries on a table that is already converted to S3 by the master later in the binlog. Fixes for replication events on S3 tables for delayed slaves: - INSERT and INSERT ... SELECT and CREATE TABLE are ignored but written to the binary log. UPDATE & DELETE will be fixed in a future commit. Other things: - On slaves with --s3-slave-ignore-updates set, allow S3 tables to be opened in read-write mode. This was done to be able to ignore-but-replicate queries like insert. Without this change any open of an S3 table failed with 'Table is read only' which is too early to be able to replicate the original query. - Errors are now printed if handler::extra() call fails in wait_while_tables_are_used(). - Error message for row changes are changed from HA_ERR_WRONG_COMMAND to HA_ERR_TABLE_READONLY. - Disable some maria_extra() calls for S3 tables. This could cause S3 tables to fail in some cases. - Added missing thr_lock_delete() to ma_open() in case of failure. - Removed from mysql_prepare_insert() the not needed argument 'table'.
82 lines
2.4 KiB
C++
82 lines
2.4 KiB
C++
#ifndef HA_S3_INCLUDED
|
|
#define HA_S3_INCLUDED
|
|
/* Copyright (C) 2019 MariaDB Corppration AB
|
|
|
|
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.
|
|
51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
|
|
*/
|
|
|
|
#include "ha_maria.h"
|
|
|
|
class ha_s3 final :public ha_maria
|
|
{
|
|
enum alter_table_op
|
|
{ S3_NO_ALTER, S3_ALTER_TABLE, S3_ADD_PARTITION, S3_ADD_TMP_PARTITION };
|
|
alter_table_op in_alter_table;
|
|
S3_INFO *open_args;
|
|
|
|
public:
|
|
ha_s3(handlerton *hton, TABLE_SHARE * table_arg);
|
|
~ha_s3() {}
|
|
|
|
int create(const char *name, TABLE *table_arg,
|
|
HA_CREATE_INFO *ha_create_info);
|
|
int open(const char *name, int mode, uint open_flags);
|
|
int write_row(const uchar *buf);
|
|
int update_row(const uchar * old_data, const uchar * new_data)
|
|
{
|
|
DBUG_ENTER("update_row");
|
|
DBUG_RETURN(HA_ERR_TABLE_READONLY);
|
|
}
|
|
int delete_row(const uchar * buf)
|
|
{
|
|
DBUG_ENTER("delete_row");
|
|
DBUG_RETURN(HA_ERR_TABLE_READONLY);
|
|
}
|
|
int check(THD * thd, HA_CHECK_OPT * check_opt)
|
|
{
|
|
DBUG_ENTER("delete_row");
|
|
DBUG_RETURN(HA_ERR_TABLE_READONLY);
|
|
}
|
|
int analyze(THD * thd, HA_CHECK_OPT * check_opt)
|
|
{
|
|
DBUG_ENTER("analyze");
|
|
DBUG_RETURN(HA_ERR_TABLE_READONLY);
|
|
}
|
|
int repair(THD * thd, HA_CHECK_OPT * check_opt)
|
|
{
|
|
DBUG_ENTER("repair");
|
|
DBUG_RETURN(HA_ERR_TABLE_READONLY);
|
|
}
|
|
int preload_keys(THD * thd, HA_CHECK_OPT * check_opt)
|
|
{
|
|
DBUG_ENTER("preload_keys");
|
|
DBUG_RETURN(HA_ERR_TABLE_READONLY);
|
|
}
|
|
int external_lock(THD * thd, int lock_type);
|
|
/*
|
|
drop_table() is only used for internal temporary tables,
|
|
not applicable for s3
|
|
*/
|
|
void drop_table(const char *name)
|
|
{
|
|
}
|
|
int delete_table(const char *name);
|
|
int rename_table(const char *from, const char *to);
|
|
int discover_check_version() override;
|
|
int rebind();
|
|
S3_INFO *s3_open_args() { return open_args; }
|
|
void register_handler(MARIA_HA *file);
|
|
};
|
|
#endif /* HA_S3_INCLUDED */
|