taigrr/yq
1
0
Fork 0
mirror of https://github.com/taigrr/yq synced 2025-01-18 04:53:17 -08:00
Code Issues Projects Releases Wiki Activity

use orderermap

Browse Source
This commit is contained in:
Mike Farah 2020-10-09 12:04:19 +11:00
parent c09513803a
commit a0d940638c
2 changed files with 49 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
pkg/yqlib/treeops/data_tree_navigator.go
View File

@ -1,5 +1,9 @@
package treeops package treeops
import (
"github.com/elliotchance/orderedmap"
)
type dataTreeNavigator struct { type dataTreeNavigator struct {
traverser Traverser traverser Traverser
} }
@ -17,54 +21,81 @@ func NewDataTreeNavigator(navigationPrefs NavigationPrefs) DataTreeNavigator {
return &dataTreeNavigator{traverse} return &dataTreeNavigator{traverse}
} }
func (d *dataTreeNavigator) traverse(matchingNodes []*CandidateNode, pathNode *PathElement) ([]*CandidateNode, error) { func (d *dataTreeNavigator) traverse(matchMap *orderedmap.OrderedMap, pathNode *PathElement) (*orderedmap.OrderedMap, error) {
log.Debugf("-- Traversing") log.Debugf("-- Traversing")
var newMatchingNodes = make([]*CandidateNode, 0) var matchingNodeMap = orderedmap.NewOrderedMap()
var newNodes []*CandidateNode var newNodes []*CandidateNode
var err error var err error
for _, node := range matchingNodes {
newNodes, err = d.traverser.Traverse(node, pathNode) for el := matchMap.Front(); el != nil; el = el.Next() {
newNodes, err = d.traverser.Traverse(el.Value.(*CandidateNode), pathNode)
if err != nil { if err != nil {
return nil, err return nil, err
} }
newMatchingNodes = append(newMatchingNodes, newNodes...) for _, n := range newNodes {
matchingNodeMap.Set(n.getKey(), n)
}
} }
return newMatchingNodes, nil return matchingNodeMap, nil
} }
func (d *dataTreeNavigator) setFunction(op OperationType, lhs []*CandidateNode, rhs []*CandidateNode) []*CandidateNode { func (d *dataTreeNavigator) setFunction(op OperationType, lhs *orderedmap.OrderedMap, rhs *orderedmap.OrderedMap) *orderedmap.OrderedMap {
for el := rhs.Front(); el != nil; el = el.Next() {
node := el.Value.(*CandidateNode)
lhs.Set(node.getKey(), node)
}
return lhs
return append(lhs, rhs...)
} }
func (d *dataTreeNavigator) GetMatchingNodes(matchingNodes []*CandidateNode, pathNode *PathTreeNode) ([]*CandidateNode, error) { func (d *dataTreeNavigator) GetMatchingNodes(matchingNodes []*CandidateNode, pathNode *PathTreeNode) ([]*CandidateNode, error) {
var matchingNodeMap = orderedmap.NewOrderedMap()
for _, n := range matchingNodes {
matchingNodeMap.Set(n.getKey(), n)
}
matchedNodes, err := d.getMatchingNodes(matchingNodeMap, pathNode)
if err != nil {
return nil, err
}
values := make([]*CandidateNode, 0, matchedNodes.Len())
for el := matchedNodes.Front(); el != nil; el = el.Next() {
values = append(values, el.Value.(*CandidateNode))
}
return values, nil
}
func (d *dataTreeNavigator) getMatchingNodes(matchingNodes *orderedmap.OrderedMap, pathNode *PathTreeNode) (*orderedmap.OrderedMap, error) {
log.Debugf("Processing Path: %v", pathNode.PathElement.toString()) log.Debugf("Processing Path: %v", pathNode.PathElement.toString())
if pathNode.PathElement.PathElementType == PathKey || pathNode.PathElement.PathElementType == ArrayIndex { if pathNode.PathElement.PathElementType == PathKey || pathNode.PathElement.PathElementType == ArrayIndex {
return d.traverse(matchingNodes, pathNode.PathElement) return d.traverse(matchingNodes, pathNode.PathElement)
} else { } else {
var lhs, rhs []*CandidateNode var lhs, rhs *orderedmap.OrderedMap
var err error var err error
switch pathNode.PathElement.OperationType { switch pathNode.PathElement.OperationType {
case Traverse: case Traverse:
lhs, err = d.GetMatchingNodes(matchingNodes, pathNode.Lhs) lhs, err = d.getMatchingNodes(matchingNodes, pathNode.Lhs)
if err != nil { if err != nil {
return nil, err return nil, err
} }
return d.GetMatchingNodes(lhs, pathNode.Rhs) return d.getMatchingNodes(lhs, pathNode.Rhs)
case Or, And: case Or, And:
lhs, err = d.GetMatchingNodes(matchingNodes, pathNode.Lhs) lhs, err = d.getMatchingNodes(matchingNodes, pathNode.Lhs)
if err != nil { if err != nil {
return nil, err return nil, err
} }
rhs, err = d.GetMatchingNodes(matchingNodes, pathNode.Rhs) rhs, err = d.getMatchingNodes(matchingNodes, pathNode.Rhs)
if err != nil { if err != nil {
return nil, err return nil, err
} }
return d.setFunction(pathNode.PathElement.OperationType, lhs, rhs), nil return d.setFunction(pathNode.PathElement.OperationType, lhs, rhs), nil
// case Equals: // case Equals:
// lhs, err = d.GetMatchingNodes(matchingNodes, pathNode.Lhs) // lhs, err = d.getMatchingNodes(matchingNodes, pathNode.Lhs)
// if err != nil { // if err != nil {
// return nil, err // return nil, err
// } // }

4
pkg/yqlib/treeops/lib.go
View File

@ -18,6 +18,10 @@ type CandidateNode struct {
IsMiddleNode bool IsMiddleNode bool
} }
func (n *CandidateNode) getKey() string {
return fmt.Sprintf("%v - %v", n.Document, n.Path)
}
var log = logging.MustGetLogger("yq-treeops") var log = logging.MustGetLogger("yq-treeops")
func NodeToString(node *CandidateNode) string { func NodeToString(node *CandidateNode) string {