Optimize Duplications of ComputedField queries

For each modelName the a `ComputedField` is only compiled into abstract-sql-query once. Aftewards it's used as ReferencedField Change-type: minor Signed-off-by: fisehara <[email protected]> Signed-off-by: Harald Fischer <[email protected]>
balena-io-modules · May 2, 2023 · 870744d · 870744d
1 parent 298161f
commit 870744d
Showing 1 changed file with 30 additions and 9 deletions.
diff --git a/src/odata-to-abstract-sql.ts b/src/odata-to-abstract-sql.ts
@@ -117,6 +117,8 @@ type Overwrite<T, U> = Pick<T, Exclude<keyof T, keyof U>> & U;
 type RequiredField<T, F extends keyof T> = Overwrite<T, Required<Pick<T, F>>>;
 type AliasedResource = RequiredField<Resource, 'tableAlias'>;
 
+type AlreadyComputedFieldsLookup = { [key: string]: boolean };
+
 export type ResourceFunction = (
 	this: OData2AbstractSQL,
 	property: {
@@ -298,10 +300,17 @@ export const isBindReference = (maybeBind: {
 	);
 };
 
-const isDynamicResource = (resource: Resource): boolean => {
+const isDynamicResource = (
+	resource: Resource,
+	alreadyComputedFieldsLookup: AlreadyComputedFieldsLookup,
+): boolean => {
 	return (
 		resource.definition != null ||
-		resource.fields.some((f) => f.computed != null)
+		resource.fields.some(
+			(f) =>
+				f.computed != null &&
+				!alreadyComputedFieldsLookup[resource.name + f.fieldName],
+		)
 	);
 };
 
@@ -327,6 +336,7 @@ export class OData2AbstractSQL {
 	public defaultResource: Resource | undefined;
 	public bindVarsLength: number = 0;
 	private checkAlias: (alias: string) => string;
+	private alreadyComputedFields: AlreadyComputedFieldsLookup = {};
 
 	constructor(
 		private clientModel: RequiredAbstractSqlModelSubset,
@@ -543,7 +553,9 @@ export class OData2AbstractSQL {
 			// For updates/deletes that we use a `WHERE id IN (SELECT...)` subquery to apply options and in the case of a definition
 			// we make sure to always apply it. This means that the definition will still be applied for these queries
 			if (
-				(hasQueryOpts || isDynamicResource(resource) || pathKeyWhere != null) &&
+				(hasQueryOpts ||
+					isDynamicResource(resource, this.alreadyComputedFields) ||
+					pathKeyWhere != null) &&
 				(method === 'POST' || method === 'PUT-INSERT')
 			) {
 				// For insert statements we need to use an INSERT INTO ... SELECT * FROM (binds) WHERE ... style query
@@ -562,8 +574,9 @@ export class OData2AbstractSQL {
 						'SelectQuery',
 						[
 							'Select',
-							(resource.modifyFields ?? resource.fields).map(
-								(field): AliasNode<CastNode> => {
+							(resource.modifyFields ?? resource.fields)
+								.filter((field) => field.computed == null)
+								.map((field): AliasNode<CastNode> => {
 									const alias = field.fieldName;
 									const bindVar = bindVars?.find((v) => v[0] === alias);
 									const value = bindVar?.[1] ?? ['Null'];
@@ -573,8 +586,7 @@ export class OData2AbstractSQL {
 										);
 									}
 									return ['Alias', ['Cast', value, field.dataType], alias];
-								},
-							),
+								}),
 						],
 					],
 					'$insert',
@@ -687,7 +699,8 @@ export class OData2AbstractSQL {
 		// we make sure to always apply it. This means that the definition will still be applied for these queries, for insert queries
 		// this is handled when we set the 'Values'
 		if (
-			(hasQueryOpts || isDynamicResource(resource)) &&
+			(hasQueryOpts ||
+				isDynamicResource(resource, this.alreadyComputedFields)) &&
 			(method === 'PUT' ||
 				method === 'PATCH' ||
 				method === 'MERGE' ||
@@ -991,11 +1004,16 @@ export class OData2AbstractSQL {
 		fieldName: string,
 		computed?: AbstractSqlQuery,
 		alias: string = fieldName,
+		alwaysCompileComputed: boolean = false,
 	):
 		| ReferencedFieldNode
 		| AliasNode<ReferencedFieldNode>
 		| AliasNode<AbstractSqlQuery> {
-		if (computed) {
+		const key = resource.name + fieldName;
+		if (
+			computed &&
+			(!this.alreadyComputedFields[key] || alwaysCompileComputed)
+		) {
 			if (
 				resource.tableAlias != null &&
 				resource.tableAlias !== resource.name
@@ -1006,6 +1024,7 @@ export class OData2AbstractSQL {
 					resource.tableAlias,
 				);
 			}
+			this.alreadyComputedFields[key] = true;
 			return ['Alias', computed, alias];
 		}
 		const referencedField = this.ReferencedField(resource, fieldName);
@@ -1632,6 +1651,7 @@ export class OData2AbstractSQL {
 		this.putReset();
 		this.extraBodyVars = {};
 		this.extraBindVars = [] as unknown as ODataBinds;
+		this.alreadyComputedFields = {};
 	}
 
 	putReset() {
@@ -1695,6 +1715,7 @@ export class OData2AbstractSQL {
 							sqlNameToODataName(field.fieldName),
 							field.computed,
 							field.fieldName,
+							true,
 						),
 					),
 				];