Skip to content

Commit 7b721a9

Browse files
committed
AQL steering and node data ingest improvement
1 parent 3dcb83d commit 7b721a9

File tree

2 files changed

+19
-8
lines changed

2 files changed

+19
-8
lines changed

modules/aql/aqlquery.go

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -157,26 +157,28 @@ func (aqlq AQLquery) resolveEdgesFrom(
157157
}
158158

159159
switch aqlq.Mode {
160+
case Walk:
161+
// no-op
160162
case Trail:
161163
if direction == engine.Out {
162-
if committedGraph.HasEdge(currentState.node, nextNode) ||
163-
currentState.workingGraph.HasEdge(currentState.node.ID(), nextNode.ID()) {
164+
if /*committedGraph.HasEdge(currentState.node, nextNode) ||*/
165+
currentState.workingGraph.HasEdge(currentState.node.ID(), nextNode.ID()) {
164166
return true
165167
}
166168
} else {
167-
if committedGraph.HasEdge(nextNode, currentState.node) ||
168-
currentState.workingGraph.HasEdge(nextNode.ID(), currentState.node.ID()) {
169+
if /*committedGraph.HasEdge(nextNode, currentState.node) ||*/
170+
currentState.workingGraph.HasEdge(nextNode.ID(), currentState.node.ID()) {
169171
return true
170172
}
171173
}
172174
case Acyclic:
173175
if currentState.workingGraph.HasNode(nextNode.ID()) || committedGraph.HasNode(nextNode) {
174176
return true
175177
}
176-
case Simple:
177-
if currentState.workingGraph.HasNode(nextNode.ID()) {
178-
return true
179-
}
178+
// case Path:
179+
// if currentState.workingGraph.HasNode(nextNode.ID()) {
180+
// return true
181+
// }
180182
}
181183

182184
if thisEdgeSearcher.FilterEdges.NegativeComparator != query.CompareInvalid {

modules/engine/node.go

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"encoding/xml"
55
"errors"
66
"fmt"
7+
"reflect"
78
"runtime"
89
"slices"
910
"strconv"
@@ -470,6 +471,14 @@ func (o *Node) setFlex(flexinit ...any) {
470471
data = data[:0]
471472
attribute = v
472473
default:
474+
if i == nil && ignoreblanks {
475+
continue
476+
}
477+
// deref pointers
478+
if reflect.ValueOf(i).Kind() == reflect.Ptr {
479+
i = reflect.ValueOf(i).Elem().Interface()
480+
}
481+
473482
newvalue := NV(i)
474483
if newvalue == nil || (ignoreblanks && newvalue.IsZero()) {
475484
continue

0 commit comments

Comments
 (0)