Process Request for routing rules #325
Open
+1,136
−15
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
ebyhr
requested changes
Apr 24, 2024
gateway-ha/src/main/java/io/trino/gateway/ha/config/HaGatewayConfiguration.java
Outdated
Show resolved
Hide resolved
gateway-ha/src/main/java/io/trino/gateway/ha/config/HaGatewayConfiguration.java
Outdated
Show resolved
Hide resolved
gateway-ha/src/main/java/io/trino/gateway/ha/config/ProcessedRequestConfig.java
Outdated
Show resolved
Hide resolved
gateway-ha/src/main/java/io/trino/gateway/ha/router/ProcessedRequest.java
Outdated
Show resolved
Hide resolved
gateway-ha/src/main/java/io/trino/gateway/ha/router/ProcessedRequest.java
Outdated
Show resolved
Hide resolved
gateway-ha/src/main/java/io/trino/gateway/ha/router/ProcessedRequest.java
Outdated
Show resolved
Hide resolved
| return new String(preparedStatement, UTF_8); | ||
| } | ||
|
|
||
| private void getTables(Node node, Set<QualifiedName> tables) |
There was a problem hiding this comment.
Please add a unit test for this method.
There was a problem hiding this comment.
This method is tested by TestRoutingGroupSelector.testRequestProcessorQueryDetails. For the SQL
SELECT x.*, y.*, z.* FROM catx.schemx.tblx a, schemy.tbly y, tblz z
with default catalog and schema of cat_default and schem_"default, The matched rule checks
processedRequest.tablesContains("cat_default.\"schem_\\\"default\".tblz")
&& processedRequest.tablesContains("cat_default.schemy.tbly")
&& processedRequest.tablesContains("catx.schemx.tblx")
&& processedRequest.getSchemas().contains("schemy")
&& processedRequest.getCatalogs().contains("catx")
What would you like to see in a unit test?
Comment on lines
457
to
484
| public String getDefaultCatalog() | ||
| { | ||
| return defaultCatalog; | ||
| } | ||
|
|
||
| public Set<String> getCatalogs() | ||
| { | ||
| return catalogs; | ||
| } | ||
|
|
||
| public Set<String> getSchemas() | ||
| { | ||
| return schemas; | ||
| } | ||
|
|
||
| public Set<String> getCatalogSchemas() | ||
| { | ||
| return catalogSchemas; | ||
| } |
There was a problem hiding this comment.
These are intended for use in routing rules, but are unused in the Trino Gateway code. I added more cases to routing_rules_processed_request.yml to cover getDefaultCatalog() and getCatalogSchemas() and provide usage examples.
sajjoseph
reviewed
Apr 25, 2024
gateway-ha/src/main/java/io/trino/gateway/ha/router/ProcessedRequest.java
Outdated
Show resolved
Hide resolved
willmostly
force-pushed
the
will/process_request
branch
from
b6fa7cf
to
c100ecd
Compare
vishalya
reviewed
May 6, 2024
gateway-ha/src/main/java/io/trino/gateway/ha/router/ProcessedRequest.java
Outdated
Show resolved
Hide resolved
gateway-ha/src/main/java/io/trino/gateway/ha/router/RuleReloadingRoutingGroupSelector.java
Outdated
Show resolved
Hide resolved
gateway-ha/src/test/java/io/trino/gateway/ha/router/TestRoutingGroupSelector.java
Show resolved
Hide resolved
gateway-ha/src/main/java/io/trino/gateway/ha/router/ProcessedRequest.java
Outdated
Show resolved
Hide resolved
gateway-ha/src/main/java/io/trino/gateway/ha/router/ProcessedRequest.java
Outdated
Show resolved
Hide resolved
vishalya
reviewed
May 7, 2024
gateway-ha/src/main/java/io/trino/gateway/ha/router/RuleReloadingRoutingGroupSelector.java
Outdated
Show resolved
Hide resolved
|
Are you handling the DDL statements like create and drop table? They are useful in case of |
willmostly
force-pushed
the
will/process_request
branch
4 times, most recently
from
ba2f218
to
73c5ae6
Compare
willmostly
force-pushed
the
will/process_request
branch
from
2627287
to
8f2e510
Compare
|
@vishalya DDL statements are handled, please check provideTableExtractionQueries for the full list of statement types. LMK if I missed any. |
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.
Description
Extract information from the HttpServeletRequest into a class more convenient for usage in routing logic.
Additional context and related issues
Routing rules are authored in the MVEL language used by the jeasy rules engine. MVEL has limited functionality in comparison to standard Java, and cannot use libraries not included with the JDK. This PR passes an additional
processedRequestobject to the rules engine with getters for the user, query type, and SQL details such as referenced tables and schemas.Release notes
( ) This is not user-visible or is docs only, and no release notes are required.
( ) Release notes are required. Please propose a release note for me.
( x) Release notes are required, with the following suggested text:
* Process request to facilitate rule writing