Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(tianmu): support 'ALTER TABLE t1 CHARACTER SET = ...' clause. (#848) #865

Merged
merged 2 commits into from
Nov 3, 2022
Merged

feat(tianmu): support 'ALTER TABLE t1 CHARACTER SET = ...' clause. (#848) #865

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e367379
feat(tianmu): support 'ALTER TABLE t1 CHARACTER SET = ...' clause. (#…
Nov 3, 2022
8551ccb
Merge branch 'stonedb-5.7-dev' into feat-848
mergify[bot] Nov 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 70 additions & 0 deletions mysql-test/suite/tianmu/r/issue848.result
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
create database test_issue848;
use test_issue848;
CREATE TABLE `t1` (
`c_char` char(10) DEFAULT NULL COMMENT 'char',
`c_varchar` varchar(10) DEFAULT NULL COMMENT 'varchar',
`c_text` text COMMENT 'text')
ENGINE=TIANMU DEFAULT CHARSET=GBK;
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`c_char` char(10) DEFAULT NULL COMMENT 'char',
`c_varchar` varchar(10) DEFAULT NULL COMMENT 'varchar',
`c_text` text COMMENT 'text'
) ENGINE=TIANMU DEFAULT CHARSET=gbk
insert into t1(c_char,c_varchar,c_text) values(x'D6D0B9FA',x'D5E3BDAD',x'BABCD6DD');
ALTER TABLE t1 DEFAULT CHARACTER SET gbk;
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`c_char` char(10) DEFAULT NULL COMMENT 'char',
`c_varchar` varchar(10) DEFAULT NULL COMMENT 'varchar',
`c_text` text COMMENT 'text'
) ENGINE=TIANMU DEFAULT CHARSET=gbk
ALTER TABLE t1 CHARACTER SET latin1;
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`c_char` char(10) CHARACTER SET gbk DEFAULT NULL COMMENT 'char',
`c_varchar` varchar(10) CHARACTER SET gbk DEFAULT NULL COMMENT 'varchar',
`c_text` text CHARACTER SET gbk COMMENT 'text'
) ENGINE=TIANMU DEFAULT CHARSET=latin1
alter table t1 add column ex_column char(30);
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`c_char` char(10) CHARACTER SET gbk DEFAULT NULL COMMENT 'char',
`c_varchar` varchar(10) CHARACTER SET gbk DEFAULT NULL COMMENT 'varchar',
`c_text` text CHARACTER SET gbk COMMENT 'text',
`ex_column` char(30) DEFAULT NULL
) ENGINE=TIANMU DEFAULT CHARSET=latin1
ALTER TABLE t1 MODIFY c_char char(10) CHARACTER SET UTF8MB4;
ALTER TABLE t1 MODIFY c_varchar char(10) CHARACTER SET UTF8MB4;
ALTER TABLE t1 MODIFY c_text char(10) CHARACTER SET UTF8MB4;
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`c_char` char(10) CHARACTER SET utf8mb4 DEFAULT NULL,
`c_varchar` char(10) CHARACTER SET utf8mb4 DEFAULT NULL,
`c_text` char(10) CHARACTER SET utf8mb4 DEFAULT NULL,
`ex_column` char(30) DEFAULT NULL
) ENGINE=TIANMU DEFAULT CHARSET=latin1
select hex(c_char),hex(c_varchar),hex(c_text) from t1;
hex(c_char) hex(c_varchar) hex(c_text)
E4B8ADE59BBD E6B599E6B19F E69DADE5B79E
ALTER TABLE t1 CHANGE c_char c_char char(10) CHARACTER SET GBK;
ALTER TABLE t1 CHANGE c_varchar c_varchar char(10) CHARACTER SET GBK;
ALTER TABLE t1 CHANGE c_text c_text char(10) CHARACTER SET GBK;
select hex(c_char),hex(c_varchar),hex(c_text) from t1;
hex(c_char) hex(c_varchar) hex(c_text)
D6D0B9FA D5E3BDAD BABCD6DD
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`c_char` char(10) CHARACTER SET gbk DEFAULT NULL,
`c_varchar` char(10) CHARACTER SET gbk DEFAULT NULL,
`c_text` char(10) CHARACTER SET gbk DEFAULT NULL,
`ex_column` char(30) DEFAULT NULL
) ENGINE=TIANMU DEFAULT CHARSET=latin1
drop table t1;
drop database test_issue848;
34 changes: 34 additions & 0 deletions mysql-test/suite/tianmu/t/issue848.test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
--source include/have_tianmu.inc
create database test_issue848;
use test_issue848;
CREATE TABLE `t1` (
`c_char` char(10) DEFAULT NULL COMMENT 'char',
`c_varchar` varchar(10) DEFAULT NULL COMMENT 'varchar',
`c_text` text COMMENT 'text')
ENGINE=TIANMU DEFAULT CHARSET=GBK;
show create table t1;

insert into t1(c_char,c_varchar,c_text) values(x'D6D0B9FA',x'D5E3BDAD',x'BABCD6DD');
ALTER TABLE t1 DEFAULT CHARACTER SET gbk;
show create table t1;

ALTER TABLE t1 CHARACTER SET latin1;
show create table t1;

alter table t1 add column ex_column char(30);
show create table t1;

ALTER TABLE t1 MODIFY c_char char(10) CHARACTER SET UTF8MB4;
ALTER TABLE t1 MODIFY c_varchar char(10) CHARACTER SET UTF8MB4;
ALTER TABLE t1 MODIFY c_text char(10) CHARACTER SET UTF8MB4;
show create table t1;
select hex(c_char),hex(c_varchar),hex(c_text) from t1;

ALTER TABLE t1 CHANGE c_char c_char char(10) CHARACTER SET GBK;
ALTER TABLE t1 CHANGE c_varchar c_varchar char(10) CHARACTER SET GBK;
ALTER TABLE t1 CHANGE c_text c_text char(10) CHARACTER SET GBK;
select hex(c_char),hex(c_varchar),hex(c_text) from t1;
show create table t1;

drop table t1;
drop database test_issue848;
35 changes: 26 additions & 9 deletions storage/tianmu/handler/tianmu_handler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ const Alter_inplace_info::HA_ALTER_FLAGS ha_tianmu::TIANMU_SUPPORTED_ALTER_ADD_D
Alter_inplace_info::ADD_COLUMN | Alter_inplace_info::DROP_COLUMN | Alter_inplace_info::ALTER_STORED_COLUMN_ORDER;
const Alter_inplace_info::HA_ALTER_FLAGS ha_tianmu::TIANMU_SUPPORTED_ALTER_COLUMN_NAME =
Alter_inplace_info::ALTER_COLUMN_DEFAULT | Alter_inplace_info::ALTER_COLUMN_NAME;
const Alter_inplace_info::HA_ALTER_FLAGS ha_tianmu::TIANMU_SUPPORTED_ALTER_TABLE_OPTIONS =
Alter_inplace_info::CHANGE_CREATE_OPTION;
/////////////////////////////////////////////////////////////////////
//
// NOTICE: ALL EXCEPTIONS SHOULD BE CAUGHT in the handler API!!!
Expand Down Expand Up @@ -1271,7 +1273,7 @@ int ha_tianmu::truncate() {
DBUG_RETURN(ret);
}

uint ha_tianmu::max_supported_key_part_length(HA_CREATE_INFO *create_info) const {
uint ha_tianmu::max_supported_key_part_length([[maybe_unused]] HA_CREATE_INFO *create_info) const {
if (tianmu_sysvar_large_prefix)
return (Tianmu::common::TIANMU_MAX_INDEX_COL_LEN_LARGE);
else
Expand Down Expand Up @@ -1501,6 +1503,11 @@ int ha_tianmu::reset() {
enum_alter_inplace_result ha_tianmu::check_if_supported_inplace_alter([[maybe_unused]] TABLE *altered_table,
Alter_inplace_info *ha_alter_info) {
DBUG_ENTER(__PRETTY_FUNCTION__);
if ((ha_alter_info->handler_flags & TIANMU_SUPPORTED_ALTER_TABLE_OPTIONS) &&
(ha_alter_info->create_info->used_fields & HA_CREATE_USED_DEFAULT_CHARSET)) {
DBUG_RETURN(HA_ALTER_INPLACE_EXCLUSIVE_LOCK);
}

if ((ha_alter_info->handler_flags & ~TIANMU_SUPPORTED_ALTER_ADD_DROP_ORDER) &&
(ha_alter_info->handler_flags != TIANMU_SUPPORTED_ALTER_COLUMN_NAME)) {
// support alter table column type
Expand All @@ -1519,14 +1526,18 @@ enum_alter_inplace_result ha_tianmu::check_if_supported_inplace_alter([[maybe_un
}

bool ha_tianmu::inplace_alter_table(TABLE *altered_table, Alter_inplace_info *ha_alter_info) {
DBUG_ENTER(__PRETTY_FUNCTION__);
try {
if (!(ha_alter_info->handler_flags & ~TIANMU_SUPPORTED_ALTER_ADD_DROP_ORDER)) {
if ((ha_alter_info->handler_flags & TIANMU_SUPPORTED_ALTER_TABLE_OPTIONS) &&
(ha_alter_info->create_info->used_fields & HA_CREATE_USED_DEFAULT_CHARSET)) {
DBUG_RETURN(false);
} else if (!(ha_alter_info->handler_flags & ~TIANMU_SUPPORTED_ALTER_ADD_DROP_ORDER)) {
std::vector<Field *> v_old(table_share->field, table_share->field + table_share->fields);
std::vector<Field *> v_new(altered_table->s->field, altered_table->s->field + altered_table->s->fields);
ha_rcengine_->PrepareAlterTable(table_name_, v_new, v_old, ha_thd());
return false;
DBUG_RETURN(false);
} else if (ha_alter_info->handler_flags == TIANMU_SUPPORTED_ALTER_COLUMN_NAME) {
return false;
DBUG_RETURN(false);
}
} catch (std::exception &e) {
TIANMU_LOG(LogCtl_Level::ERROR, "An exception is caught: %s", e.what());
Expand All @@ -1536,21 +1547,27 @@ bool ha_tianmu::inplace_alter_table(TABLE *altered_table, Alter_inplace_info *ha

my_message(static_cast<int>(common::ErrorCode::UNKNOWN_ERROR), "Unable to inplace alter table", MYF(0));

return true;
DBUG_RETURN(true);
}

bool ha_tianmu::commit_inplace_alter_table([[maybe_unused]] TABLE *altered_table, Alter_inplace_info *ha_alter_info,
bool commit) {
DBUG_ENTER(__PRETTY_FUNCTION__);
if (!commit) {
TIANMU_LOG(LogCtl_Level::INFO, "Alter table failed : %s%s", table_name_.c_str(), " rollback");
return true;
DBUG_RETURN(true);
}
if ((ha_alter_info->handler_flags & TIANMU_SUPPORTED_ALTER_TABLE_OPTIONS) &&
(ha_alter_info->create_info->used_fields & HA_CREATE_USED_DEFAULT_CHARSET)) {
DBUG_RETURN(false);
}
if (ha_alter_info->handler_flags == TIANMU_SUPPORTED_ALTER_COLUMN_NAME) {
return false;
DBUG_RETURN(false);
}
if ((ha_alter_info->handler_flags & ~TIANMU_SUPPORTED_ALTER_ADD_DROP_ORDER)) {
TIANMU_LOG(LogCtl_Level::INFO, "Altered table not support type %lu", ha_alter_info->handler_flags);
return true;
DBUG_RETURN(true);
}
fs::path tmp_dir(table_name_ + ".tmp");
fs::path tab_dir(table_name_ + common::TIANMU_EXT);
Expand Down Expand Up @@ -1583,9 +1600,9 @@ bool ha_tianmu::commit_inplace_alter_table([[maybe_unused]] TABLE *altered_table
TIANMU_LOG(LogCtl_Level::ERROR, "file system error: %s %s|%s", e.what(), e.path1().string().c_str(),
e.path2().string().c_str());
my_message(static_cast<int>(common::ErrorCode::UNKNOWN_ERROR), "Failed to commit alter table", MYF(0));
return true;
DBUG_RETURN(true);
}
return false;
DBUG_RETURN(false);
}
/*
key: mysql format, may be union key, need changed to kvstore key format
Expand Down
1 change: 1 addition & 0 deletions storage/tianmu/handler/tianmu_handler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,7 @@ class ha_tianmu final : public handler {
public:
static const Alter_inplace_info::HA_ALTER_FLAGS TIANMU_SUPPORTED_ALTER_ADD_DROP_ORDER;
static const Alter_inplace_info::HA_ALTER_FLAGS TIANMU_SUPPORTED_ALTER_COLUMN_NAME;
static const Alter_inplace_info::HA_ALTER_FLAGS TIANMU_SUPPORTED_ALTER_TABLE_OPTIONS;

protected:
int set_cond_iter();
Expand Down