You've already forked mariadb-columnstore-engine
mirror of
https://github.com/mariadb-corporation/mariadb-columnstore-engine.git
synced 2025-07-29 08:21:15 +03:00
fix(plugin) MCOL-5699: throw error for unimplemented INTERSECT and EXCEPT (#3219)
This commit is contained in:
@ -6830,6 +6830,26 @@ int processFrom(bool& isUnion, SELECT_LEX& select_lex, gp_walk_info& gwi, SCSEP&
|
|||||||
// Existed pushdown handlers won't get in this scope
|
// Existed pushdown handlers won't get in this scope
|
||||||
// MDEV-25080 Union pushdown would enter this scope
|
// MDEV-25080 Union pushdown would enter this scope
|
||||||
// is_unit_op() give a segv for derived_handler's SELECT_LEX
|
// is_unit_op() give a segv for derived_handler's SELECT_LEX
|
||||||
|
|
||||||
|
// check INTERSECT or EXCEPT, that are not implemented
|
||||||
|
if (select_lex.master_unit() && select_lex.master_unit()->first_select())
|
||||||
|
{
|
||||||
|
for (auto nextSelect = select_lex.master_unit()->first_select()->next_select(); nextSelect;
|
||||||
|
nextSelect = nextSelect->next_select())
|
||||||
|
{
|
||||||
|
if (nextSelect->get_linkage() == INTERSECT_TYPE)
|
||||||
|
{
|
||||||
|
setError(gwi.thd, ER_INTERNAL_ERROR, "INTERSECT is not supported by Columnstore engine", gwi);
|
||||||
|
return ER_INTERNAL_ERROR;
|
||||||
|
}
|
||||||
|
else if (nextSelect->get_linkage() == EXCEPT_TYPE)
|
||||||
|
{
|
||||||
|
setError(gwi.thd, ER_INTERNAL_ERROR, "EXCEPT is not supported by Columnstore engine", gwi);
|
||||||
|
return ER_INTERNAL_ERROR;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (!isUnion && (!isSelectHandlerTop || isSelectLexUnit) && select_lex.master_unit()->is_unit_op())
|
if (!isUnion && (!isSelectHandlerTop || isSelectLexUnit) && select_lex.master_unit()->is_unit_op())
|
||||||
{
|
{
|
||||||
// MCOL-2178 isUnion member only assigned, never used
|
// MCOL-2178 isUnion member only assigned, never used
|
||||||
|
43
mysql-test/columnstore/bugfixes/MCOL-5699.result
Normal file
43
mysql-test/columnstore/bugfixes/MCOL-5699.result
Normal file
@ -0,0 +1,43 @@
|
|||||||
|
DROP DATABASE IF EXISTS mcol_5699 ;
|
||||||
|
CREATE DATABASE mcol_5699 ;
|
||||||
|
USE mcol_5699 ;
|
||||||
|
CREATE TABLE cs1(a text) ENGINE=columnstore;
|
||||||
|
INSERT INTO cs1 VALUES('a'),('b'),('c'),('x');
|
||||||
|
CREATE TABLE cs2(a text) ENGINE=columnstore;
|
||||||
|
INSERT INTO cs2 VALUES('y'),('z'),('x');
|
||||||
|
CREATE TABLE cs3(a text) ENGINE=columnstore;
|
||||||
|
INSERT INTO cs3 VALUES('r'),('t'),('z');
|
||||||
|
SELECT a from cs1 UNION ALL select a from cs2;
|
||||||
|
a
|
||||||
|
a
|
||||||
|
b
|
||||||
|
c
|
||||||
|
x
|
||||||
|
x
|
||||||
|
y
|
||||||
|
z
|
||||||
|
SELECT a from cs1 UNION DISTINCT select a from cs2;
|
||||||
|
a
|
||||||
|
a
|
||||||
|
b
|
||||||
|
c
|
||||||
|
x
|
||||||
|
y
|
||||||
|
z
|
||||||
|
SELECT a from cs1 INTERSECT ALL select a from cs2;
|
||||||
|
ERROR HY000: Internal error: INTERSECT is not supported by Columnstore engine
|
||||||
|
SELECT a from cs1 INTERSECT DISTINCT select a from cs2;
|
||||||
|
ERROR HY000: Internal error: INTERSECT is not supported by Columnstore engine
|
||||||
|
SELECT a from cs1 EXCEPT ALL select a from cs2;
|
||||||
|
ERROR HY000: Internal error: EXCEPT is not supported by Columnstore engine
|
||||||
|
SELECT a from cs1 EXCEPT DISTINCT select a from cs2;
|
||||||
|
ERROR HY000: Internal error: EXCEPT is not supported by Columnstore engine
|
||||||
|
SELECT a from cs1 UNION select a from cs2 INTERSECT ALL select a from cs3;
|
||||||
|
ERROR HY000: Internal error: INTERSECT is not supported by Columnstore engine
|
||||||
|
SELECT a from cs1 UNION select a from cs2 INTERSECT DISTINCT select a from cs3;
|
||||||
|
ERROR HY000: Internal error: INTERSECT is not supported by Columnstore engine
|
||||||
|
SELECT a from cs1 UNION select a from cs2 EXCEPT ALL select a from cs3;
|
||||||
|
ERROR HY000: Internal error: EXCEPT is not supported by Columnstore engine
|
||||||
|
SELECT a from cs1 UNION select a from cs2 EXCEPT DISTINCT select a from cs3;
|
||||||
|
ERROR HY000: Internal error: EXCEPT is not supported by Columnstore engine
|
||||||
|
DROP DATABASE mcol_5699 ;
|
40
mysql-test/columnstore/bugfixes/MCOL-5699.test
Normal file
40
mysql-test/columnstore/bugfixes/MCOL-5699.test
Normal file
@ -0,0 +1,40 @@
|
|||||||
|
--source ../include/have_columnstore.inc
|
||||||
|
--disable_warnings
|
||||||
|
DROP DATABASE IF EXISTS mcol_5699 ;
|
||||||
|
--enable_warnings
|
||||||
|
CREATE DATABASE mcol_5699 ;
|
||||||
|
USE mcol_5699 ;
|
||||||
|
CREATE TABLE cs1(a text) ENGINE=columnstore;
|
||||||
|
INSERT INTO cs1 VALUES('a'),('b'),('c'),('x');
|
||||||
|
|
||||||
|
CREATE TABLE cs2(a text) ENGINE=columnstore;
|
||||||
|
INSERT INTO cs2 VALUES('y'),('z'),('x');
|
||||||
|
|
||||||
|
CREATE TABLE cs3(a text) ENGINE=columnstore;
|
||||||
|
INSERT INTO cs3 VALUES('r'),('t'),('z');
|
||||||
|
|
||||||
|
--sorted_result
|
||||||
|
SELECT a from cs1 UNION ALL select a from cs2;
|
||||||
|
--sorted_result
|
||||||
|
SELECT a from cs1 UNION DISTINCT select a from cs2;
|
||||||
|
|
||||||
|
--ERROR 1815
|
||||||
|
SELECT a from cs1 INTERSECT ALL select a from cs2;
|
||||||
|
--ERROR 1815
|
||||||
|
SELECT a from cs1 INTERSECT DISTINCT select a from cs2;
|
||||||
|
--ERROR 1815
|
||||||
|
SELECT a from cs1 EXCEPT ALL select a from cs2;
|
||||||
|
--ERROR 1815
|
||||||
|
SELECT a from cs1 EXCEPT DISTINCT select a from cs2;
|
||||||
|
|
||||||
|
--ERROR 1815
|
||||||
|
SELECT a from cs1 UNION select a from cs2 INTERSECT ALL select a from cs3;
|
||||||
|
--ERROR 1815
|
||||||
|
SELECT a from cs1 UNION select a from cs2 INTERSECT DISTINCT select a from cs3;
|
||||||
|
--ERROR 1815
|
||||||
|
SELECT a from cs1 UNION select a from cs2 EXCEPT ALL select a from cs3;
|
||||||
|
--ERROR 1815
|
||||||
|
SELECT a from cs1 UNION select a from cs2 EXCEPT DISTINCT select a from cs3;
|
||||||
|
|
||||||
|
|
||||||
|
DROP DATABASE mcol_5699 ;
|
Reference in New Issue
Block a user