suyiiyii/yq
1
0
Fork 0
mirror of https://github.com/mikefarah/yq.git synced 2026-07-11 09:42:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

simplify filter

Browse Source
This commit is contained in:
Robert Brennan 2023-03-07 08:47:33 -05:00
parent 38187c0312
commit 6cd9d8c8f9
1 changed files with 9 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
pkg/yqlib/operator_filter.go
View File

@ -1,47 +1,30 @@
package yqlib package yqlib
import ( import (
"errors"
"container/list" "container/list"
) )
func filterOperator(d *dataTreeNavigator, context Context, expressionNode *ExpressionNode) (Context, error) { func filterOperator(d *dataTreeNavigator, context Context, expressionNode *ExpressionNode) (Context, error) {
log.Debugf("-- filterOperation") log.Warningf("-- filterOperation")
var results = list.New() var results = list.New()
for el := context.MatchingNodes.Front(); el != nil; el = el.Next() { for el := context.MatchingNodes.Front(); el != nil; el = el.Next() {
candidate := el.Value.(*CandidateNode) candidate := el.Value.(*CandidateNode)
log.Warningf("candidate %#v", candidate)
children := context.SingleChildContext(candidate) children := context.SingleChildContext(candidate)
splatted, err := splat(children, traversePreferences{}) splatted, err := splat(children, traversePreferences{})
if err != nil { if err != nil {
return Context{}, err return Context{}, err
} }
filtered, err := selectOperator(d, splatted, expressionNode)
if err != nil { if err != nil {
return Context{}, err return Context{}, err
} }
for resultEl := filtered.MatchingNodes.Front(); resultEl != nil; resultEl = resultEl.Next() {
for resultEl := splatted.MatchingNodes.Front(); resultEl != nil; resultEl = resultEl.Next() {
result := resultEl.Value.(*CandidateNode) result := resultEl.Value.(*CandidateNode)
childCtx := context.SingleReadonlyChildContext(result) log.Warningf("filtered %#v", result)
include, err := d.GetMatchingNodes(childCtx, expressionNode.RHS)
if err != nil {
return Context{}, err
}
var includeResult bool
var errDecoding error
includeEl := include.MatchingNodes.Front()
if includeEl.Next() != nil {
return Context{}, errors.New("Only expected one child")
}
includeVal := includeEl.Value.(*CandidateNode)
includeResult, errDecoding = isTruthy(includeVal)
if errDecoding != nil {
return Context{}, errDecoding
}
log.Debug("isTruthy %v", includeResult)
if includeResult {
selfExpression := &ExpressionNode{Operation: &Operation{OperationType: selfReferenceOpType}} selfExpression := &ExpressionNode{Operation: &Operation{OperationType: selfReferenceOpType}}
childCtx := context.SingleReadonlyChildContext(result)
collected, err := collectTogether(d, childCtx, selfExpression) collected, err := collectTogether(d, childCtx, selfExpression)
if err != nil { if err != nil {
return Context{}, err return Context{}, err
@ -50,7 +33,6 @@ func filterOperator(d *dataTreeNavigator, context Context, expressionNode *Expre
results.PushBack(collected) results.PushBack(collected)
} }
} }
}
return context.ChildContext(results), nil return context.ChildContext(results), nil
} }