Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

trie: supporting nested value list queries #475

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

trie: supporting nested value list queries #475

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions carbonserver/carbonserver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
13 changes: 10 additions & 3 deletions carbonserver/trie.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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()
Expand Down
Loading