GreptimeTeam / greptimedb

An Open-Source, Cloud-Native, Unified Time Series Database for Metrics, Events, and Logs with SQL/PromQL supported. Available on GreptimeCloud.
https://greptime.com/
Apache License 2.0
4k stars 289 forks source link

feat(sql): improve interval expression, support shortened version #4182

Closed etolbakov closed 3 weeks ago

etolbakov commented 3 weeks ago

I hereby agree to the terms of the GreptimeDB CLA.

Refer to a related PR or issue link

https://github.com/GreptimeTeam/greptimedb/issues/4168

What's changed and what's your intention?

improve interval expression by handling shortened version

Checklist

Summary by CodeRabbit

codecov[bot] commented 3 weeks ago

Codecov Report

Attention: Patch coverage is 97.29730% with 4 lines in your changes missing coverage. Please review.

Project coverage is 84.76%. Comparing base (4b42c7b) to head (a8435dc).

Additional details and impacted files ```diff @@ Coverage Diff @@ ## main #4182 +/- ## ========================================== - Coverage 85.03% 84.76% -0.28% ========================================== Files 1030 1031 +1 Lines 181129 181276 +147 ========================================== - Hits 154020 153653 -367 - Misses 27109 27623 +514 ```
etolbakov commented 3 weeks ago

I see that one sqlness test is failing

Result unexpected, path:"./tests/cases/standalone/common/types/interval/interval.sql"
[
    ... skip(287) ...,
~   Error: 3000(PlanQuery), Failed to plan SQL: Error during planning: No function matches the given name and argument types 'SUM(Interval(MonthDayNano))'. You might need to add explicit type casts. -> Error: 3000(PlanQuery), Failed to plan SQL: Error during planning: Execution error: User-defined coercion failed with Execution("Sum not supported for Interval(MonthDayNano)") and No function matches the given name and argument types 'SUM(Interval(MonthDayNano))'. You might need to add explicit type casts.,
        Candidate functions:,
~       SUM(Int8/Int16/Int32/Int64/UInt8/UInt16/UInt32/UInt64/Float32/Float64) ->   SUM(UserDefined),
    ... skip(11) ...
]

strangely enough I don't see the same behaviour running those tests locally. Keep looking though

killme2008 commented 3 weeks ago

@etolbakov Could you rebase the branch with the main branch? Looks like it's an issue after upgrading DataFusion and fixed.

etolbakov commented 3 weeks ago

🤔 I've just synced with the latest upstream in my branch and run sqlness tests locally, interval is passing

Test case "/Users/eugenet/Documents/projects/other/rust/greptimedb/tests/cases/standalone/common/types/float/nan_ordering" finished, cost: 221ms
Test case "/Users/eugenet/Documents/projects/other/rust/greptimedb/tests/cases/standalone/common/types/float/nan_window" finished, cost: 148ms
Test case "/Users/eugenet/Documents/projects/other/rust/greptimedb/tests/cases/standalone/common/types/interval/interval" finished, cost: 165ms
Test case "/Users/eugenet/Documents/projects/other/rust/greptimedb/tests/cases/standalone/common/types/string/bigstring" finished, cost: 109ms
standalone log file at /var/folders/7l/7j6kdl01359dqfh_wz6sztgm0000gp/T/sqlnessMgeUNN/greptime-sqlness-standalone.log

Looks like it's an issue after upgrading DataFusion and fixed.

seems that the error message format became different.

Error: 3000(PlanQuery), Failed to plan SQL: Error during planning: Execution error: User-defined coercion failed with Execution("Sum not supported for Interval(MonthDayNano)") and No function matches the given name and argument types 'SUM(Interval(MonthDayNano))'. You might need to add explicit type casts.
    Candidate functions:
    SUM(UserDefined)
killme2008 commented 3 weeks ago

@etolbakov Let me try it on my machine, thank you 👍

killme2008 commented 3 weeks ago

Did you forget to commit interval.result?

Yes, the error message is different after upgrading DataFusion, you have to commit and push it too.

killme2008 commented 3 weeks ago

My result is,

Error: 3000(PlanQuery), Failed to plan SQL: Error during planning: Execution error: User-defined coercion failed with Execution("Sum not supported for Interval(MonthDayNano)") and No function matches the given name and argument types 'SUM(Interval(MonthDayNano))'. You might need to add explicit type casts.
    Candidate functions:
    SUM(UserDefined)

It's different from your branch result.

etolbakov commented 3 weeks ago

Thank you very much for validating! let me double check now (maybe it's me being inattentive)

coderabbitai[bot] commented 3 weeks ago

Walkthrough

This update introduces a new transformer rule for SQL statements to expand short interval names to their full names, such as converting 'h' to 'hours'. Additionally, it includes new SQL test cases to validate these changes, and a minor comment update regarding type aliases in a different module.

Changes

File/Directory Change Summary
src/sql/src/statements/transform.rs Introduced expand_interval module and added ExpandIntervalTransformRule to the RULES vector.
src/sql/src/statements/transform/expand_interval.rs Created new module to expand short interval names to full names. Implemented ExpandIntervalTransformRule.
src/sql/src/statements/transform/type_alias.rs Updated comments related to the Int8 alias for Postgres Bigint in the replace_type_alias function.
tests/cases/standalone/common/types/interval/interval.result Added SQL queries demonstrating various interval operations.
tests/cases/standalone/common/types/interval/interval.sql Added SQL queries selecting various intervals.

Sequence Diagram(s)

sequenceDiagram
    participant SQLParser
    participant TransformEngine
    participant ExpandIntervalTransformRule
    participant SQLExecutor

    SQLParser->>TransformEngine: Parse query
    TransformEngine->>ExpandIntervalTransformRule: Apply expansion rule
    ExpandIntervalTransformRule-->>TransformEngine: Expanded intervals
    TransformEngine->>SQLExecutor: Transformed query
    SQLExecutor->>SQLExecutor: Execute query

Poem

In the land of SQL statements,
New intervals take their place.
No more just 'h' or 'm' or 's',
Full names now fill the space.
Expanding intervals clear and bright,
Bringing queries to full light. 🎉


Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

Share - [X](https://twitter.com/intent/tweet?text=I%20just%20used%20%40coderabbitai%20for%20my%20code%20review%2C%20and%20it%27s%20fantastic%21%20It%27s%20free%20for%20OSS%20and%20offers%20a%20free%20trial%20for%20the%20proprietary%20code.%20Check%20it%20out%3A&url=https%3A//coderabbit.ai) - [Mastodon](https://mastodon.social/share?text=I%20just%20used%20%40coderabbitai%20for%20my%20code%20review%2C%20and%20it%27s%20fantastic%21%20It%27s%20free%20for%20OSS%20and%20offers%20a%20free%20trial%20for%20the%20proprietary%20code.%20Check%20it%20out%3A%20https%3A%2F%2Fcoderabbit.ai) - [Reddit](https://www.reddit.com/submit?title=Great%20tool%20for%20code%20review%20-%20CodeRabbit&text=I%20just%20used%20CodeRabbit%20for%20my%20code%20review%2C%20and%20it%27s%20fantastic%21%20It%27s%20free%20for%20OSS%20and%20offers%20a%20free%20trial%20for%20proprietary%20code.%20Check%20it%20out%3A%20https%3A//coderabbit.ai) - [LinkedIn](https://www.linkedin.com/sharing/share-offsite/?url=https%3A%2F%2Fcoderabbit.ai&mini=true&title=Great%20tool%20for%20code%20review%20-%20CodeRabbit&summary=I%20just%20used%20CodeRabbit%20for%20my%20code%20review%2C%20and%20it%27s%20fantastic%21%20It%27s%20free%20for%20OSS%20and%20offers%20a%20free%20trial%20for%20proprietary%20code)
Tips ### Chat There are 3 ways to chat with [CodeRabbit](https://coderabbit.ai): - Review comments: Directly reply to a review comment made by CodeRabbit. Example: - `I pushed a fix in commit .` - `Generate unit testing code for this file.` - `Open a follow-up GitHub issue for this discussion.` - Files and specific lines of code (under the "Files changed" tab): Tag `@coderabbitai` in a new review comment at the desired location with your query. Examples: - `@coderabbitai generate unit testing code for this file.` - `@coderabbitai modularize this function.` - PR comments: Tag `@coderabbitai` in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples: - `@coderabbitai generate interesting stats about this repository and render them as a table.` - `@coderabbitai show all the console.log statements in this repository.` - `@coderabbitai read src/utils.ts and generate unit testing code.` - `@coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.` - `@coderabbitai help me debug CodeRabbit configuration file.` Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments. ### CodeRabbit Commands (invoked as PR comments) - `@coderabbitai pause` to pause the reviews on a PR. - `@coderabbitai resume` to resume the paused reviews. - `@coderabbitai review` to trigger an incremental review. This is useful when automatic reviews are disabled for the repository. - `@coderabbitai full review` to do a full review from scratch and review all the files again. - `@coderabbitai summary` to regenerate the summary of the PR. - `@coderabbitai resolve` resolve all the CodeRabbit review comments. - `@coderabbitai configuration` to show the current CodeRabbit configuration for the repository. - `@coderabbitai help` to get help. Additionally, you can add `@coderabbitai ignore` anywhere in the PR description to prevent this PR from being reviewed. ### CodeRabbit Configration File (`.coderabbit.yaml`) - You can programmatically configure CodeRabbit by adding a `.coderabbit.yaml` file to the root of your repository. - Please see the [configuration documentation](https://docs.coderabbit.ai/guides/configure-coderabbit) for more information. - If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: `# yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json` ### Documentation and Community - Visit our [Documentation](https://coderabbit.ai/docs) for detailed information on how to use CodeRabbit. - Join our [Discord Community](https://discord.com/invite/GsXnASn26c) to get help, request features, and share feedback. - Follow us on [X/Twitter](https://twitter.com/coderabbitai) for updates and announcements.
killme2008 commented 3 weeks ago

@waynexia @fengjiachun Please take a look.