Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: allow cross-schema query in promql #3545

Merged
merged 9 commits into from
Mar 29, 2024
Merged

feat: allow cross-schema query in promql #3545

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
bb239b5
feat: add __schema__ tag for promql parser
sunng87 Mar 19, 2024
353709d
feat: disable matcher op other than equals
sunng87 Mar 19, 2024
7545f88
test: add more test to ensure context getting reset
sunng87 Mar 19, 2024
d4cda72
test: add integration test
sunng87 Mar 20, 2024
b4bfc98
test: refactor tests
sunng87 Mar 20, 2024
7c5c88c
refactor: remove duplicated test code
sunng87 Mar 21, 2024
56785f5
refactor: update according to review comments
sunng87 Mar 21, 2024
8308556
test: add sqlness test for cross schema scenario
sunng87 Mar 28, 2024
d2be785
Merge branch 'main' into feature/schema-selector-for-promql
waynexia Mar 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 8 additions & 0 deletions src/promql/src/error.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,13 @@ pub enum Error {
operator: String,
location: Location,
},

#[snafu(display("Matcher operator {matcher_op} is not supported for {matcher}"))]
UnsupportedMatcherOp {
matcher_op: String,
matcher: String,
location: Location,
},
}

impl ErrorExt for Error {
Expand All @@ -157,6 +164,7 @@ impl ErrorExt for Error {
| DataFusionPlanning { .. }
| MultiFieldsNotSupported { .. }
| UnexpectedPlanExpr { .. }
| UnsupportedMatcherOp { .. }
| IllegalRange { .. } => StatusCode::InvalidArguments,

UnknownTable { .. } | EmptyRange { .. } => StatusCode::Internal,
Expand Down