Exclude with statement names from tables #532
Open
+79
−30
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
reviewed
Oct 21, 2024
| @@ -194,13 +196,25 @@ else if (statement instanceof ExecuteImmediate executeImmediate) { | |||
|
|
|||
| queryType = statement.getClass().getSimpleName(); | |||
| resourceGroupQueryType = StatementUtils.getQueryType(statement).toString(); | |||
| ImmutableSet.Builder<QualifiedName> tableBuilder = ImmutableSet.builder(); | |||
| List<QualifiedName> allQUalifiedNames = new ArrayList<>(); | |||
There was a problem hiding this comment.
Why did you change to ArrayList? #Also, the new name has a typo. U should be a lowercase.
| private void getNames(Node node, ImmutableSet.Builder<QualifiedName> tableBuilder, | ||
| private void getNames( | ||
| Node node, | ||
| List<QualifiedName> allQualifiedNames, |
There was a problem hiding this comment.
I don't understand the difference between tableBuilder and allQualifiedNames. What's the motivation of this renaming?
Comment on lines
+412
to
+414
| WITH dos (c1) as (select c1 from uno), | ||
| uno(c1) as (select c1 from cat.schem.tbl1) | ||
| SELECT c1 from uno, dos |
There was a problem hiding this comment.
i don't think this is valid SQL. You cannot use uno as it is defined after dos.
Suggested change
| WITH dos (c1) as (select c1 from uno), | |
| uno(c1) as (select c1 from cat.schem.tbl1) | |
| SELECT c1 from uno, dos | |
| WITH dos AS (SELECT c1 from cat.schem.tbl1), | |
| uno as (SELECT c1 FROM dos) | |
| SELECT c1 FROM uno, dos |
you can test this in trino via simple sql
// works fine
WITH dos AS (SELECT node_id FROM system.runtime.nodes),
uno AS (SELECT node_id as node_id2 FROM dos)
SELECT node_id, node_id2
FROM uno, dos
// doesn't work as uno is not defined before dos.
// Query 20241023_021715_04215_f8xaz failed: line 1:34: Table 'system.runtime.uno' does not exist
WITH dos AS (SELECT node_id FROM uno),
uno AS (SELECT node_id as node_id2 FROM system.runtime.nodes)
SELECT node_id, node_id2
FROM uno, dos
Comment on lines
+424
to
+425
| assertThat(trinoQueryPropertiesWithDefaults.tablesContains(String.format("%s.%s.%s", DEFAULT_CATALOG, DEFAULT_SCHEMA, "uno"))).isFalse(); | ||
| assertThat(trinoQueryPropertiesWithDefaults.tablesContains(String.format("%s.%s.%s", DEFAULT_CATALOG, DEFAULT_SCHEMA, "does"))).isFalse(); |
There was a problem hiding this comment.
Static import format method. https://github.com/trinodb/trino/blob/master/.github/DEVELOPMENT.md#prefer-string-formatting
| when(mockRequestNoDefaults.getReader()).thenReturn(bufferedReader); | ||
|
|
||
| TrinoQueryProperties trinoQueryPropertiesNoDefaults = new TrinoQueryProperties(mockRequestNoDefaults, requestAnalyzerConfig); | ||
| assertThat(trinoQueryPropertiesNoDefaults.getTables().size()).isEqualTo(1); |
There was a problem hiding this comment.
do you consider temporary tables (with clause) as non-tables?
|
This overlaps with #531 ... |
Chaho12
reviewed
Oct 22, 2024
| case SetViewAuthorization s -> allQualifiedNames.add(s.getSource()); | ||
| case Table s -> allQualifiedNames.add(s.getName()); | ||
| case TableFunctionInvocation s -> allQualifiedNames.add(s.getName()); | ||
| case WithQuery withQuery -> withQueryNamesBuilder.add(withQuery.getName()); |
There was a problem hiding this comment.
didn't know you could do this directly, i thought withQuery comes with Query.
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
Exclude with statement names from the list of tables extracted from SQL by
TrinoQueryPropertiesAdditional context and related issues
The existing TrinoQueryProperties will include WITH statement names in the list of tables. For example, for the query
the tables list will be
{"c.s.t", "arbitrary_name"}, or, if default catalog and schema are not specified, processing of the SQL will fail whenTrinoQueryPopertiesattempts to qualifyarbitrary_namewith a catalog and schema.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: