trie: supporting nested value list queries

carbonserver/carbonserver.go

@@ -1407,6 +1407,12 @@ func (listener *CarbonserverListener) expandGlobs(ctx context.Context, query str
 }
 
 // TODO(dgryski): add tests
+//
+// TODO(xhu): doesn't support nested braces like {a,b,c,x.{a,b,c}}, should
+// migrate to use the parser and rewriter in trie_value_list.go. however,
+// unlike trie index which supports partial/non-nested value list,
+// filepath.Glob and trigram index doesn't support brace queries at all, so full
+// expansion are needed.
 func (listener *CarbonserverListener) expandGlobBraces(globs []string) ([]string, error) {
 	for {
 		bracematch := false

carbonserver/trie.go

@@ -1490,7 +1490,7 @@ func (ti *trieIndex) countNodes() (count, files, dirs, onec, onefc, onedc int, c
 }
 
 func (listener *CarbonserverListener) expandGlobsTrie(query string) ([]string, []bool, error) {
-	query = strings.ReplaceAll(query, ".", "/")
+	// query = strings.ReplaceAll(query, ".", "/")
 	globs := []string{query}
 
 	var slashInBraces, inAlter bool
@@ -1500,17 +1500,24 @@ func (listener *CarbonserverListener) expandGlobsTrie(query string) ([]string, [
 			inAlter = true
 		case c == '}':
 			inAlter = false
-		case inAlter && c == '/':
+		case inAlter && c == '.':
 			slashInBraces = true
 		}
 	}
 	// for complex queries like {a.b.c,x}.o.p.q, fall back to simple expansion
 	if slashInBraces {
 		var err error
-		globs, err = listener.expandGlobBraces(globs)
+		globs, err = listener.expandGlobBracesForTrieIndex(query)
 		if err != nil {
 			return nil, nil, err
 		}
+
+		// TODO: slow? maybe we should make listener.expandGlobBracesForTrieIndex handles / natively?
+		for i := 0; i < len(globs); i++ {
+			globs[i] = strings.ReplaceAll(globs[i], ".", "/")
+		}
+	} else {
+		globs[0] = strings.ReplaceAll(globs[0], ".", "/")
 	}
 
 	var fidx = listener.CurrentFileIndex()