database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

MDEV-35169 ALTER TABLE...IMPORT TABLESPACE does not work with INDEX DESC

Browse Source 
Problem:
=======
- Import tablespace fails to check the index fields descending
property while matching the schema given in cfg file with the
table schema.

Fix:
===
row_quiesce_write_index_fields(): Write the descending
property of the field into field fixed length field.
Since the field fixed length uses only 10 bits,
InnoDB can use 0th bit of the field fixed length
to store the descending field property.

row_import_cfg_read_index_fields(): Read the field
descending information from field fixed length.
This commit is contained in:
Thirunarayanan Balathandayuthapani
2025-01-28 11:56:35 +05:30
parent 24c9033947
commit f6e00abda0
6 changed files with 178 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
mysql-test/suite/innodb/r/import_cfg.result Normal file
View File

@@ -0,0 +1,67 @@
#
# MDEV-35169 ALTER TABLE...IMPORT TABLESPACE does not
# work with INDEX DESC
#
# prepare cfg for primary key with desc column
create table t1 (pk int, a int, primary key(pk desc)) engine=InnoDB;
insert into t1 values (1,10),(2,20),(3,15);
flush table t1 for export;
unlock tables;
drop table t1;
# prepare cfg for secondary index with desc column
create table t1 (pk int primary key, a int,key(a desc)) engine=InnoDB;
insert into t1 values (1,10),(2,20),(3,15);
flush table t1 for export;
unlock tables;
drop table t1;
# prepare cfg for secondary index with ascending column
create table t1 (pk int primary key, a int, key(a)) engine=InnoDB;
insert into t1 values (1,10),(2,20),(3,15);
flush table t1 for export;
unlock tables;
drop table t1;
# Import desc tablespace into desc frm
# Import into table with desc primary key column
create table t1 (pk int, a int, primary key(pk desc)) engine=InnoDB;
alter table t1 discard tablespace;
alter table t1 import tablespace;
check table t1 extended;
Table Op Msg_type Msg_text
test.t1 check status OK
drop table t1;
# Import into table with desc secondary index
create table t1 (pk int primary key, a int, key(a desc))engine=InnoDB;
alter table t1 discard tablespace;
alter table t1 import tablespace;
check table t1 extended;
Table Op Msg_type Msg_text
test.t1 check status OK
drop table t1;
# Import asc tablespace into desc frm
create table t1 (pk int primary key, a int, key(a desc))engine=InnoDB;
alter table t1 discard tablespace;
alter table t1 import tablespace;
ERROR HY000: Schema mismatch (Index a field a is DESC which does not match with .cfg file)
check table t1 extended;
Table Op Msg_type Msg_text
test.t1 check Error Tablespace has been discarded for table `t1`
test.t1 check error Corrupt
drop table t1;
# Import desc tablespace into asc frm
create table t1 (pk int primary key, a int, key(a)) engine=InnoDB;
alter table t1 discard tablespace;
alter table t1 import tablespace;
ERROR HY000: Schema mismatch (Index a field a is ASC which does not match with .cfg file)
check table t1 extended;
Table Op Msg_type Msg_text
test.t1 check Error Tablespace has been discarded for table `t1`
test.t1 check error Corrupt
drop table t1;
# Import asc tablespace into asc frm
create table t1 (pk int primary key, a int, key(a)) engine=InnoDB;
alter table t1 discard tablespace;
alter table t1 import tablespace;
check table t1 extended;
Table Op Msg_type Msg_text
test.t1 check status OK
drop table t1;

10
mysql-test/suite/innodb/r/innodb-wl5522-debug.result
View File

@@ -158,16 +158,6 @@ SET SESSION debug_dbug=@saved_debug_dbug;
DROP TABLE t1;
CREATE TABLE t1 (c1 INT) ENGINE = Innodb;
INSERT INTO t1 VALUES (1);
SET SESSION debug_dbug="+d,ib_export_io_write_failure_9";
FLUSH TABLES t1 FOR EXPORT;
Warnings:
Warning 1811 IO Write error: (9, Bad file descriptor) t1.cfg flush() failed
Warning 1811 IO Write error: (9, Bad file descriptor) t1.cfg flose() failed
UNLOCK TABLES;
SET SESSION debug_dbug=@saved_debug_dbug;
DROP TABLE t1;
CREATE TABLE t1 (c1 INT) ENGINE = Innodb;
INSERT INTO t1 VALUES (1);
SET SESSION debug_dbug="+d,ib_export_io_write_failure_10";
FLUSH TABLES t1 FOR EXPORT;
Warnings:

83
mysql-test/suite/innodb/t/import_cfg.test Normal file
View File

@@ -0,0 +1,83 @@
--source include/have_innodb.inc
--let $datadir= `select @@datadir`
--echo #
--echo # MDEV-35169 ALTER TABLE...IMPORT TABLESPACE does not
--echo # work with INDEX DESC
--echo #
--echo # prepare cfg for primary key with desc column
create table t1 (pk int, a int, primary key(pk desc)) engine=InnoDB;
insert into t1 values (1,10),(2,20),(3,15);
flush table t1 for export;
--copy_file $datadir/test/t1.ibd $datadir/test/t1_pk.ibd.desc
--copy_file $datadir/test/t1.cfg $datadir/test/t1_pk.cfg.desc
unlock tables;
drop table t1;
--echo # prepare cfg for secondary index with desc column
create table t1 (pk int primary key, a int,key(a desc)) engine=InnoDB;
insert into t1 values (1,10),(2,20),(3,15);
flush table t1 for export;
--copy_file $datadir/test/t1.ibd $datadir/test/t1.ibd.desc
--copy_file $datadir/test/t1.cfg $datadir/test/t1.cfg.desc
unlock tables;
drop table t1;
--echo # prepare cfg for secondary index with ascending column
create table t1 (pk int primary key, a int, key(a)) engine=InnoDB;
insert into t1 values (1,10),(2,20),(3,15);
flush table t1 for export;
--copy_file $datadir/test/t1.ibd $datadir/test/t1.ibd.asc
--copy_file $datadir/test/t1.cfg $datadir/test/t1.cfg.asc
unlock tables;
drop table t1;
--echo # Import desc tablespace into desc frm
--echo # Import into table with desc primary key column
create table t1 (pk int, a int, primary key(pk desc)) engine=InnoDB;
alter table t1 discard tablespace;
--copy_file $datadir/test/t1_pk.ibd.desc $datadir/test/t1.ibd
--copy_file $datadir/test/t1_pk.cfg.desc $datadir/test/t1.cfg
alter table t1 import tablespace;
check table t1 extended;
drop table t1;
--echo # Import into table with desc secondary index
create table t1 (pk int primary key, a int, key(a desc))engine=InnoDB;
alter table t1 discard tablespace;
--copy_file $datadir/test/t1.ibd.desc $datadir/test/t1.ibd
--copy_file $datadir/test/t1.cfg.desc $datadir/test/t1.cfg
alter table t1 import tablespace;
check table t1 extended;
drop table t1;
--echo # Import asc tablespace into desc frm
create table t1 (pk int primary key, a int, key(a desc))engine=InnoDB;
alter table t1 discard tablespace;
--copy_file $datadir/test/t1.ibd.asc $datadir/test/t1.ibd
--copy_file $datadir/test/t1.cfg.asc $datadir/test/t1.cfg
--error ER_TABLE_SCHEMA_MISMATCH
alter table t1 import tablespace;
check table t1 extended;
drop table t1;
--echo # Import desc tablespace into asc frm
create table t1 (pk int primary key, a int, key(a)) engine=InnoDB;
alter table t1 discard tablespace;
--copy_file $datadir/test/t1.ibd.desc $datadir/test/t1.ibd
--copy_file $datadir/test/t1.cfg.desc $datadir/test/t1.cfg
--error ER_TABLE_SCHEMA_MISMATCH
alter table t1 import tablespace;
check table t1 extended;
drop table t1;
--echo # Import asc tablespace into asc frm
create table t1 (pk int primary key, a int, key(a)) engine=InnoDB;
alter table t1 discard tablespace;
--copy_file $datadir/test/t1.ibd.asc $datadir/test/t1.ibd
--copy_file $datadir/test/t1.cfg.asc $datadir/test/t1.cfg
alter table t1 import tablespace;
check table t1 extended;
drop table t1;

16
mysql-test/suite/innodb/t/innodb-wl5522-debug.test
View File

@@ -280,22 +280,6 @@ SET SESSION debug_dbug=@saved_debug_dbug;
DROP TABLE t1;
CREATE TABLE t1 (c1 INT) ENGINE = Innodb;
INSERT INTO t1 VALUES (1);
SET SESSION debug_dbug="+d,ib_export_io_write_failure_9";
--replace_regex /, .*\).*t1.cfg/, Bad file descriptor) t1.cfg/
FLUSH TABLES t1 FOR EXPORT;
UNLOCK TABLES;
SET SESSION debug_dbug=@saved_debug_dbug;
DROP TABLE t1;
CREATE TABLE t1 (c1 INT) ENGINE = Innodb;
INSERT INTO t1 VALUES (1);

16
storage/innobase/row/row0import.cc
View File

@@ -1213,6 +1213,16 @@ row_import::match_index_columns(
err = DB_ERROR;
}
if (cfg_field->descending != field->descending) {
ib_errf(thd, IB_LOG_LEVEL_ERROR,
ER_TABLE_SCHEMA_MISMATCH,
"Index %s field %s is %s which does "
"not match with .cfg file",
index->name(), field->name(),
field->descending ? "DESC" : "ASC");
err = DB_ERROR;
}
}
return(err);
@@ -2557,7 +2567,11 @@ row_import_cfg_read_index_fields(
field->prefix_len = mach_read_from_4(ptr) & ((1U << 12) - 1);
ptr += sizeof(ib_uint32_t);
field->fixed_len = mach_read_from_4(ptr) & ((1U << 10) - 1);
uint32_t fixed_len = mach_read_from_4(ptr);
field->descending = bool(fixed_len >> 31);
field->fixed_len = fixed_len & ((1U << 10) - 1);
ptr += sizeof(ib_uint32_t);
/* Include the NUL byte in the length. */

33
storage/innobase/row/row0quiesce.cc
View File

@@ -47,45 +47,38 @@ row_quiesce_write_index_fields(
FILE* file, /*!< in: file to write to */
THD* thd) /*!< in/out: session */
{
byte row[sizeof(ib_uint32_t) * 2];
byte row[sizeof(ib_uint32_t) * 3];
for (ulint i = 0; i < index->n_fields; ++i) {
byte* ptr = row;
const dict_field_t* field = &index->fields[i];
mach_write_to_4(ptr, field->prefix_len);
ptr += sizeof(ib_uint32_t);
ptr += 4;
mach_write_to_4(ptr, field->fixed_len);
DBUG_EXECUTE_IF("ib_export_io_write_failure_9",
close(fileno(file)););
if (fwrite(row, 1, sizeof(row), file) != sizeof(row)) {
ib_senderrf(
thd, IB_LOG_LEVEL_WARN, ER_IO_WRITE_ERROR,
(ulong) errno, strerror(errno),
"while writing index fields.");
return(DB_IO_ERROR);
}
/* Since maximum fixed length can be
DICT_ANTELOPE_MAX_INDEX_COL_LEN, InnoDB
can use the 0th bit to store the
field descending information */
mach_write_to_4(ptr, field->fixed_len
| uint32_t(field->descending) << 31);
ptr += 4;
const char* field_name = field->name ? field->name : "";
/* Include the NUL byte in the length. */
ib_uint32_t len = static_cast<ib_uint32_t>(strlen(field_name) + 1);
mach_write_to_4(row, len);
uint32_t len = uint32_t(strlen(field_name) + 1);
mach_write_to_4(ptr, len);
DBUG_EXECUTE_IF("ib_export_io_write_failure_10",
close(fileno(file)););
if (fwrite(row, 1, sizeof(len), file) != sizeof(len)
if (fwrite(row, 1, sizeof(row), file) != sizeof(row)
|| fwrite(field_name, 1, len, file) != len) {
ib_senderrf(
thd, IB_LOG_LEVEL_WARN, ER_IO_WRITE_ERROR,
(ulong) errno, strerror(errno),
"while writing index column.");
"while writing index fields.");
return(DB_IO_ERROR);
}