database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

MDEV-4001: Cassandra: server crashes in ha_cassandra::end_bulk_insert on INSERT .. SELECT with a non-existing column

Browse Source 
- INSERT ... SELECT may call handler->end_bulk_insert() without having
  called handler->start_bulk_insert(). Let Cassandra SE handle this.
This commit is contained in:
Sergey Petrunya
2013-05-28 13:32:39 +04:00
parent c00a37d113
commit 38c611ed59
3 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mysql-test/suite/plugins/r/cassandra.result
View File

@ -627,3 +627,10 @@ rowkey b
1 fooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo-bar 1 fooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo-bar
2 qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq-baz 2 qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq-baz
drop table t1; drop table t1;
#
# MDEV-4001: Cassandra: server crashes in ha_cassandra::end_bulk_insert on INSERT .. SELECT with a non-existing column
#
create table t1 (rowkey int primary key, a int) ENGINE=cassandra thrift_host='127.0.0.1' keyspace='mariadbtest2' column_family='cf14';
insert into t1 (a) select b from t1;
ERROR 42S22: Unknown column 'b' in 'field list'
drop table t1;

11
mysql-test/suite/plugins/t/cassandra.test
View File

@ -93,6 +93,8 @@ create columnfamily cf12 (rowkey varchar primary key, decimal_col decimal);
create columnfamily cf13 (rowkey int primary key, b blob); create columnfamily cf13 (rowkey int primary key, b blob);
create columnfamily cf14 ( rowkey int primary key, a int );
EOF EOF
--error 0,1,2 --error 0,1,2
--system cqlsh -3 -f $MYSQLTEST_VARDIR/cassandra_test_init.cql --system cqlsh -3 -f $MYSQLTEST_VARDIR/cassandra_test_init.cql
@ -727,6 +729,14 @@ insert into t1 values (2, 'qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq
select * from t1; select * from t1;
drop table t1; drop table t1;
--echo #
--echo # MDEV-4001: Cassandra: server crashes in ha_cassandra::end_bulk_insert on INSERT .. SELECT with a non-existing column
--echo #
create table t1 (rowkey int primary key, a int) ENGINE=cassandra thrift_host='127.0.0.1' keyspace='mariadbtest2' column_family='cf14';
--error ER_BAD_FIELD_ERROR
insert into t1 (a) select b from t1;
drop table t1;
############################################################################ ############################################################################
## Cassandra cleanup ## Cassandra cleanup
############################################################################ ############################################################################
@ -740,6 +750,7 @@ drop columnfamily cf6;
drop columnfamily cf7; drop columnfamily cf7;
drop columnfamily cf13; drop columnfamily cf13;
drop columnfamily cf14;
--enable_parsing --enable_parsing
############################################################################ ############################################################################
## Cassandra cleanup ends ## Cassandra cleanup ends

6
storage/cassandra/ha_cassandra.cc
View File

@ -2041,6 +2041,12 @@ void ha_cassandra::start_bulk_insert(ha_rows rows, uint flags)
int ha_cassandra::end_bulk_insert() int ha_cassandra::end_bulk_insert()
{ {
DBUG_ENTER("ha_cassandra::end_bulk_insert"); DBUG_ENTER("ha_cassandra::end_bulk_insert");
if (!doing_insert_batch)
{
/* SQL layer can make end_bulk_insert call without start_bulk_insert call */
DBUG_RETURN(0);
}
/* Flush out the insert buffer */ /* Flush out the insert buffer */
doing_insert_batch= false; doing_insert_batch= false;