feat: support v1 query API GROUP BY semantics #25845
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
hiltontj
force-pushed
the
hiltontj/influxql-query-exec
branch
from
5dc5f3c to
9ca6f0b
Compare
hiltontj
commented
Jan 16, 2025
| @@ -292,6 +320,55 @@ async fn query_database( | |||
| } | |||
| } | |||
|
|
|||
There was a problem hiding this comment.
For now, there is a bit of code repetition between this and the query_database_sql method.
hiltontj
commented
Jan 16, 2025
| } | ||
|
|
||
| // NOTE: the below code is currently copied from IOx and needs to be made pub so we can | ||
| // re-use it. |
There was a problem hiding this comment.
I will open an issue in IOx to make these types visible from the appropriate crates.
hiltontj
force-pushed
the
hiltontj/influxql-query-exec
branch
from
9ca6f0b to
dceb6b6
Compare
hiltontj
commented
Jan 16, 2025
Comment on lines
+968
to
+971
| // TODO: this is defined in schema crate, so needs to be made pub there: | ||
| const COLUMN_METADATA_KEY: &str = "iox::column::type"; |
There was a problem hiding this comment.
Need to expose this in IOx as part of follow up work.
This updates the v1 /query API hanlder to handle InfluxDB v1's unique query response structure when GROUP BY clauses are provided. The distinction is in the addition of a "tags" field to the emitted series data that contains a map of the GROUP BY tags along with their distinct values associated with the data in the "values" field. This required splitting the QueryExecutor into two query paths for InfluxQL and SQL, as this allowed for handling InfluxQL query parsing in advance of query planning. A set of snapshot tests were added to check that it all works.
hiltontj
force-pushed
the
hiltontj/influxql-query-exec
branch
from
dceb6b6 to
6b6a555
Compare
pauldix
approved these changes
Jan 16, 2025
| /// ```text | ||
| /// select * from foo group by t1, t2 | ||
| /// ``` | ||
| /// If `t1` is a tag in the table, but `t2` is not, nor is a field in the table, then the v1 |
There was a problem hiding this comment.
This is super gnarly. Wow, the v1 API...
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.
Closes #25751
Closes #25831
This updates the v1
/queryAPI handler to handle InfluxDB v1's unique query response structure whenGROUP BYclauses are provided (#25751).The distinction is in the addition of a "tags" field to the emitted series data that contains a map of the GROUP BY tags along with their distinct values associated with the data in the "values" field.
A set of snapshot tests were added to check that the structure of the data is correct when the carious kind of
GROUP BYclauses are provided.This required splitting the
QueryExecutorinto two query paths for InfluxQL and SQL, as this allowed for handling InfluxQL query parsing in advance of query planning (#25831).