Fix query id extraction from request query #265
Merged
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
mosabua
reviewed
Feb 27, 2024
| @@ -61,6 +61,7 @@ public class QueryIdCachingProxyHandler | |||
| public static final String HOST_HEADER = "Host"; | |||
| private static final int QUERY_TEXT_LENGTH_FOR_HISTORY = 200; | |||
| private static final Pattern QUERY_ID_PATTERN = Pattern.compile(".*[/=?](\\d+_\\d+_\\d+_\\w+).*"); | |||
| private static final Pattern QUERY_ID_PARAM_PATTERN = Pattern.compile(".*(?:%2F|=|^)(\\d+_\\d+_\\d+_\\w+).*"); | |||
There was a problem hiding this comment.
I am curious if trino also uses the same pattern.
There was a problem hiding this comment.
Trino uses a lightweight test that only checks for characters in the set [_a-z0-9]. A queryId could technically be something like "testqueryid", as you see in some tests, but the generator imposes a specific format
These patterns impose additional restrictions on where a queryid can appear to reduce false positives.
mosabua
reviewed
Feb 27, 2024
gateway-ha/src/test/java/io/trino/gateway/ha/handler/TestQueryIdCachingProxyHandler.java
Outdated
Show resolved
Hide resolved
mosabua
reviewed
Feb 27, 2024
gateway-ha/src/test/java/io/trino/gateway/ha/handler/TestQueryIdCachingProxyHandler.java
Outdated
Show resolved
Hide resolved
vishalya
previously requested changes
Feb 27, 2024
gateway-ha/src/test/java/io/trino/gateway/ha/handler/TestQueryIdCachingProxyHandler.java
Outdated
Show resolved
Hide resolved
Chaho12
reviewed
Feb 28, 2024
gateway-ha/src/main/java/io/trino/gateway/ha/handler/QueryIdCachingProxyHandler.java
Outdated
Show resolved
Hide resolved
gateway-ha/src/test/java/io/trino/gateway/ha/handler/TestQueryIdCachingProxyHandler.java
Outdated
Show resolved
Hide resolved
willmostly
force-pushed
the
will/match_query_id_in_param
branch
2 times, most recently
from
2bc7f9f to
24d9c17
Compare
ebyhr
reviewed
Feb 29, 2024
gateway-ha/src/test/java/io/trino/gateway/ha/handler/TestQueryIdCachingProxyHandler.java
Outdated
Show resolved
Hide resolved
willmostly
force-pushed
the
will/match_query_id_in_param
branch
2 times, most recently
from
e7d8f53 to
c89ea0d
Compare
mosabua
reviewed
Feb 29, 2024
| @@ -60,7 +60,8 @@ public class QueryIdCachingProxyHandler | |||
| public static final String SOURCE_HEADER = "X-Trino-Source"; | |||
| public static final String HOST_HEADER = "Host"; | |||
| private static final int QUERY_TEXT_LENGTH_FOR_HISTORY = 200; | |||
| private static final Pattern QUERY_ID_PATTERN = Pattern.compile(".*[/=?](\\d+_\\d+_\\d+_\\w+).*"); | |||
| private static final Pattern QUERY_ID_PATH_PATTERN = Pattern.compile(".*/(\\d+_\\d+_\\d+_\\w+).*"); | |||
| private static final Pattern QUERY_ID_PARAM_PATTERN = Pattern.compile(".*(?:%2F|(?i)query_?id(?-i)=|^)(\\d+_\\d+_\\d+_\\w+).*"); | |||
There was a problem hiding this comment.
oh how I hate regex like this .. should we somehow add some Java doc that explains it a little bit .. or do we just treat the test as the docs?
mosabua
approved these changes
Feb 29, 2024
ebyhr
reviewed
Feb 29, 2024
gateway-ha/src/main/java/io/trino/gateway/ha/handler/QueryIdCachingProxyHandler.java
Show resolved
Hide resolved
willmostly
force-pushed
the
will/match_query_id_in_param
branch
from
c89ea0d to
5a6bbad
Compare
|
@Chaho12 also confirmed in the dev sync on the 6th of March that this PR is good to go. |
mosabua
approved these changes
Mar 6, 2024
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 logic for extracting a query id from the request query was broken. The test for this functionality was also broken, since it passed the
queryto the extraction method as part of thepath.