From 6ac7cb10228dbb9297992b34e2943d1394d2e6a4 Mon Sep 17 00:00:00 2001 From: nityanandagohain Date: Thu, 21 Jul 2022 18:32:11 +0530 Subject: [PATCH] parser updated --- pkg/query-service/app/logs/parser.go | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/pkg/query-service/app/logs/parser.go b/pkg/query-service/app/logs/parser.go index 7d9438976b..1ea0dc9ac7 100644 --- a/pkg/query-service/app/logs/parser.go +++ b/pkg/query-service/app/logs/parser.go @@ -243,16 +243,32 @@ func GenerateSQLWhere(allFields *model.GetFieldsResponse, params *model.LogsFilt } if params.TimestampStart != nil { - tokens = append(tokens, fmt.Sprintf("and timestamp >= '%d' ", *params.TimestampStart)) + filter := fmt.Sprintf("timestamp >= '%d' ", *params.TimestampStart) + if len(tokens) > 0 { + filter = "and " + filter + } + tokens = append(tokens, filter) } if params.TimestampEnd != nil { - tokens = append(tokens, fmt.Sprintf("and timestamp <= '%d' ", *params.TimestampEnd)) + filter := fmt.Sprintf("timestamp <= '%d' ", *params.TimestampEnd) + if len(tokens) > 0 { + filter = "and " + filter + } + tokens = append(tokens, filter) } if params.IdStart != nil { - tokens = append(tokens, fmt.Sprintf("and id > '%v' ", *params.IdStart)) + filter := fmt.Sprintf("id > '%v' ", *params.IdStart) + if len(tokens) > 0 { + filter = "and " + filter + } + tokens = append(tokens, filter) } if params.IdEnd != nil { - tokens = append(tokens, fmt.Sprintf("and id < '%v' ", *params.IdEnd)) + filter := fmt.Sprintf("id < '%v' ", *params.IdEnd) + if len(tokens) > 0 { + filter = "and " + filter + } + tokens = append(tokens, filter) } sqlWhere := strings.Join(tokens, "")