yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-12 15:32:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

add mapAsyncDialects to run queries in sync only when using msyql

Browse Source
This commit is contained in:
Marc-Roig 2023-01-27 16:08:16 +01:00
parent a3ff110fc4
commit 2f190d47af
1 changed files with 44 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
packages/core/strapi/lib/services/entity-service/components.js
View File

@ -16,6 +16,28 @@ const omitComponentData = (contentType, data) => {
return omit(componentAttributes, data); return omit(componentAttributes, data);
}; };
/**
* Because of the way mysql works, making parallel requests can cause deadlocks.
* This function will run the requests sequentially if mysql is used.
*/
const mapAsyncDialects = async (array, func) => {
const results = [];
switch (strapi.db.dialect.client) {
case 'mysql': {
for (const elm of array) {
results.push(await func(elm));
}
break;
}
default:
results.push(...(await Promise.all(array.map(func))));
break;
}
return results;
};
// NOTE: we could generalize the logic to allow CRUD of relation directly in the DB layer // NOTE: we could generalize the logic to allow CRUD of relation directly in the DB layer
const createComponents = async (uid, data) => { const createComponents = async (uid, data) => {
const { attributes = {} } = strapi.getModel(uid); const { attributes = {} } = strapi.getModel(uid);
@ -43,10 +65,9 @@ const createComponents = async (uid, data) => {
throw new Error('Expected an array to create repeatable component'); throw new Error('Expected an array to create repeatable component');
} }
const components = []; const components = await mapAsyncDialects(componentValue, (value) =>
for (const value of componentValue) { createComponent(componentUID, value)
components.push(await createComponent(componentUID, value)); );
}
componentBody[attributeName] = components.map(({ id }) => { componentBody[attributeName] = components.map(({ id }) => {
return { return {
@ -78,19 +99,16 @@ const createComponents = async (uid, data) => {
throw new Error('Expected an array to create repeatable component'); throw new Error('Expected an array to create repeatable component');
} }
const dynamicZoneData = []; componentBody[attributeName] = await mapAsyncDialects(dynamiczoneValues, async (value) => {
for (const value of dynamiczoneValues) {
const { id } = await createComponent(value.__component, value); const { id } = await createComponent(value.__component, value);
dynamicZoneData.push({ return {
id, id,
__component: value.__component, __component: value.__component,
__pivot: { __pivot: {
field: attributeName, field: attributeName,
}, },
}); };
} });
componentBody[attributeName] = dynamicZoneData;
continue; continue;
} }
@ -139,10 +157,9 @@ const updateComponents = async (uid, entityToUpdate, data) => {
throw new Error('Expected an array to create repeatable component'); throw new Error('Expected an array to create repeatable component');
} }
const components = []; const components = await mapAsyncDialects(componentValue, (value) =>
for (const value of componentValue) { updateOrCreateComponent(componentUID, value)
components.push(await updateOrCreateComponent(componentUID, value)); );
}
componentBody[attributeName] = components.filter(_.negate(_.isNil)).map(({ id }) => { componentBody[attributeName] = components.filter(_.negate(_.isNil)).map(({ id }) => {
return { return {
@ -176,19 +193,17 @@ const updateComponents = async (uid, entityToUpdate, data) => {
throw new Error('Expected an array to create repeatable component'); throw new Error('Expected an array to create repeatable component');
} }
const dynamicZoneData = []; componentBody[attributeName] = await mapAsyncDialects(dynamiczoneValues, async (value) => {
for (const value of dynamiczoneValues) {
const { id } = await updateOrCreateComponent(value.__component, value); const { id } = await updateOrCreateComponent(value.__component, value);
dynamicZoneData.push({
return {
id, id,
__component: value.__component, __component: value.__component,
__pivot: { __pivot: {
field: attributeName, field: attributeName,
}, },
}); };
} });
componentBody[attributeName] = dynamicZoneData;
continue; continue;
} }
@ -290,14 +305,18 @@ const deleteComponents = async (uid, entityToDelete, { loadComponents = true } =
if (attribute.type === 'component') { if (attribute.type === 'component') {
const { component: componentUID } = attribute; const { component: componentUID } = attribute;
await mapAsyncDialects(_.castArray(value), (subValue) =>
deleteComponent(componentUID, subValue)
);
for (const subValue of _.castArray(value)) { for (const subValue of _.castArray(value)) {
await deleteComponent(componentUID, subValue); await deleteComponent(componentUID, subValue);
} }
} else { } else {
// delete dynamic zone components // delete dynamic zone components
for (const subValue of _.castArray(value)) { await mapAsyncDialects(_.castArray(value), (subValue) =>
await deleteComponent(subValue.__component, subValue); deleteComponent(subValue.__component, subValue)
} );
} }
continue; continue;