Skip to content

M
MariaDB
Commit 423de1e5 authored by Eugene Kosov's avatar Eugene Kosov
Browse files
Options

MDEV-23245 MDEV-22898 Still getting assertion failure in file data0type.cc line 67 

Doesn't allow instant alter of a field which is a prefix part of some key

is_part_of_a_key_prefix(): I hope the name of the function is clear

ha_innobase::can_convert_string()
ha_innobase::can_convert_varstring()
ha_innobase::can_convert_blob(): it can't when field is_part_of_a_key_prefix()
parent 5b3b53ce
Hide whitespace changes
Inline Side-by-side
Showing with 148 additions and 36 deletions
mysql-test/suite/innodb/r/instant_alter_charset.result
View file @ 423de1e5
......@@ -1992,3 +1992,43 @@ KEY a_key (b, a(1))
INSERT INTO t1 VALUES ();
ALTER TABLE t1 MODIFY a text DEFAULT NULL;
DROP TABLE t1;
#
# MDEV-23245 Still getting assertion failure in file data0type.cc line 67
#
CREATE TABLE Foo
(
Bar char(2) CHARACTER SET utf8,
KEY Bar (Bar(1))
) ENGINE = InnoDB;
ALTER TABLE Foo MODIFY Bar char(2) CHARACTER SET utf8mb4;
INSERT INTO Foo VALUES ('a');
DROP TABLE Foo;
CREATE TABLE Foo
(
Bar varchar(2) CHARACTER SET utf8,
KEY Bar (Bar(1))
) ENGINE = InnoDB;
ALTER TABLE Foo MODIFY Bar varchar(2) CHARACTER SET utf8mb4;
INSERT INTO Foo VALUES ('a');
DROP TABLE Foo;
CREATE TABLE Foo
(
Bar text CHARACTER SET utf8,
KEY Bar (Bar(1))
) ENGINE = InnoDB;
ALTER TABLE Foo MODIFY Bar text CHARACTER SET utf8mb4;
INSERT INTO Foo VALUES ('a');
DROP TABLE Foo;
CREATE TABLE t1 (a VARCHAR(2) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci,
PRIMARY KEY (a(1)))
ENGINE=InnoDB;
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`a` varchar(2) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL,
PRIMARY KEY (`a`(1))
) ENGINE=InnoDB DEFAULT CHARSET=latin1
ALTER TABLE t1 MODIFY a VARCHAR(2)
CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
INSERT INTO t1 VALUES ('a');
DROP TABLE t1;
mysql-test/suite/innodb/t/instant_alter_charset.test
View file @ 423de1e5
......@@ -803,3 +803,43 @@ CREATE TABLE t1 (
INSERT INTO t1 VALUES ();
ALTER TABLE t1 MODIFY a text DEFAULT NULL;
DROP TABLE t1;
--echo #
--echo # MDEV-23245 Still getting assertion failure in file data0type.cc line 67
--echo #
CREATE TABLE Foo
(
Bar char(2) CHARACTER SET utf8,
KEY Bar (Bar(1))
) ENGINE = InnoDB;
ALTER TABLE Foo MODIFY Bar char(2) CHARACTER SET utf8mb4;
INSERT INTO Foo VALUES ('a');
DROP TABLE Foo;
CREATE TABLE Foo
(
Bar varchar(2) CHARACTER SET utf8,
KEY Bar (Bar(1))
) ENGINE = InnoDB;
ALTER TABLE Foo MODIFY Bar varchar(2) CHARACTER SET utf8mb4;
INSERT INTO Foo VALUES ('a');
DROP TABLE Foo;
CREATE TABLE Foo
(
Bar text CHARACTER SET utf8,
KEY Bar (Bar(1))
) ENGINE = InnoDB;
ALTER TABLE Foo MODIFY Bar text CHARACTER SET utf8mb4;
INSERT INTO Foo VALUES ('a');
DROP TABLE Foo;
CREATE TABLE t1 (a VARCHAR(2) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci,
PRIMARY KEY (a(1)))
ENGINE=InnoDB;
SHOW CREATE TABLE t1;
ALTER TABLE t1 MODIFY a VARCHAR(2)
CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
INSERT INTO t1 VALUES ('a');
DROP TABLE t1;
storage/innobase/handler/ha_innodb.cc
View file @ 423de1e5
......@@ -20970,6 +20970,31 @@ bool ha_innobase::rowid_filter_push(Rowid_filter* pk_filter)
DBUG_RETURN(false);
}
static bool is_part_of_a_key_prefix(const Field_longstr *field)
{
const TABLE_SHARE *s= field->table->s;
for (uint i= 0; i < s->keys; i++)
{
const KEY &key= s->key_info[i];
for (uint j= 0; j < key.user_defined_key_parts; j++)
{
const KEY_PART_INFO &info= key.key_part[j];
// When field is a part of some key, a key part and field will have the
// same length. And their length will be different when only some prefix
// of a field is used as a key part. That's what we're looking for here.
if (info.field->field_index == field->field_index &&
info.length != field->field_length)
{
DBUG_ASSERT(info.length < field->field_length);
return true;
}
}
}
return false;
}
static bool
is_part_of_a_primary_key(const Field* field)
{
......@@ -21004,6 +21029,11 @@ bool ha_innobase::can_convert_string(const Field_string *field,
if (!field_cs.eq_collation_specific_names(new_type.charset))
return !is_part_of_a_primary_key(field);
// Fully indexed case works instantly like
// Compare_keys::EqualButKeyPartLength. But prefix case isn't implemented.
if (is_part_of_a_key_prefix(field))
return false;
return true;
}
......@@ -21018,53 +21048,50 @@ supports_enlarging(const dict_table_t* table, const Field_varstring* field,
|| field->field_length > 255 || !table->not_redundant();
}
bool
ha_innobase::can_convert_varstring(const Field_varstring* field,
const Column_definition& new_type) const
bool ha_innobase::can_convert_varstring(
const Field_varstring *field, const Column_definition &new_type) const
{
if (new_type.length < field->field_length) {
return false;
}
if (new_type.length < field->field_length)
return false;
if (new_type.char_length < field->char_length()) {
return false;
}
if (new_type.char_length < field->char_length())
return false;
if (!new_type.compression_method() != !field->compression_method()) {
return false;
}
if (!new_type.compression_method() != !field->compression_method())
return false;
if (new_type.type_handler() != field->type_handler()) {
return false;
}
if (new_type.type_handler() != field->type_handler())
return false;
if (new_type.charset != field->charset()) {
if (!supports_enlarging(m_prebuilt->table, field, new_type)) {
return false;
}
if (new_type.charset != field->charset())
{
if (!supports_enlarging(m_prebuilt->table, field, new_type))
return false;
Charset field_cs(field->charset());
if (!field_cs.encoding_allows_reinterpret_as(
new_type.charset)) {
return false;
}
Charset field_cs(field->charset());
if (!field_cs.encoding_allows_reinterpret_as(new_type.charset))
return false;
if (!field_cs.eq_collation_specific_names(new_type.charset)) {
return !is_part_of_a_primary_key(field);
}
if (!field_cs.eq_collation_specific_names(new_type.charset))
return !is_part_of_a_primary_key(field);
return true;
}
// Fully indexed case works instantly like
// Compare_keys::EqualButKeyPartLength. But prefix case isn't implemented.
if (is_part_of_a_key_prefix(field))
return false;
if (new_type.length != field->field_length) {
if (!supports_enlarging(m_prebuilt->table, field, new_type)) {
return false;
}
return true;
}
return true;
}
if (new_type.length != field->field_length)
{
if (!supports_enlarging(m_prebuilt->table, field, new_type))
return false;
return true;
return true;
}
return true;
}
static bool is_part_of_a_key(const Field_blob *field)
......@@ -21106,6 +21133,11 @@ bool ha_innobase::can_convert_blob(const Field_blob *field,
if (!field_cs.eq_collation_specific_names(new_type.charset))
return !is_part_of_a_key(field);
// Fully indexed case works instantly like
// Compare_keys::EqualButKeyPartLength. But prefix case isn't implemented.
if (is_part_of_a_key_prefix(field))
return false;
return true;
}
......
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