-
-
Notifications
You must be signed in to change notification settings - Fork 2.1k
MDEV-39479 Mroonga: avoid hang on invalid index flags #5011
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.
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
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
13 changes: 13 additions & 0 deletions
13
storage/mroonga/mysql-test/mroonga/storage/r/create_table_index_flags_invalid.result
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| # | ||
| # MDEV-39479 Mroonga: avoid hang on invalid index flags | ||
| # | ||
| CREATE TABLE memos ( | ||
| content VARCHAR(64) NOT NULL, | ||
| FULLTEXT INDEX (content) COMMENT 'flags "COMPRESS_ZSTD"' | ||
| ); | ||
| Warnings: | ||
| Warning 16508 The index flag 'COMPRESS_ZSTD' is invalid. It is ignored | ||
| SELECT mroonga_command("dump --dump_plugins no --dump_schema no"); | ||
| mroonga_command("dump --dump_plugins no --dump_schema no") | ||
| column_create memos#content index COLUMN_INDEX|WITH_POSITION memos content | ||
| DROP TABLE memos; |
34 changes: 34 additions & 0 deletions
34
storage/mroonga/mysql-test/mroonga/storage/t/create_table_index_flags_invalid.test
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| # Copyright(C) 2026 | ||
| # | ||
| # This library is free software; you can redistribute it and/or | ||
| # modify it under the terms of the GNU Lesser General Public | ||
| # License as published by the Free Software Foundation; either | ||
| # version 2.1 of the License, or (at your option) any later version. | ||
| # | ||
| # This library is distributed in the hope that it will be useful, | ||
| # but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| # Lesser General Public License for more details. | ||
| # | ||
| # You should have received a copy of the GNU Lesser General Public | ||
| # License along with this library; if not, write to the Free Software | ||
| # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA | ||
|
aquilamacedo marked this conversation as resolved.
|
||
|
|
||
| --echo # | ||
| --echo # MDEV-39479 Mroonga: avoid hang on invalid index flags | ||
| --echo # | ||
|
|
||
| --source ../../include/mroonga/have_mroonga.inc | ||
| --source ../../include/mroonga/load_mroonga_functions.inc | ||
|
|
||
| CREATE TABLE memos ( | ||
| content VARCHAR(64) NOT NULL, | ||
| FULLTEXT INDEX (content) COMMENT 'flags "COMPRESS_ZSTD"' | ||
| ); | ||
|
|
||
| SELECT mroonga_command("dump --dump_plugins no --dump_schema no"); | ||
|
|
||
| DROP TABLE memos; | ||
|
|
||
| --source ../../include/mroonga/unload_mroonga_functions.inc | ||
| --source ../../include/mroonga/have_mroonga_deinit.inc | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
good simple fix following what upstream have - https://github.com/mroonga/mroonga/blob/main/ha_mroonga.cpp#L2102
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks, and yes, this appears to match upstream Mroonga commit
923d16208bb9226671b663dae713acdfc1aaa3ea ("Fix a infinite loop bug").
The issue is still reproducible in MariaDB's bundled Mroonga code, so this patch effectively backports/syncs that fix here.