Skip to content

Memory issue when root and sub-children are selcted at the same time #369

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

Open
wants to merge 3 commits into
base: refactor-traversal
Choose a base branch
from
Open

Memory issue when root and sub-children are selcted at the same time #369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e2478d3
test: add performance tests for using root fields next to a subquery
Yogu Nov 13, 2025
062e4a6
perf: optimize query memory usage of list fields in many cases
Yogu Nov 13, 2025
1e15e56
perf: hoist root field calculations out of loops to reduce query memo…
Yogu Nov 14, 2025
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: 3 additions & 3 deletions spec/regression/collect/tests/nested-field-traversal/aql/childEntitiesInChildEntities.aql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ RETURN {
"Delivery": (IS_NULL(v_delivery1) ? null : {
"deliveryContents": (
FOR v_deliveryContent1
IN (IS_LIST(v_delivery1.`deliveryContents`) ? v_delivery1.`deliveryContents` : [])
IN v_delivery1.`deliveryContents`[*]
RETURN {
"items": (
FOR v_deliveryItem1
IN (IS_LIST(v_deliveryContent1.`items`) ? v_deliveryContent1.`items` : [])
IN v_deliveryContent1.`items`[*]
RETURN {
"subItems": (
FOR v_deliveryItem2
IN (IS_LIST(v_deliveryItem1.`subItems`) ? v_deliveryItem1.`subItems` : [])
IN v_deliveryItem1.`subItems`[*]
SORT (v_deliveryItem2.`itemNumber`) DESC
RETURN {
"itemNumber": v_deliveryItem2.`itemNumber`
Expand Down
2 changes: 1 addition & 1 deletion spec/regression/collect/tests/nested-field-traversal/aql/childEntitiesInCollect.aql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ RETURN {
RETURN {
"subItems": (
FOR v_deliveryItem1
IN (IS_LIST(v_item1.`subItems`) ? v_item1.`subItems` : [])
IN v_item1.`subItems`[*]
SORT (v_deliveryItem1.`itemNumber`) DESC
RETURN {
"itemNumber": v_deliveryItem1.`itemNumber`
Expand Down
4 changes: 2 additions & 2 deletions spec/regression/collect/tests/nested-field-traversal/aql/collectInChildEntities.aql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ RETURN {
"Delivery": (IS_NULL(v_delivery1) ? null : {
"deliveryContents": (
FOR v_deliveryContent1
IN (IS_LIST(v_delivery1.`deliveryContents`) ? v_delivery1.`deliveryContents` : [])
IN v_delivery1.`deliveryContents`[*]
RETURN {
"items": (
FOR v_deliveryItem1
IN (IS_LIST(v_deliveryContent1.`items`) ? v_deliveryContent1.`items` : [])
IN v_deliveryContent1.`items`[*]
RETURN {
"subSubItems": (
FOR v_item1
Expand Down
12 changes: 4 additions & 8 deletions spec/regression/logistics/tests/add-child-entity/aql/add.aql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,12 @@ RETURN (
WITH @@deliveries
LET v_delivery1 = DOCUMENT(@@deliveries, @var1)
RETURN (IS_NULL(v_delivery1) ? null : {
"items": (
FOR v_deliveryItem1
IN (IS_LIST(v_delivery1.`items`) ? v_delivery1.`items` : [])
RETURN {
"itemNumber": v_deliveryItem1.`itemNumber`
}
)
"items": v_delivery1.`items`[* RETURN {
"itemNumber": CURRENT.`itemNumber`
}]
})

// Peak memory usage: 32768 bytes
// Peak memory usage: 0 bytes

// ----------------------------------------------------------------

Expand Down
12 changes: 4 additions & 8 deletions spec/regression/logistics/tests/add-child-entity/aql/query.aql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,10 @@ LET v_delivery1 = FIRST((
))
RETURN {
"Delivery": (IS_NULL(v_delivery1) ? null : {
"items": (
FOR v_deliveryItem1
IN (IS_LIST(v_delivery1.`items`) ? v_delivery1.`items` : [])
RETURN {
"itemNumber": v_deliveryItem1.`itemNumber`
}
)
"items": v_delivery1.`items`[* RETURN {
"itemNumber": CURRENT.`itemNumber`
}]
})
}

// Peak memory usage: 32768 bytes
// Peak memory usage: 0 bytes
14 changes: 5 additions & 9 deletions spec/regression/logistics/tests/add-root-entity/aql/query.aql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,12 @@ RETURN {
SORT (v_country1.`isoCode`)
RETURN {
"isoCode": v_country1.`isoCode`,
"description": (
FOR v_translation1
IN (IS_LIST(v_country1.`description`) ? v_country1.`description` : [])
RETURN {
"languageIsoCode": v_translation1.`languageIsoCode`,
"translation": v_translation1.`translation`
}
)
"description": v_country1.`description`[* RETURN {
"languageIsoCode": CURRENT.`languageIsoCode`,
"translation": CURRENT.`translation`
}]
}
)
}

// Peak memory usage: 65536 bytes
// Peak memory usage: 32768 bytes
23 changes: 7 additions & 16 deletions spec/regression/logistics/tests/aliases/aql/aliases.aql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,25 +15,16 @@ LET v_delivery3 = FIRST((
RETURN {
"aDelivery": (IS_NULL(v_delivery1) ? null : {
"nr": v_delivery1.`deliveryNumber`,
"oneItem": (
FOR v_deliveryItem1
IN (IS_LIST(v_delivery1.`items`) ? v_delivery1.`items` : [])
FILTER (v_deliveryItem1.`itemNumber` == @var5)
RETURN {
"itemNumber": v_deliveryItem1.`itemNumber`
}
),
"items": (
FOR v_deliveryItem2
IN (IS_LIST(v_delivery1.`items`) ? v_delivery1.`items` : [])
RETURN {
"itemNumber": v_deliveryItem2.`itemNumber`
}
)
"oneItem": v_delivery1.`items`[* FILTER (CURRENT.`itemNumber` == @var5) RETURN {
"itemNumber": CURRENT.`itemNumber`
}],
"items": v_delivery1.`items`[* RETURN {
"itemNumber": CURRENT.`itemNumber`
}]
}),
"anotherDelivery": (IS_NULL(v_delivery3) ? null : {
"nr": v_delivery3.`deliveryNumber`
})
}

// Peak memory usage: 131072 bytes
// Peak memory usage: 32768 bytes
40 changes: 14 additions & 26 deletions spec/regression/logistics/tests/create-many/aql/create.aql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,41 +228,29 @@ RETURN (
"city": v_delivery1.`consignee`.`city`,
"country": (IS_NULL(v_country1) ? null : {
"isoCode": v_country1.`isoCode`,
"description": (
FOR v_translation1
IN (IS_LIST(v_country1.`description`) ? v_country1.`description` : [])
RETURN {
"languageIsoCode": v_translation1.`languageIsoCode`,
"translation": v_translation1.`translation`
}
)
"description": v_country1.`description`[* RETURN {
"languageIsoCode": CURRENT.`languageIsoCode`,
"translation": CURRENT.`translation`
}]
}),
"street": v_delivery1.`consignee`.`street`
}),
"contentInfo": (
FOR v_translation2
IN (IS_LIST(v_delivery1.`contentInfo`) ? v_delivery1.`contentInfo` : [])
RETURN {
"translation": v_translation2.`translation`,
"languageIsoCode": v_translation2.`languageIsoCode`
}
),
"contentInfo": v_delivery1.`contentInfo`[* RETURN {
"translation": CURRENT.`translation`,
"languageIsoCode": CURRENT.`languageIsoCode`
}],
"destinationCountry": (IS_NULL(v_country3) ? null : {
"isoCode": v_country3.`isoCode`
}),
"dgInfo": {
"flashpoint": v_delivery1.`dgInfo`.`flashpoint`,
"unNumber": v_delivery1.`dgInfo`.`unNumber`,
"notices": (IS_LIST(v_delivery1.`dgInfo`.`notices`) ? v_delivery1.`dgInfo`.`notices` : [])
"notices": v_delivery1.`dgInfo`.`notices`[*]
},
"serialNumbers": (IS_LIST(v_delivery1.`serialNumbers`) ? v_delivery1.`serialNumbers` : []),
"items": (
FOR v_deliveryItem1
IN (IS_LIST(v_delivery1.`items`) ? v_delivery1.`items` : [])
RETURN {
"itemNumber": v_deliveryItem1.`itemNumber`
}
),
"serialNumbers": v_delivery1.`serialNumbers`[*],
"items": v_delivery1.`items`[* RETURN {
"itemNumber": CURRENT.`itemNumber`
}],
"handlingUnits": (
FOR v_handlingUnit1
IN OUTBOUND v_delivery1 @@deliveries_handlingUnits
Expand All @@ -275,7 +263,7 @@ RETURN (
}
)

// Peak memory usage: 262144 bytes
// Peak memory usage: 163840 bytes

// ----------------------------------------------------------------

Expand Down
40 changes: 14 additions & 26 deletions spec/regression/logistics/tests/create-many/aql/query.aql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,41 +25,29 @@ RETURN {
"city": v_delivery1.`consignee`.`city`,
"country": (IS_NULL(v_country1) ? null : {
"isoCode": v_country1.`isoCode`,
"description": (
FOR v_translation1
IN (IS_LIST(v_country1.`description`) ? v_country1.`description` : [])
RETURN {
"languageIsoCode": v_translation1.`languageIsoCode`,
"translation": v_translation1.`translation`
}
)
"description": v_country1.`description`[* RETURN {
"languageIsoCode": CURRENT.`languageIsoCode`,
"translation": CURRENT.`translation`
}]
}),
"street": v_delivery1.`consignee`.`street`
}),
"contentInfo": (
FOR v_translation2
IN (IS_LIST(v_delivery1.`contentInfo`) ? v_delivery1.`contentInfo` : [])
RETURN {
"translation": v_translation2.`translation`,
"languageIsoCode": v_translation2.`languageIsoCode`
}
),
"contentInfo": v_delivery1.`contentInfo`[* RETURN {
"translation": CURRENT.`translation`,
"languageIsoCode": CURRENT.`languageIsoCode`
}],
"destinationCountry": (IS_NULL(v_country3) ? null : {
"isoCode": v_country3.`isoCode`
}),
"dgInfo": {
"flashpoint": v_delivery1.`dgInfo`.`flashpoint`,
"unNumber": v_delivery1.`dgInfo`.`unNumber`,
"notices": (IS_LIST(v_delivery1.`dgInfo`.`notices`) ? v_delivery1.`dgInfo`.`notices` : [])
"notices": v_delivery1.`dgInfo`.`notices`[*]
},
"serialNumbers": (IS_LIST(v_delivery1.`serialNumbers`) ? v_delivery1.`serialNumbers` : []),
"items": (
FOR v_deliveryItem1
IN (IS_LIST(v_delivery1.`items`) ? v_delivery1.`items` : [])
RETURN {
"itemNumber": v_deliveryItem1.`itemNumber`
}
),
"serialNumbers": v_delivery1.`serialNumbers`[*],
"items": v_delivery1.`items`[* RETURN {
"itemNumber": CURRENT.`itemNumber`
}],
"handlingUnits": (
FOR v_handlingUnit1
IN OUTBOUND v_delivery1 @@deliveries_handlingUnits
Expand All @@ -73,4 +61,4 @@ RETURN {
)
}

// Peak memory usage: 229376 bytes
// Peak memory usage: 98304 bytes
40 changes: 14 additions & 26 deletions spec/regression/logistics/tests/create/aql/create.aql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,44 +60,32 @@ RETURN (IS_NULL(v_delivery1) ? null : {
"city": v_delivery1.`consignee`.`city`,
"country": (IS_NULL(v_country1) ? null : {
"isoCode": v_country1.`isoCode`,
"description": (
FOR v_translation1
IN (IS_LIST(v_country1.`description`) ? v_country1.`description` : [])
RETURN {
"languageIsoCode": v_translation1.`languageIsoCode`,
"translation": v_translation1.`translation`
}
)
"description": v_country1.`description`[* RETURN {
"languageIsoCode": CURRENT.`languageIsoCode`,
"translation": CURRENT.`translation`
}]
}),
"street": v_delivery1.`consignee`.`street`
}),
"contentInfo": (
FOR v_translation2
IN (IS_LIST(v_delivery1.`contentInfo`) ? v_delivery1.`contentInfo` : [])
RETURN {
"translation": v_translation2.`translation`,
"languageIsoCode": v_translation2.`languageIsoCode`
}
),
"contentInfo": v_delivery1.`contentInfo`[* RETURN {
"translation": CURRENT.`translation`,
"languageIsoCode": CURRENT.`languageIsoCode`
}],
"destinationCountry": (IS_NULL(v_country3) ? null : {
"isoCode": v_country3.`isoCode`
}),
"dgInfo": {
"flashpoint": v_delivery1.`dgInfo`.`flashpoint`,
"unNumber": v_delivery1.`dgInfo`.`unNumber`,
"notices": (IS_LIST(v_delivery1.`dgInfo`.`notices`) ? v_delivery1.`dgInfo`.`notices` : [])
"notices": v_delivery1.`dgInfo`.`notices`[*]
},
"serialNumbers": (IS_LIST(v_delivery1.`serialNumbers`) ? v_delivery1.`serialNumbers` : []),
"items": (
FOR v_deliveryItem1
IN (IS_LIST(v_delivery1.`items`) ? v_delivery1.`items` : [])
RETURN {
"itemNumber": v_deliveryItem1.`itemNumber`
}
)
"serialNumbers": v_delivery1.`serialNumbers`[*],
"items": v_delivery1.`items`[* RETURN {
"itemNumber": CURRENT.`itemNumber`
}]
})

// Peak memory usage: 196608 bytes
// Peak memory usage: 32768 bytes

// ----------------------------------------------------------------

Expand Down
40 changes: 14 additions & 26 deletions spec/regression/logistics/tests/create/aql/query.aql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,43 +24,31 @@ RETURN {
"city": v_delivery1.`consignee`.`city`,
"country": (IS_NULL(v_country1) ? null : {
"isoCode": v_country1.`isoCode`,
"description": (
FOR v_translation1
IN (IS_LIST(v_country1.`description`) ? v_country1.`description` : [])
RETURN {
"languageIsoCode": v_translation1.`languageIsoCode`,
"translation": v_translation1.`translation`
}
)
"description": v_country1.`description`[* RETURN {
"languageIsoCode": CURRENT.`languageIsoCode`,
"translation": CURRENT.`translation`
}]
}),
"street": v_delivery1.`consignee`.`street`
}),
"contentInfo": (
FOR v_translation2
IN (IS_LIST(v_delivery1.`contentInfo`) ? v_delivery1.`contentInfo` : [])
RETURN {
"translation": v_translation2.`translation`,
"languageIsoCode": v_translation2.`languageIsoCode`
}
),
"contentInfo": v_delivery1.`contentInfo`[* RETURN {
"translation": CURRENT.`translation`,
"languageIsoCode": CURRENT.`languageIsoCode`
}],
"destinationCountry": (IS_NULL(v_country3) ? null : {
"isoCode": v_country3.`isoCode`
}),
"dgInfo": {
"flashpoint": v_delivery1.`dgInfo`.`flashpoint`,
"unNumber": v_delivery1.`dgInfo`.`unNumber`,
"notices": (IS_LIST(v_delivery1.`dgInfo`.`notices`) ? v_delivery1.`dgInfo`.`notices` : [])
"notices": v_delivery1.`dgInfo`.`notices`[*]
},
"serialNumbers": (IS_LIST(v_delivery1.`serialNumbers`) ? v_delivery1.`serialNumbers` : []),
"items": (
FOR v_deliveryItem1
IN (IS_LIST(v_delivery1.`items`) ? v_delivery1.`items` : [])
RETURN {
"itemNumber": v_deliveryItem1.`itemNumber`
}
)
"serialNumbers": v_delivery1.`serialNumbers`[*],
"items": v_delivery1.`items`[* RETURN {
"itemNumber": CURRENT.`itemNumber`
}]
}
)
}

// Peak memory usage: 196608 bytes
// Peak memory usage: 65536 bytes
2 changes: 1 addition & 1 deletion spec/regression/logistics/tests/entity-extensions/aql/afterUpdate.aql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ RETURN {
"Delivery": (IS_NULL(v_delivery1) ? null : {
"dgInfo": {
"unNumber": v_delivery1.`dgInfo`.`unNumber`,
"notices": (IS_LIST(v_delivery1.`dgInfo`.`notices`) ? v_delivery1.`dgInfo`.`notices` : [])
"notices": v_delivery1.`dgInfo`.`notices`[*]
}
})
}
Expand Down
Loading