Skip to content
/ server Public

MDEV-24931: Fix Bitmap<64>::is_prefix assertion with >64-column NATURAL JOIN on derived table #4756

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

Open
bodyhedia44 wants to merge 1 commit into
base: 10.11
Choose a base branch
from
+85 −2
Open

MDEV-24931: Fix Bitmap<64>::is_prefix assertion with >64-column NATURAL JOIN on derived table #4756

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 32 additions & 0 deletions mysql-test/main/derived_opt.result
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -567,4 +567,36 @@ DROP TABLE t1, t2;
#
# End of 10.3 tests
#
#
# MDEV-24931: Assertion `prefix_size <= width' failed in
# Bitmap<64>::is_prefix with >64-column NATURAL JOIN on derived table
#
CREATE TABLE t1 (
c1 INT, c2 INT, c3 INT, c4 INT, c5 INT, c6 INT, c7 INT, c8 INT,
c9 INT, c10 INT, c11 INT, c12 INT, c13 INT, c14 INT, c15 INT, c16 INT,
c17 INT, c18 INT, c19 INT, c20 INT, c21 INT, c22 INT, c23 INT, c24 INT,
c25 INT, c26 INT, c27 INT, c28 INT, c29 INT, c30 INT, c31 INT, c32 INT,
c33 INT, c34 INT, c35 INT, c36 INT, c37 INT, c38 INT, c39 INT, c40 INT,
c41 INT, c42 INT, c43 INT, c44 INT, c45 INT, c46 INT, c47 INT, c48 INT,
c49 INT, c50 INT, c51 INT, c52 INT, c53 INT, c54 INT, c55 INT, c56 INT,
c57 INT, c58 INT, c59 INT, c60 INT, c61 INT, c62 INT, c63 INT, c64 INT,
c65 INT
);
CREATE VIEW v1 AS SELECT * FROM t1;
set optimizer_switch='derived_merge=off';
# Derived table subquery
SELECT * FROM t1 AS a NATURAL JOIN (SELECT * FROM t1) AS b;
c1 c2 c3 c4 c5 c6 c7 c8 c9 c10 c11 c12 c13 c14 c15 c16 c17 c18 c19 c20 c21 c22 c23 c24 c25 c26 c27 c28 c29 c30 c31 c32 c33 c34 c35 c36 c37 c38 c39 c40 c41 c42 c43 c44 c45 c46 c47 c48 c49 c50 c51 c52 c53 c54 c55 c56 c57 c58 c59 c60 c61 c62 c63 c64 c65
# View
SELECT * FROM v1 NATURAL JOIN t1;
c1 c2 c3 c4 c5 c6 c7 c8 c9 c10 c11 c12 c13 c14 c15 c16 c17 c18 c19 c20 c21 c22 c23 c24 c25 c26 c27 c28 c29 c30 c31 c32 c33 c34 c35 c36 c37 c38 c39 c40 c41 c42 c43 c44 c45 c46 c47 c48 c49 c50 c51 c52 c53 c54 c55 c56 c57 c58 c59 c60 c61 c62 c63 c64 c65
# CTE
WITH cte AS (SELECT * FROM t1) SELECT * FROM t1 NATURAL JOIN cte;
c1 c2 c3 c4 c5 c6 c7 c8 c9 c10 c11 c12 c13 c14 c15 c16 c17 c18 c19 c20 c21 c22 c23 c24 c25 c26 c27 c28 c29 c30 c31 c32 c33 c34 c35 c36 c37 c38 c39 c40 c41 c42 c43 c44 c45 c46 c47 c48 c49 c50 c51 c52 c53 c54 c55 c56 c57 c58 c59 c60 c61 c62 c63 c64 c65
set optimizer_switch= @save_optimizer_switch;
DROP VIEW v1;
DROP TABLE t1;
#
# End of 10.11 tests
#
set optimizer_switch=@exit_optimizer_switch;
38 changes: 38 additions & 0 deletions mysql-test/main/derived_opt.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -439,5 +439,43 @@ DROP TABLE t1, t2;
--echo # End of 10.3 tests
--echo #

--echo #
--echo # MDEV-24931: Assertion `prefix_size <= width' failed in
--echo # Bitmap<64>::is_prefix with >64-column NATURAL JOIN on derived table
--echo #

CREATE TABLE t1 (
c1 INT, c2 INT, c3 INT, c4 INT, c5 INT, c6 INT, c7 INT, c8 INT,
c9 INT, c10 INT, c11 INT, c12 INT, c13 INT, c14 INT, c15 INT, c16 INT,
c17 INT, c18 INT, c19 INT, c20 INT, c21 INT, c22 INT, c23 INT, c24 INT,
c25 INT, c26 INT, c27 INT, c28 INT, c29 INT, c30 INT, c31 INT, c32 INT,
c33 INT, c34 INT, c35 INT, c36 INT, c37 INT, c38 INT, c39 INT, c40 INT,
c41 INT, c42 INT, c43 INT, c44 INT, c45 INT, c46 INT, c47 INT, c48 INT,
c49 INT, c50 INT, c51 INT, c52 INT, c53 INT, c54 INT, c55 INT, c56 INT,
c57 INT, c58 INT, c59 INT, c60 INT, c61 INT, c62 INT, c63 INT, c64 INT,
c65 INT
);

CREATE VIEW v1 AS SELECT * FROM t1;

set optimizer_switch='derived_merge=off';

--echo # Derived table subquery
SELECT * FROM t1 AS a NATURAL JOIN (SELECT * FROM t1) AS b;

--echo # View
SELECT * FROM v1 NATURAL JOIN t1;

--echo # CTE
WITH cte AS (SELECT * FROM t1) SELECT * FROM t1 NATURAL JOIN cte;

set optimizer_switch= @save_optimizer_switch;
DROP VIEW v1;
DROP TABLE t1;

--echo #
--echo # End of 10.11 tests
--echo #

# The following command must be the last one the file
set optimizer_switch=@exit_optimizer_switch;
17 changes: 15 additions & 2 deletions sql/sql_select.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14071,26 +14071,39 @@ bool generate_derived_keys_for_table(KEYUSE *keyuse, uint count, uint keys)
KEYUSE *first_keyuse= keyuse;
uint prev_part= keyuse->keypart;
uint parts= 0;
uint max_parts= table->file->max_key_parts();
uint i= 0;

for ( ; i < count && key_count < keys; )
{
do
{
keyuse->key= table->s->keys;
keyuse->keypart_map= (key_part_map) (1 << parts);
keyuse->keypart_map= (key_part_map) 1 << parts;
keyuse++;
i++;
}
while (i < count && keyuse->used_tables == first_keyuse->used_tables &&
keyuse->keypart == prev_part);
parts++;
if (i < count && keyuse->used_tables == first_keyuse->used_tables)
if (i < count && keyuse->used_tables == first_keyuse->used_tables
&& parts < max_parts)
{
prev_part= keyuse->keypart;
}
else
{
/*
Cap derived keys at max_key_parts to avoid shift overflow and
Bitmap<64> assertion failures (MDEV-24931). Mark any remaining
keyuses for the same table as unused.
*/
while (i < count && keyuse->used_tables == first_keyuse->used_tables)
{
keyuse->key= MAX_KEY;
keyuse++;
i++;
}
KEYUSE *save_first_keyuse= first_keyuse;
if (table->check_tmp_key(table->s->keys, parts,
get_next_field_for_derived_key_simple,
Expand Down