GitHub-Proxy/signoz
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/SigNoz/signoz synced 2025-08-12 10:09:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

parser updated to support more than one contains

Browse Source
This commit is contained in:
nityanandagohain 2022-07-26 14:45:20 +05:30
parent 0fe4327877
commit 294d527a0e
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/query-service/app/logs/parser.go
View File

@ -31,7 +31,7 @@ const (
IDEND = "idEnd" IDEND = "idEnd"
) )
var tokenRegex, _ = regexp.Compile(`(?i)(and( )*?)?(([\w.-]+ (in|nin) \([\S ]+\))|([\w.]+ (gt|lt|gte|lte) (')?[\S]+(')?)|([\w.]+ (contains|ncontains)) (')?[\S ]+(')?)`) var tokenRegex, _ = regexp.Compile(`(?i)(and( )*?)?(([\w.-]+ (in|nin) \([\S ]+\))|([\w.]+ (gt|lt|gte|lte) (')?[\S]+(')?)|([\w.]+ (contains|ncontains)) (')?[^']+(')?)`)
var operatorRegex, _ = regexp.Compile(`(?i)(?: )(in|nin|gt|lt|gte|lte|contains|ncontains)(?: )`) var operatorRegex, _ = regexp.Compile(`(?i)(?: )(in|nin|gt|lt|gte|lte|contains|ncontains)(?: )`)
func ParseLogFilterParams(r *http.Request) (*model.LogsFilterParams, error) { func ParseLogFilterParams(r *http.Request) (*model.LogsFilterParams, error) {

5
pkg/query-service/app/logs/parser_test.go
View File

@ -32,6 +32,11 @@ var correctQueriesTest = []struct {
`resource contains 'Hello, "World"'`, `resource contains 'Hello, "World"'`,
[]string{`resource ILIKE '%Hello, "World"%' `}, []string{`resource ILIKE '%Hello, "World"%' `},
}, },
{
`more than one continas`,
`resource contains 'Hello, "World"' and myresource contains 'abcd'`,
[]string{`resource ILIKE '%Hello, "World"%' `, `AND myresource ILIKE '%abcd%' `},
},
{ {
`filters with lt,gt,lte,gte operators`, `filters with lt,gt,lte,gte operators`,
`id lt 100 and id gt 50 and code lte 500 and code gte 400`, `id lt 100 and id gt 50 and code lte 500 and code gte 400`,