Key cleanup before migration 88 and attempt vacuum only once in 920
This commit is contained in:
parent
6ae0edcc1e
commit
be6331d75f
4 changed files with 615 additions and 146 deletions
420
ts/test-node/sql/migration_87_test.ts
Normal file
420
ts/test-node/sql/migration_87_test.ts
Normal file
|
@ -0,0 +1,420 @@
|
|||
// Copyright 2023 Signal Messenger, LLC
|
||||
// SPDX-License-Identifier: AGPL-3.0-only
|
||||
|
||||
import { assert } from 'chai';
|
||||
import type { Database } from '@signalapp/better-sqlite3';
|
||||
import SQL from '@signalapp/better-sqlite3';
|
||||
import { v4 as generateGuid } from 'uuid';
|
||||
import { range } from 'lodash';
|
||||
|
||||
import { insertData, updateToVersion } from './helpers';
|
||||
import type {
|
||||
AciString,
|
||||
PniString,
|
||||
ServiceIdString,
|
||||
} from '../../types/ServiceId';
|
||||
import { normalizeAci, normalizePni } from '../../types/ServiceId';
|
||||
import type {
|
||||
KyberPreKeyType,
|
||||
PreKeyType,
|
||||
SignedPreKeyType,
|
||||
} from '../../sql/Interface';
|
||||
|
||||
type TestingKyberKey = Omit<
|
||||
KyberPreKeyType,
|
||||
'data' | 'isLastResort' | 'isConfirmed' | 'createdAt' | 'ourServiceId'
|
||||
> & {
|
||||
createdAt: number | undefined;
|
||||
ourUuid: PniString | AciString;
|
||||
};
|
||||
type TestingPreKey = Omit<
|
||||
PreKeyType,
|
||||
| 'privateKey'
|
||||
| 'publicKey'
|
||||
| 'isLastResort'
|
||||
| 'isConfirmed'
|
||||
| 'createdAt'
|
||||
| 'ourServiceId'
|
||||
> & {
|
||||
createdAt: number | undefined;
|
||||
ourUuid: PniString | AciString;
|
||||
};
|
||||
type TestingSignedKey = Omit<
|
||||
SignedPreKeyType,
|
||||
'privateKey' | 'publicKey' | 'confirmed' | 'created_at' | 'ourServiceId'
|
||||
> & {
|
||||
created_at: number | undefined;
|
||||
ourUuid: PniString | AciString;
|
||||
};
|
||||
|
||||
describe('SQL/updateToSchemaVersion87(cleanup)', () => {
|
||||
let db: Database;
|
||||
|
||||
const OUR_ACI = normalizeAci(
|
||||
generateGuid(),
|
||||
'updateToSchemaVersion87(cleanup) test'
|
||||
);
|
||||
const OUR_PNI = normalizePni(
|
||||
`PNI:${generateGuid()}`,
|
||||
'updateToSchemaVersion87(cleanup) test'
|
||||
);
|
||||
let idCount = 0;
|
||||
|
||||
beforeEach(() => {
|
||||
db = new SQL(':memory:');
|
||||
updateToVersion(db, 86);
|
||||
});
|
||||
|
||||
afterEach(() => {
|
||||
db.close();
|
||||
});
|
||||
|
||||
function addPni() {
|
||||
insertData(db, 'items', [
|
||||
{
|
||||
id: 'pni',
|
||||
json: {
|
||||
id: 'pni',
|
||||
value: OUR_PNI,
|
||||
},
|
||||
},
|
||||
]);
|
||||
}
|
||||
|
||||
function getCountOfKyberKeys(): number {
|
||||
return db.prepare('SELECT count(*) FROM kyberPreKeys;').pluck(true).get();
|
||||
}
|
||||
function getCountOfPreKeys(): number {
|
||||
return db.prepare('SELECT count(*) FROM preKeys;').pluck(true).get();
|
||||
}
|
||||
function getCountOfSignedKeys(): number {
|
||||
return db.prepare('SELECT count(*) FROM signedPreKeys;').pluck(true).get();
|
||||
}
|
||||
|
||||
function getPragma(): number {
|
||||
return db.prepare('PRAGMA user_version;').pluck(true).get();
|
||||
}
|
||||
|
||||
function generateKyberKey(
|
||||
createdAt: number | undefined,
|
||||
ourServiceId: ServiceIdString
|
||||
): TestingKyberKey {
|
||||
idCount += 1;
|
||||
|
||||
return {
|
||||
createdAt,
|
||||
id: `${ourServiceId}:${idCount}`,
|
||||
keyId: idCount,
|
||||
ourUuid: ourServiceId,
|
||||
};
|
||||
}
|
||||
|
||||
function generatePreKey(
|
||||
createdAt: number | undefined,
|
||||
ourServiceId: ServiceIdString
|
||||
): TestingPreKey {
|
||||
idCount += 1;
|
||||
|
||||
return {
|
||||
createdAt,
|
||||
id: `${ourServiceId}:${idCount}`,
|
||||
keyId: idCount,
|
||||
ourUuid: ourServiceId,
|
||||
};
|
||||
}
|
||||
|
||||
function generateSignedKey(
|
||||
createdAt: number | undefined,
|
||||
ourServiceId: ServiceIdString
|
||||
): TestingSignedKey {
|
||||
idCount += 1;
|
||||
|
||||
return {
|
||||
created_at: createdAt,
|
||||
id: `${ourServiceId}:${idCount}`,
|
||||
keyId: idCount,
|
||||
ourUuid: ourServiceId,
|
||||
};
|
||||
}
|
||||
|
||||
function getRangeOfKyberKeysForInsert(
|
||||
start: number,
|
||||
end: number,
|
||||
ourServiceId: ServiceIdString,
|
||||
options?: {
|
||||
clearCreatedAt?: boolean;
|
||||
}
|
||||
): Array<{ id: string; json: TestingKyberKey }> {
|
||||
return range(start, end).map(createdAt => {
|
||||
const key = generateKyberKey(
|
||||
options?.clearCreatedAt ? undefined : createdAt,
|
||||
ourServiceId
|
||||
);
|
||||
|
||||
return {
|
||||
id: key.id,
|
||||
json: key,
|
||||
};
|
||||
});
|
||||
}
|
||||
|
||||
it('handles missing PNI', () => {
|
||||
assert.strictEqual(0, getCountOfKyberKeys());
|
||||
insertData(
|
||||
db,
|
||||
'kyberPreKeys',
|
||||
getRangeOfKyberKeysForInsert(0, 3000, OUR_ACI)
|
||||
);
|
||||
assert.strictEqual(3000, getCountOfKyberKeys());
|
||||
assert.strictEqual(86, getPragma());
|
||||
|
||||
updateToVersion(db, 88);
|
||||
|
||||
assert.strictEqual(88, getPragma());
|
||||
assert.strictEqual(3000, getCountOfKyberKeys());
|
||||
});
|
||||
|
||||
describe('kyberPreKeys', () => {
|
||||
it('deletes 2000 extra keys', () => {
|
||||
assert.strictEqual(0, getCountOfKyberKeys());
|
||||
addPni();
|
||||
insertData(
|
||||
db,
|
||||
'kyberPreKeys',
|
||||
getRangeOfKyberKeysForInsert(0, 3000, OUR_PNI)
|
||||
);
|
||||
assert.strictEqual(3000, getCountOfKyberKeys());
|
||||
assert.strictEqual(86, getPragma());
|
||||
|
||||
updateToVersion(db, 88);
|
||||
|
||||
assert.strictEqual(88, getPragma());
|
||||
assert.strictEqual(1000, getCountOfKyberKeys());
|
||||
});
|
||||
|
||||
it('leaves 1000 existing keys alone', () => {
|
||||
assert.strictEqual(0, getCountOfKyberKeys());
|
||||
addPni();
|
||||
insertData(
|
||||
db,
|
||||
'kyberPreKeys',
|
||||
getRangeOfKyberKeysForInsert(0, 1000, OUR_PNI)
|
||||
);
|
||||
assert.strictEqual(1000, getCountOfKyberKeys());
|
||||
assert.strictEqual(86, getPragma());
|
||||
|
||||
updateToVersion(db, 88);
|
||||
|
||||
assert.strictEqual(88, getPragma());
|
||||
assert.strictEqual(1000, getCountOfKyberKeys());
|
||||
});
|
||||
|
||||
it('leaves keys with missing createdAt alone', () => {
|
||||
assert.strictEqual(0, getCountOfKyberKeys());
|
||||
addPni();
|
||||
insertData(
|
||||
db,
|
||||
'kyberPreKeys',
|
||||
getRangeOfKyberKeysForInsert(0, 3000, OUR_PNI, { clearCreatedAt: true })
|
||||
);
|
||||
assert.strictEqual(3000, getCountOfKyberKeys());
|
||||
assert.strictEqual(86, getPragma());
|
||||
|
||||
updateToVersion(db, 88);
|
||||
|
||||
assert.strictEqual(88, getPragma());
|
||||
assert.strictEqual(3000, getCountOfKyberKeys());
|
||||
});
|
||||
|
||||
it('leaves extra ACI keys alone, even if above 1000', () => {
|
||||
assert.strictEqual(0, getCountOfKyberKeys());
|
||||
addPni();
|
||||
insertData(
|
||||
db,
|
||||
'kyberPreKeys',
|
||||
getRangeOfKyberKeysForInsert(0, 3000, OUR_ACI)
|
||||
);
|
||||
assert.strictEqual(3000, getCountOfKyberKeys());
|
||||
assert.strictEqual(86, getPragma());
|
||||
|
||||
updateToVersion(db, 88);
|
||||
|
||||
assert.strictEqual(88, getPragma());
|
||||
assert.strictEqual(3000, getCountOfKyberKeys());
|
||||
});
|
||||
});
|
||||
|
||||
describe('preKeys', () => {
|
||||
function getRangeOfPreKeysForInsert(
|
||||
start: number,
|
||||
end: number,
|
||||
ourServiceId: ServiceIdString,
|
||||
options?: {
|
||||
clearCreatedAt?: boolean;
|
||||
}
|
||||
): Array<{ id: string; json: TestingPreKey }> {
|
||||
return range(start, end).map(createdAt => {
|
||||
const key = generatePreKey(
|
||||
options?.clearCreatedAt ? undefined : createdAt,
|
||||
ourServiceId
|
||||
);
|
||||
|
||||
return {
|
||||
id: key.id,
|
||||
json: key,
|
||||
};
|
||||
});
|
||||
}
|
||||
|
||||
it('deletes 2000 extra keys', () => {
|
||||
assert.strictEqual(0, getCountOfPreKeys());
|
||||
addPni();
|
||||
insertData(db, 'preKeys', getRangeOfPreKeysForInsert(0, 3000, OUR_PNI));
|
||||
assert.strictEqual(3000, getCountOfPreKeys());
|
||||
assert.strictEqual(86, getPragma());
|
||||
|
||||
updateToVersion(db, 88);
|
||||
|
||||
assert.strictEqual(88, getPragma());
|
||||
assert.strictEqual(1000, getCountOfPreKeys());
|
||||
});
|
||||
|
||||
it('leaves 1000 existing keys alone', () => {
|
||||
assert.strictEqual(0, getCountOfPreKeys());
|
||||
addPni();
|
||||
insertData(db, 'preKeys', getRangeOfPreKeysForInsert(0, 1000, OUR_PNI));
|
||||
assert.strictEqual(1000, getCountOfPreKeys());
|
||||
assert.strictEqual(86, getPragma());
|
||||
|
||||
updateToVersion(db, 88);
|
||||
|
||||
assert.strictEqual(88, getPragma());
|
||||
assert.strictEqual(1000, getCountOfPreKeys());
|
||||
});
|
||||
|
||||
it('leaves keys with missing createdAt alone', () => {
|
||||
assert.strictEqual(0, getCountOfPreKeys());
|
||||
addPni();
|
||||
insertData(
|
||||
db,
|
||||
'preKeys',
|
||||
getRangeOfPreKeysForInsert(0, 3000, OUR_PNI, {
|
||||
clearCreatedAt: true,
|
||||
})
|
||||
);
|
||||
assert.strictEqual(3000, getCountOfPreKeys());
|
||||
assert.strictEqual(86, getPragma());
|
||||
|
||||
updateToVersion(db, 88);
|
||||
|
||||
assert.strictEqual(88, getPragma());
|
||||
assert.strictEqual(3000, getCountOfPreKeys());
|
||||
});
|
||||
|
||||
it('leaves extra ACI keys alone, even if above 1000', () => {
|
||||
assert.strictEqual(0, getCountOfPreKeys());
|
||||
addPni();
|
||||
insertData(db, 'preKeys', getRangeOfPreKeysForInsert(0, 3000, OUR_ACI));
|
||||
assert.strictEqual(3000, getCountOfPreKeys());
|
||||
assert.strictEqual(86, getPragma());
|
||||
|
||||
updateToVersion(db, 88);
|
||||
|
||||
assert.strictEqual(88, getPragma());
|
||||
assert.strictEqual(3000, getCountOfPreKeys());
|
||||
});
|
||||
});
|
||||
|
||||
describe('signedPreKeys', () => {
|
||||
function getRangeOfSignedKeysForInsert(
|
||||
start: number,
|
||||
end: number,
|
||||
ourServiceId: ServiceIdString,
|
||||
options?: {
|
||||
clearCreatedAt?: boolean;
|
||||
}
|
||||
): Array<{ id: string; json: TestingSignedKey }> {
|
||||
return range(start, end).map(createdAt => {
|
||||
const key = generateSignedKey(
|
||||
options?.clearCreatedAt ? undefined : createdAt,
|
||||
ourServiceId
|
||||
);
|
||||
|
||||
return {
|
||||
id: key.id,
|
||||
json: key,
|
||||
};
|
||||
});
|
||||
}
|
||||
|
||||
it('deletes 2000 extra keys', () => {
|
||||
assert.strictEqual(0, getCountOfSignedKeys());
|
||||
addPni();
|
||||
insertData(
|
||||
db,
|
||||
'signedPreKeys',
|
||||
getRangeOfSignedKeysForInsert(0, 3000, OUR_PNI)
|
||||
);
|
||||
assert.strictEqual(3000, getCountOfSignedKeys());
|
||||
assert.strictEqual(86, getPragma());
|
||||
|
||||
updateToVersion(db, 88);
|
||||
|
||||
assert.strictEqual(88, getPragma());
|
||||
assert.strictEqual(1000, getCountOfSignedKeys());
|
||||
});
|
||||
|
||||
it('leaves 1000 existing keys alone', () => {
|
||||
assert.strictEqual(0, getCountOfSignedKeys());
|
||||
addPni();
|
||||
insertData(
|
||||
db,
|
||||
'signedPreKeys',
|
||||
getRangeOfSignedKeysForInsert(0, 1000, OUR_PNI)
|
||||
);
|
||||
assert.strictEqual(1000, getCountOfSignedKeys());
|
||||
assert.strictEqual(86, getPragma());
|
||||
|
||||
updateToVersion(db, 88);
|
||||
|
||||
assert.strictEqual(88, getPragma());
|
||||
assert.strictEqual(1000, getCountOfSignedKeys());
|
||||
});
|
||||
|
||||
it('leaves keys with missing createdAt alone', () => {
|
||||
assert.strictEqual(0, getCountOfSignedKeys());
|
||||
addPni();
|
||||
insertData(
|
||||
db,
|
||||
'signedPreKeys',
|
||||
getRangeOfSignedKeysForInsert(0, 3000, OUR_PNI, {
|
||||
clearCreatedAt: true,
|
||||
})
|
||||
);
|
||||
assert.strictEqual(3000, getCountOfSignedKeys());
|
||||
assert.strictEqual(86, getPragma());
|
||||
|
||||
updateToVersion(db, 88);
|
||||
|
||||
assert.strictEqual(88, getPragma());
|
||||
assert.strictEqual(3000, getCountOfSignedKeys());
|
||||
});
|
||||
|
||||
it('leaves extra ACI keys alone, even if above 1000', () => {
|
||||
assert.strictEqual(0, getCountOfSignedKeys());
|
||||
addPni();
|
||||
insertData(
|
||||
db,
|
||||
'signedPreKeys',
|
||||
getRangeOfSignedKeysForInsert(0, 3000, OUR_ACI)
|
||||
);
|
||||
assert.strictEqual(3000, getCountOfSignedKeys());
|
||||
assert.strictEqual(86, getPragma());
|
||||
|
||||
updateToVersion(db, 88);
|
||||
|
||||
assert.strictEqual(88, getPragma());
|
||||
assert.strictEqual(3000, getCountOfSignedKeys());
|
||||
});
|
||||
});
|
||||
});
|
Loading…
Add table
Add a link
Reference in a new issue