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

Extra logging for GV2 UUID migration

Browse source
This commit is contained in:
Fedor Indutny 2021-11-03 07:59:46 -07:00 committed by GitHub
parent 5bd7eda124
commit 7f9beef055
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ts/sql/migrations/43-gv2-uuid.ts
View file

@ -37,6 +37,7 @@ export default function updateToSchemaVersion43(
type LegacyConversationType = {
id: string;
groupId: string;
membersV2?: Array<{
conversationId: string;
}>;
@ -78,6 +79,8 @@ export default function updateToSchemaVersion43(
const legacy = (convo as unknown) as LegacyConversationType;
let result = convo;
const logId = `(${legacy.id}) groupv2(${legacy.groupId})`;
const memberKeys: Array<keyof LegacyConversationType> = [
'membersV2',
'pendingMembersV2',
@ -98,7 +101,7 @@ export default function updateToSchemaVersion43(
});
if (!uuid) {
logger.warn(
`updateToSchemaVersion43: ${legacy.id}.${key} UUID not found ` +
`updateToSchemaVersion43: ${logId}.${key} UUID not found ` +
`for ${member.conversationId}`
);
return undefined;
@ -141,14 +144,14 @@ export default function updateToSchemaVersion43(
if (oldValue.length !== 0) {
logger.info(
`updateToSchemaVersion43: migrated ${oldValue.length} ${key} ` +
`entries to ${newValue.length} for ${legacy.id}`
`entries to ${newValue.length} for ${logId}`
);
}
if (addedByCount > 0) {
logger.info(
`updateToSchemaVersion43: migrated ${addedByCount} addedByUserId ` +
`in ${key} for ${legacy.id}`
`in ${key} for ${logId}`
);
}
}

9
ts/test-node/sql_migrations_test.ts
View file

@ -626,8 +626,12 @@ describe('SQL migrations test', () => {
const UUID_B = generateGuid();
const UUID_C = generateGuid();
const rawConvoA = { id: 'a', groupId: 'gv2a', uuid: UUID_A };
const rawConvoB = { id: 'b', groupId: 'gv2b', uuid: UUID_B };
const rawConvoC = {
id: 'c',
groupId: 'gv2c',
uuid: UUID_C,
membersV2: [
{ conversationId: 'a', joinedAtVersion: 1 },
@ -668,8 +672,8 @@ describe('SQL migrations test', () => {
INSERT INTO conversations
(id, uuid, json)
VALUES
('a', '${UUID_A}', '${JSON.stringify({ id: 'a', uuid: UUID_A })}'),
('b', '${UUID_B}', '${JSON.stringify({ id: 'b', uuid: UUID_B })}'),
('a', '${UUID_A}', '${JSON.stringify(rawConvoA)}'),
('b', '${UUID_B}', '${JSON.stringify(rawConvoB)}'),
('c', '${UUID_C}', '${JSON.stringify(rawConvoC)}');
INSERT INTO messages
@ -714,6 +718,7 @@ describe('SQL migrations test', () => {
assert.strictEqual(members, `${UUID_A} ${UUID_B}`);
assert.deepStrictEqual(JSON.parse(convoJSON), {
id: 'c',
groupId: 'gv2c',
uuid: UUID_C,
membersV2: [
{ uuid: UUID_A, joinedAtVersion: 1 },