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

Avoid making empty queries in populate

Browse Source
This commit is contained in:
Alexandre Bodin 2021-08-06 10:51:34 +02:00
parent 7f5ca6b479
commit 07ae49badd
7 changed files with 77 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/core/admin/server/controllers/authentication.js
View File

@ -135,7 +135,7 @@ module.exports = {
roles: superAdminRole ? [superAdminRole.id] : [],
});
await strapi.telemetry.send('didCreateFirstAdmin');
strapi.telemetry.send('didCreateFirstAdmin');
ctx.body = {
data: {

4
packages/core/admin/server/services/metrics.js
View File

@ -5,11 +5,11 @@ const { getService } = require('../utils');
const sendDidInviteUser = async () => {
const numberOfUsers = await getService('user').count();
const numberOfRoles = await getService('role').count();
return strapi.telemetry.send('didInviteUser', { numberOfRoles, numberOfUsers });
strapi.telemetry.send('didInviteUser', { numberOfRoles, numberOfUsers });
};
const sendDidUpdateRolePermissions = async () => {
return strapi.telemetry.send('didUpdateRolePermissions');
strapi.telemetry.send('didUpdateRolePermissions');
};
module.exports = {

2
packages/core/admin/server/services/user.js
View File

@ -41,7 +41,7 @@ const create = async attributes => {
.query('strapi::user')
.create({ data: user, populate: ['roles'] });
await getService('metrics').sendDidInviteUser();
getService('metrics').sendDidInviteUser();
return createdUser;
};

7
packages/core/content-manager/controllers/collection-types.js
View File

@ -62,6 +62,8 @@ module.exports = {
const { model } = ctx.params;
const { body } = ctx.request;
const totalEntries = await strapi.query(model).count();
const entityManager = getService('entity-manager');
const permissionChecker = getService('permission-checker').create({ userAbility, model });
@ -77,9 +79,12 @@ module.exports = {
await wrapBadRequest(async () => {
const entity = await entityManager.create(sanitizeFn(body), model);
ctx.body = permissionChecker.sanitizeOutput(entity);
await strapi.telemetry.send('didCreateFirstContentTypeEntry', { model });
if (totalEntries === 0) {
strapi.telemetry.send('didCreateFirstContentTypeEntry', { model });
}
})();
},

105
packages/core/database/lib/query/helpers.js
View File

@ -516,6 +516,10 @@ const applyPopulate = async (results, populate, ctx) => {
const { db, uid, qb } = ctx;
const meta = db.metadata.get(uid);
if (_.isEmpty(results)) {
return results;
}
for (const key in populate) {
// NOTE: Omit limit & offset to avoid needing a query per result to avoid making too many queries
const populateValue = _.pick(
@ -579,34 +583,16 @@ const applyPopulate = async (results, populate, ctx) => {
} = joinTable.joinColumn;
const alias = qb.getAlias();
const joinColAlias = `${alias}.${joinColumnName}`;
if (isCount) {
const rows = await qb
.init(populateValue)
.join({
alias: alias,
referencedTable: joinTable.name,
referencedColumn: joinTable.inverseJoinColumn.name,
rootColumn: joinTable.inverseJoinColumn.referencedColumn,
rootTable: qb.alias,
on: joinTable.on,
})
.select([`${alias}.${joinColumnName}`, qb.raw('count(*) AS count')])
.where({
[`${alias}.${joinColumnName}`]: results.map(r => r[referencedColumnName]),
})
.groupBy(`${alias}.${joinColumnName}`)
.execute({ mapResults: false });
const map = rows.reduce((map, row) => {
map[row[joinColumnName]] = { count: row.count };
return map;
}, {});
const referencedValues = _.uniq(
results.map(r => r[referencedColumnName]).filter(value => !_.isNil(value))
);
if (_.isEmpty(referencedValues)) {
results.forEach(result => {
result[key] = map[result[referencedColumnName]] || { count: 0 };
result[key] = null;
});
continue;
}
@ -620,10 +606,8 @@ const applyPopulate = async (results, populate, ctx) => {
rootTable: qb.alias,
on: joinTable.on,
})
.addSelect(`${alias}.${joinColumnName}`)
.where({
[`${alias}.${joinColumnName}`]: results.map(r => r[referencedColumnName]),
})
.addSelect(joinColAlias)
.where({ [joinColAlias]: referencedValues })
.execute({ mapResults: false });
const map = _.groupBy(joinColumnName, rows);
@ -681,8 +665,20 @@ const applyPopulate = async (results, populate, ctx) => {
} = joinTable.joinColumn;
const alias = qb.getAlias();
const joinColAlias = `${alias}.${joinColumnName}`;
const referencedValues = _.uniq(
results.map(r => r[referencedColumnName]).filter(value => !_.isNil(value))
);
if (isCount) {
if (_.isEmpty(referencedValues)) {
results.forEach(result => {
result[key] = { count: 0 };
});
continue;
}
const rows = await qb
.init(populateValue)
.join({
@ -693,11 +689,9 @@ const applyPopulate = async (results, populate, ctx) => {
rootTable: qb.alias,
on: joinTable.on,
})
.select([`${alias}.${joinColumnName}`, qb.raw('count(*) AS count')])
.where({
[`${alias}.${joinColumnName}`]: results.map(r => r[referencedColumnName]),
})
.groupBy(`${alias}.${joinColumnName}`)
.select([joinColAlias, qb.raw('count(*) AS count')])
.where({ [joinColAlias]: referencedValues })
.groupBy(joinColAlias)
.execute({ mapResults: false });
const map = rows.reduce((map, row) => {
@ -712,6 +706,13 @@ const applyPopulate = async (results, populate, ctx) => {
continue;
}
if (_.isEmpty(referencedValues)) {
results.forEach(result => {
result[key] = [];
});
continue;
}
const rows = await qb
.init(populateValue)
.join({
@ -722,10 +723,8 @@ const applyPopulate = async (results, populate, ctx) => {
rootTable: qb.alias,
on: joinTable.on,
})
.addSelect(`${alias}.${joinColumnName}`)
.where({
[`${alias}.${joinColumnName}`]: results.map(r => r[referencedColumnName]),
})
.addSelect(joinColAlias)
.where({ [joinColAlias]: referencedValues })
.execute({ mapResults: false });
const map = _.groupBy(joinColumnName, rows);
@ -745,8 +744,19 @@ const applyPopulate = async (results, populate, ctx) => {
const { name: joinColumnName, referencedColumn: referencedColumnName } = joinTable.joinColumn;
const alias = qb.getAlias();
const joinColAlias = `${alias}.${joinColumnName}`;
const referencedValues = _.uniq(
results.map(r => r[referencedColumnName]).filter(value => !_.isNil(value))
);
if (isCount) {
if (_.isEmpty(referencedValues)) {
results.forEach(result => {
result[key] = { count: 0 };
});
continue;
}
const rows = await qb
.init(populateValue)
.join({
@ -757,11 +767,9 @@ const applyPopulate = async (results, populate, ctx) => {
rootTable: qb.alias,
on: joinTable.on,
})
.select([`${alias}.${joinColumnName}`, qb.raw('count(*) AS count')])
.where({
[`${alias}.${joinColumnName}`]: results.map(r => r[referencedColumnName]),
})
.groupBy(`${alias}.${joinColumnName}`)
.select([joinColAlias, qb.raw('count(*) AS count')])
.where({ [joinColAlias]: referencedValues })
.groupBy(joinColAlias)
.execute({ mapResults: false });
const map = rows.reduce((map, row) => {
@ -776,6 +784,13 @@ const applyPopulate = async (results, populate, ctx) => {
continue;
}
if (_.isEmpty(referencedValues)) {
results.forEach(result => {
result[key] = [];
});
continue;
}
const rows = await qb
.init(populateValue)
.join({
@ -786,10 +801,8 @@ const applyPopulate = async (results, populate, ctx) => {
rootTable: qb.alias,
on: joinTable.on,
})
.addSelect(`${alias}.${joinColumnName}`)
.where({
[`${alias}.${joinColumnName}`]: results.map(r => r[referencedColumnName]),
})
.addSelect(joinColAlias)
.where({ [joinColAlias]: referencedValues })
.execute({ mapResults: false });
const map = _.groupBy(joinColumnName, rows);

14
packages/core/database/lib/query/query-builder.js
View File

@ -30,6 +30,13 @@ const createQueryBuilder = (uid, db) => {
alias: getAlias(),
getAlias,
select(args) {
state.type = 'select';
state.select = _.castArray(args).map(col => this.aliasColumn(col));
return this;
},
insert(data) {
state.type = 'insert';
state.data = data;
@ -65,13 +72,6 @@ const createQueryBuilder = (uid, db) => {
return this;
},
select(args) {
state.type = 'select';
state.select = _.castArray(args).map(col => this.aliasColumn(col));
return this;
},
addSelect(args) {
state.select.push(..._.castArray(args).map(col => this.aliasColumn(col)));
return this;

2
packages/core/utils/lib/relations.js
View File

@ -1,6 +1,6 @@
'use strict';
const MANY_RELATIONS = ['oneToMany', 'manyToMany', 'manyWay'];
const MANY_RELATIONS = ['oneToMany', 'manyToMany'];
const getRelationalFields = contentType => {
return Object.keys(contentType.attributes).filter(attributeName => {