Issue #18: handle key/value queries

quickwit-oss · Dec 1, 2023 · 2dedfcb · 2dedfcb
1 parent b71b27a
commit 2dedfcb
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 5 deletions.
diff --git a/pkg/quickwit/response_parser.go b/pkg/quickwit/response_parser.go
@@ -99,14 +99,23 @@ func parseLuceneQuery(query string) []string {
 	var keywords []string
 
 	termRegex := regexp.MustCompile(`("[^"]+"|\S+)`)
-	matches := termRegex.FindAllString(query, -1)
+	keyValueRegex := regexp.MustCompile(`[^:]+:([^:]*)`)
+	termMatches := termRegex.FindAllString(query, -1)
 
-	for _, match := range matches {
-		if match[0] == '"' && match[len(match)-1] == '"' {
-			match = match[1 : len(match)-1]
+	for _, termMatch := range termMatches {
+		if termMatch[0] == '"' && termMatch[len(termMatches)-1] == '"' {
+			termMatch = termMatch[1 : len(termMatch)-1]
 		}
 
-		keywords = append(keywords, strings.ReplaceAll(match, "*", ""))
+		keyValueMatches := keyValueRegex.FindStringSubmatch(termMatch)
+		if len(keyValueMatches) <= 1 {
+			keywords = append(keywords, strings.ReplaceAll(termMatch, "*", ""))
+			continue
+		}
+
+		for _, keyValueMatch := range keyValueMatches[1:] {
+			keywords = append(keywords, strings.ReplaceAll(keyValueMatch, "*", ""))
+		}
 	}
 
 	return keywords

diff --git a/pkg/quickwit/response_parser_test.go b/pkg/quickwit/response_parser_test.go
@@ -3206,6 +3206,13 @@ func TestParseLuceneQuery(t *testing.T) {
 		require.Len(t, highlights, 1)
 		require.Equal(t, "foo", highlights[0])
 	})
+
+	t.Run("LeyValue query", func(t *testing.T) {
+		query := "foo:bar*"
+		highlights := parseLuceneQuery(query)
+		require.Len(t, highlights, 1)
+		require.Equal(t, "bar", highlights[0])
+	})
 }
 
 func TestFlatten(t *testing.T) {