Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-01-06 22:40:14 -05:00
Code Issues Activity

Refactored default settings population to reduce unnecessary DB queries

Browse source 
refs https://github.com/TryGhost/Toolbox/issues/202

- this code suffers from two problems:
  - when we don't have any new settings to insert, we still end up
    fetching the columnInfo and owner info, even though we only need
    them if we're inserting data. This results in 3 extra queries upon
    boot
  - secondly, we insert every setting with a separate query - MySQL and
    SQLite both support batch inserts and knex has a utility to help us
    that I've [used
    before](38821c5242).
    With 95 settings at the time of writing, this adds 94 extra queries
    during the DB init
- this commit refactors the code so that we only fetch the columnInfo and
  owner data if we've got new settings to insert, and batches the
  inserts using knex's batchInsert util
- this query results in ~95 less queries during DB init and saves a
  couple of queries during boot
This commit is contained in:
Daniel Lockyer 2022-02-08 09:04:09 +01:00
parent 4cdc93ca3a
commit 94f5add1c0
1 changed files with 50 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
core/server/models/settings.js
View file

@ -260,6 +260,23 @@ Settings = ghostBookshelf.Model.extend({
await ghostBookshelf.knex.destroy();
await ghostBookshelf.knex.initialize();
const allSettings = await this.findAll(options);
const usedKeys = allSettings.models.map(function mapper(setting) {
return setting.get('key');
});
const settingsToInsert = [];
_.each(getDefaultSettings(), function forEachDefault(defaultSetting, defaultSettingKey) {
const isMissingFromDB = usedKeys.indexOf(defaultSettingKey) === -1;
if (isMissingFromDB) {
defaultSetting.value = defaultSetting.getDefaultValue();
settingsToInsert.push(defaultSetting);
}
});
if (settingsToInsert.length > 0) {
// fetch available columns to avoid populating columns not yet created by migrations
const columnInfo = await ghostBookshelf.knex.table('settings').columnInfo();
const columns = Object.keys(columnInfo);
@ -278,21 +295,8 @@ Settings = ghostBookshelf.Model.extend({
}
}
return this
.findAll(options)
.then(function checkAllSettings(allSettings) {
const usedKeys = allSettings.models.map(function mapper(setting) {
return setting.get('key');
});
const insertOperations = [];
_.each(getDefaultSettings(), function forEachDefault(defaultSetting, defaultSettingKey) {
const isMissingFromDB = usedKeys.indexOf(defaultSettingKey) === -1;
if (isMissingFromDB) {
defaultSetting.value = defaultSetting.getDefaultValue();
const settingValues = Object.assign({}, defaultSetting, {
const settingsDataToInsert = settingsToInsert.map((setting) => {
const settingValues = Object.assign({}, setting, {
id: ObjectID().toHexString(),
created_at: date,
created_by: owner.id,
@ -300,22 +304,16 @@ Settings = ghostBookshelf.Model.extend({
updated_by: owner.id
});
insertOperations.push(
ghostBookshelf.knex
.table('settings')
.insert(_.pick(settingValues, columns))
);
}
return _.pick(settingValues, columns);
});
if (insertOperations.length > 0) {
return Promise.all(insertOperations).then(function fetchAllToReturn() {
await ghostBookshelf.knex
.batchInsert('settings', settingsDataToInsert);
return self.findAll(options);
});
}
return allSettings;
});
},
permissible: function permissible(modelId, action, context, unsafeAttrs, loadedPermissions, hasUserPermission, hasApiKeyPermission) {