mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Temporarily disable post-attachment migration migrations

Browse source
This commit is contained in:
Daniel Gasienica 2018-04-02 15:26:23 -04:00
parent d9be6a0f94
commit bfbeedab5c
4 changed files with 27 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
js/background.js
View file

@ -19,7 +19,7 @@
const { upgradeMessageSchema } = window.Signal.Migrations; const { upgradeMessageSchema } = window.Signal.Migrations;
const { const {
Migrations0DatabaseWithAttachmentData, Migrations0DatabaseWithAttachmentData,
Migrations1DatabaseWithoutAttachmentData, // Migrations1DatabaseWithoutAttachmentData,
} = window.Signal.Migrations; } = window.Signal.Migrations;
const { Views } = window.Signal; const { Views } = window.Signal;
@ -86,20 +86,20 @@
console.log('Migrate database with attachments'); console.log('Migrate database with attachments');
await Migrations0DatabaseWithAttachmentData.run({ Backbone }); await Migrations0DatabaseWithAttachmentData.run({ Backbone });
console.log('Migrate attachments to disk'); // console.log('Migrate attachments to disk');
const database = Migrations0DatabaseWithAttachmentData.getDatabase(); // const database = Migrations0DatabaseWithAttachmentData.getDatabase();
await MessageDataMigrator.processAll({ // await MessageDataMigrator.processAll({
Backbone, // Backbone,
databaseName: database.name, // databaseName: database.name,
minDatabaseVersion: database.version, // minDatabaseVersion: database.version,
upgradeMessageSchema, // upgradeMessageSchema,
}); // });
console.log('Migrate database without attachments'); // console.log('Migrate database without attachments');
await Migrations1DatabaseWithoutAttachmentData.run({ // await Migrations1DatabaseWithoutAttachmentData.run({
Backbone, // Backbone,
database: Whisper.Database, // database: Whisper.Database,
}); // });
console.log('Storage fetch'); console.log('Storage fetch');
storage.fetch(); storage.fetch();

4
js/database.js
View file

@ -6,7 +6,7 @@
(function () { (function () {
'use strict'; 'use strict';
const { Migrations1DatabaseWithoutAttachmentData } = window.Signal.Migrations; const { Migrations0DatabaseWithAttachmentData } = window.Signal.Migrations;
window.Whisper = window.Whisper || {}; window.Whisper = window.Whisper || {};
window.Whisper.Database = window.Whisper.Database || {}; window.Whisper.Database = window.Whisper.Database || {};
@ -123,5 +123,5 @@
request.onsuccess = resolve; request.onsuccess = resolve;
})); }));
Whisper.Database.migrations = Migrations1DatabaseWithoutAttachmentData.migrations; Whisper.Database.migrations = Migrations0DatabaseWithAttachmentData.migrations;
}()); }());

6
js/modules/migrations/migrations_0_database_with_attachment_data.js
View file

@ -8,7 +8,7 @@ const { runMigrations } = require('./run_migrations');
// any expensive operations, e.g. modifying all messages / attachments, etc., as // any expensive operations, e.g. modifying all messages / attachments, etc., as
// it may cause out-of-memory errors for users with long histories: // it may cause out-of-memory errors for users with long histories:
// https://github.com/signalapp/Signal-Desktop/issues/2163 // https://github.com/signalapp/Signal-Desktop/issues/2163
const migrations = [ exports.migrations = [
{ {
version: '12.0', version: '12.0',
migrate(transaction, next) { migrate(transaction, next) {
@ -144,7 +144,7 @@ const migrations = [
const database = { const database = {
id: 'signal', id: 'signal',
nolog: true, nolog: true,
migrations, migrations: exports.migrations,
}; };
exports.run = ({ Backbone } = {}) => exports.run = ({ Backbone } = {}) =>
@ -152,5 +152,5 @@ exports.run = ({ Backbone } = {}) =>
exports.getDatabase = () => ({ exports.getDatabase = () => ({
name: database.id, name: database.id,
version: last(migrations).version, version: last(exports.migrations).version,
}); });

16
js/modules/migrations/migrations_1_database_without_attachment_data.js
View file

@ -2,14 +2,14 @@ const { runMigrations } = require('./run_migrations');
exports.migrations = [ exports.migrations = [
{ // {
version: 18, // version: 18,
async migrate(transaction, next) { // async migrate(transaction, next) {
console.log('Migration 18'); // console.log('Migration 18');
console.log('Attachments stored on disk'); // console.log('Attachments stored on disk');
next(); // next();
}, // },
}, // },
]; ];
exports.run = runMigrations; exports.run = runMigrations;