Skip to content

Commit

Permalink
Issue #18: searching keyword to highlight from the backend side
Browse files Browse the repository at this point in the history
  • Loading branch information
idrissneumann committed Nov 30, 2023
1 parent abd7860 commit 47c1868
Showing 1 changed file with 26 additions and 17 deletions.
43 changes: 26 additions & 17 deletions pkg/quickwit/response_parser.go
Original file line number Diff line number Diff line change
Expand Up @@ -95,11 +95,32 @@ func parseResponse(responses []*es.SearchResponse, targets []*Query, configuredF
return &result, nil
}

func parseLuceneQuery(query string) []string {
var keywords []string

// Extract terms and phrases
termRegex := regexp.MustCompile(`("[^"]+"|\S+)`)
matches := termRegex.FindAllString(query, -1)

for _, match := range matches {
// Remove quotes from phrases
if match[0] == '"' && match[len(match)-1] == '"' {
keywords = append(keywords, match[1:len(match)-1])
} else {
keywords = append(keywords, match)
}
}

return keywords
}

func processLogsResponse(res *es.SearchResponse, target *Query, configuredFields es.ConfiguredFields, queryRes *backend.DataResponse) error {
propNames := make(map[string]bool)
docs := make([]map[string]interface{}, len(res.Hits.Hits))
searchWords := make(map[string]bool)

highlights := parseLuceneQuery(target.RawQuery)

for hitIdx, hit := range res.Hits.Hits {
var flattened map[string]interface{}
if hit["_source"] != nil {
Expand Down Expand Up @@ -132,23 +153,6 @@ func processLogsResponse(res *es.SearchResponse, target *Query, configuredFields
propNames[key] = true
}

// FIXME: Quickwit does not support highlight. Should we replace this by a custom highlighter?
// Process highlight to searchWords
if highlights, ok := doc["highlight"].(map[string]interface{}); ok {
for _, highlight := range highlights {
if highlightList, ok := highlight.([]interface{}); ok {
for _, highlightValue := range highlightList {
str := fmt.Sprintf("%v", highlightValue)
matches := searchWordsRegex.FindAllStringSubmatch(str, -1)

for _, v := range matches {
searchWords[v[1]] = true
}
}
}
}
}

docs[hitIdx] = doc
}

Expand All @@ -158,6 +162,11 @@ func processLogsResponse(res *es.SearchResponse, target *Query, configuredFields
frames := data.Frames{}
frame := data.NewFrame("", fields...)
setPreferredVisType(frame, data.VisTypeLogs)

for _, keyword := range highlights {
searchWords[keyword] = true
}

setLogsCustomMeta(frame, searchWords, stringToIntWithDefaultValue(target.Metrics[0].Settings.Get("limit").MustString(), defaultSize))
frames = append(frames, frame)

Expand Down

0 comments on commit 47c1868

Please sign in to comment.