Skip to content

Commit

Permalink
Filter out nil boundary data before accessing slice.
Browse files Browse the repository at this point in the history
The functions iterating over the data only care about non nil results,
filter nil results out ahead of time.
  • Loading branch information
Lucian Jones committed Dec 19, 2021
1 parent 30971c9 commit 9d7b09a
Showing 1 changed file with 17 additions and 3 deletions.
20 changes: 17 additions & 3 deletions query_execution.go
Original file line number Diff line number Diff line change
Expand Up @@ -172,13 +172,15 @@ func (q *queryExecution) executeChildStep(step *QueryPlanStep, boundaryIDs []str

q.writeExecutionResult(step, data, nil)

if len(data) > 0 {
nonNillBoundaryResults := extractNonNilBoundaryResults(data)

if len(nonNillBoundaryResults) > 0 {
for _, childStep := range step.Then {
boundaryResultInsertionPoint, err := trimInsertionPointForNestedBoundaryStep(data, childStep.InsertionPoint)
boundaryResultInsertionPoint, err := trimInsertionPointForNestedBoundaryStep(nonNillBoundaryResults, childStep.InsertionPoint)
if err != nil {
return err
}
boundaryIDs, err := extractAndDedupeBoundaryIDs(data, boundaryResultInsertionPoint)
boundaryIDs, err := extractAndDedupeBoundaryIDs(nonNillBoundaryResults, boundaryResultInsertionPoint)
if err != nil {
return err
}
Expand All @@ -195,6 +197,18 @@ func (q *queryExecution) executeChildStep(step *QueryPlanStep, boundaryIDs []str
return nil
}

func extractNonNilBoundaryResults(data []interface{}) []interface{} {
var nonNilResults []interface{}
for _, d := range data {
if d != nil {
nonNilResults = append(nonNilResults, d)
}

}

return nonNilResults
}

func (q *queryExecution) executeBoundaryQuery(documents []string, serviceURL string, boundaryFieldGetter BoundaryField) ([]interface{}, error) {
output := make([]interface{}, 0)
if !boundaryFieldGetter.Array {
Expand Down

0 comments on commit 9d7b09a

Please sign in to comment.