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

[Pinot] fix bug when querying a string field in attr with an empty value #5941

Merged
merged 5 commits into from
Apr 26, 2024
Merged

[Pinot] fix bug when querying a string field in attr with an empty value #5941

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6258440
fix bug
bowenxia Apr 26, 2024
3994018
add test
bowenxia Apr 26, 2024
07a82e5
Merge branch 'master' into xbowen_pinot_bug_when_attr_val_is_nil
bowenxia Apr 26, 2024
15f546d
Merge branch 'master' into xbowen_pinot_bug_when_attr_val_is_nil
bowenxia Apr 26, 2024
d846aed
Merge branch 'master' into xbowen_pinot_bug_when_attr_val_is_nil
bowenxia Apr 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions common/pinot/pinotQueryValidator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,6 +386,12 @@ func processCustomString(comparisonExpr *sqlparser.ComparisonExpr, colNameStr st
Type: sqlparser.StrVal,
Val: []byte("%" + colValStr + "%"),
}

if colValStr == "" {
return fmt.Sprintf("(JSON_MATCH(Attr, '\"$.%s\" is not null') "+
"AND REGEXP_LIKE(JSON_EXTRACT_SCALAR(Attr, '$.%s', 'string'), '^$'))", colNameStr, colNameStr)
}

return fmt.Sprintf("(JSON_MATCH(Attr, '\"$.%s\" is not null') "+
"AND REGEXP_LIKE(JSON_EXTRACT_SCALAR(Attr, '$.%s', 'string'), '%s*'))", colNameStr, colNameStr, colValStr)
}
Expand Down
6 changes: 5 additions & 1 deletion common/pinot/pinotQueryValidator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,14 @@ func TestValidateQuery(t *testing.T) {
query: "WorkflowID = 'wid'",
validated: "WorkflowID = 'wid'",
},
"Case3: query with custom field": {
"Case3-1: query with custom field": {
query: "CustomStringField = 'custom'",
validated: "(JSON_MATCH(Attr, '\"$.CustomStringField\" is not null') AND REGEXP_LIKE(JSON_EXTRACT_SCALAR(Attr, '$.CustomStringField', 'string'), 'custom*'))",
},
"Case3-2: query with custom field value is empty": {
query: "CustomStringField = ''",
validated: "(JSON_MATCH(Attr, '\"$.CustomStringField\" is not null') AND REGEXP_LIKE(JSON_EXTRACT_SCALAR(Attr, '$.CustomStringField', 'string'), '^$'))",
},
"Case4: custom field query with or in string": {
query: "CustomStringField='Or'",
validated: "(JSON_MATCH(Attr, '\"$.CustomStringField\" is not null') AND REGEXP_LIKE(JSON_EXTRACT_SCALAR(Attr, '$.CustomStringField', 'string'), 'Or*'))",
Expand Down
Loading