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

fix: parser updated to support escaped quotes in search (#1704)

Browse Source 
Co-authored-by: Palash Gupta <palashgdev@gmail.com>
This commit is contained in:
Nityananda Gohain 2022-11-10 18:24:20 +05:30 committed by GitHub
parent 9735a6e5ce
commit a3b03ef0ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 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

@ -36,7 +36,7 @@ const (
DESC = "desc" DESC = "desc"
) )
var tokenRegex, _ = regexp.Compile(`(?i)(and( )*?|or( )*?)?(([\w.-]+ (in|nin) \([^(]+\))|([\w.]+ (gt|lt|gte|lte) (')?[\S]+(')?)|([\w.]+ (contains|ncontains)) '[^']+')`) var tokenRegex, _ = regexp.Compile(`(?i)(and( )*?|or( )*?)?(([\w.-]+ (in|nin) \([^(]+\))|([\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) {

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

@ -29,8 +29,8 @@ var correctQueriesTest = []struct {
}, },
{ {
`contains search with a different attributes`, `contains search with a different attributes`,
`resource contains 'Hello, "World"'`, `resource contains 'Hello, "World" and user\'s'`,
[]string{`resource ILIKE '%Hello, "World"%' `}, []string{`resource ILIKE '%Hello, "World" and user\'s%' `},
}, },
{ {
`more than one continas`, `more than one continas`,