Fix AST parser regexp error for backslash-single quote \' #123
Conversation
This file contains 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
|
@it1804, Please add a test if possible. |
|
@it1804 thanks you for your PR |
Slach
added a commit
to Altinity/grafana-plugin-repository
that referenced
this pull request
Jun 17, 2020
# 2.0.0 (2020-06-17) ## Enhancements: * compatibility with grafana 7.x, please use environment variable `GF_PLUGINS_ALLOW_LOADING_UNSIGNED_PLUGINS=vertamedia-clickhouse-datasource` or `allow_loading_unsigned_plugins=vertamedia-clickhouse-datasource` in plugins section of `grafana.ini` Altinity/clickhouse-grafana#192 * add grafana 7.x alerting support thanks to Brian Thai https://github.com/bmanth60 * add alias support to $perSecondColumns macro Altinity/clickhouse-grafana#193 * Support `custom` variable type and empty values for `$conditionalTest` macro Altinity/clickhouse-grafana#178 * add docker-compose.yaml to improve local development ## Fixes: * fix AST for corner case when quotes escaped inside quotes Altinity/clickhouse-grafana#123, Altinity/clickhouse-grafana#195 * fix Altinity/clickhouse-grafana#179, add "Extrapolation" checkbox to Query Editor Signed-off-by: Slach <bloodjazman@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
The AST parser does not take into account the presence of backslashed single quotes, and the parsed token is truncated on them. Tested on plugin version 1.8.1 and Grafana 6.1.4.
Simple query:
SELECT arrayJoin(arrayMap(x -> MACStringToNum(x), splitByChar(',', replaceRegexpAll(replaceRegexpAll(toString(['CC:09:C8:08:50:2B','00:1A:79:06:3C:93']),'[\\[\\]\' \t\n]', ''),'([A-F0-9]+)','\\1'))))Сhrome developer console:
AST parser error: cannot find next token in [\t\n]', ''), '([A-F0-9]+)', '\\1'))))]This patch should fix it.