Tools/Notes
1
0
Fork 0
mirror of https://github.com/TriliumNext/Notes.git synced 2025-09-19 02:10:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

more advanced comparison, synced with how content hash is computed

Browse Source
This commit is contained in:
azivner 2017-11-29 19:56:14 -05:00
parent d21d5d4350
commit cd1ce48564
2 changed files with 51 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
compare.js
View File

@ -17,38 +17,56 @@ function printDiff(one, two) {
}); });
} }
function compareRows(rs1, rs2) { function checkMissing(table, name, idsLeft, idsRight) {
const len = Math.max(rs1.length, rs2.length); const missing = idsLeft.filter(item => idsRight.indexOf(item) < 0);
for (let i = 0; i < len; i++) { if (missing.length > 0) {
const r1 = JSON.stringify(rs1[i], null, 2); console.log("Missing IDs from " + name + " table " + table + ": ", missing);
const r2 = JSON.stringify(rs2[i], null, 2); }
}
if (r1 !== r2) { function compareRows(table, rsLeft, rsRight) {
console.log("Row #" + i + " differs:"); const leftIds = Object.keys(rsLeft);
console.log("First: ", r1); const rightIds = Object.keys(rsRight);
console.log("Second: ", r2);
printDiff(r1, r2); checkMissing(table, "right", leftIds, rightIds);
process.exit(1); checkMissing(table, "left", rightIds, leftIds);
const commonIds = leftIds.filter(item => rightIds.includes(item));
for (const id of commonIds) {
const left = JSON.stringify(rsLeft[id], null, 2);
const right = JSON.stringify(rsRight[id], null, 2);
if (left !== right) {
console.log("Table " + table + " row id=" + id + " differs:");
console.log("Left: ", left);
console.log("Right: ", right);
printDiff(left, right);
} }
} }
} }
async function main() { async function main() {
const db1Path = process.argv[2]; const dbLeftPath = process.argv[2];
const db2Path = process.argv[3]; const dbRightPath = process.argv[3];
const db1 = await sqlite.open(db1Path, { Promise }); const dbLeft = await sqlite.open(dbLeftPath, { Promise });
const db2 = await sqlite.open(db2Path, { Promise }); const dbRight = await sqlite.open(dbRightPath, { Promise });
async function compare(query) { async function compare(table, column, query) {
const rs1 = await sql.getResults(db1, query); const rsLeft = await sql.getIndexed(dbLeft, column, query);
const rs2 = await sql.getResults(db2, query); const rsRight = await sql.getIndexed(dbRight, column, query);
compareRows(rs1, rs2); compareRows(table, rsLeft, rsRight);
} }
await compare("SELECT note_id, note_title, note_text, date_modified, is_protected, is_deleted FROM notes ORDER BY note_id"); await compare("notes_tree", "note_tree_id", "SELECT note_tree_id, note_id, note_pid, note_pos, date_modified, is_deleted, prefix FROM notes_tree");
await compare("notes", "note_id", "SELECT note_id, note_title, note_text, date_modified, is_protected, is_deleted FROM notes");
await compare("notes_history", "note_history_id", "SELECT note_history_id, note_id, note_title, note_text, date_modified_from, date_modified_to, is_protected FROM notes_history");
await compare("recent_notes", "note_path", "SELECT note_path, date_accessed, is_deleted FROM recent_notes");
await compare("options", "opt_name", "SELECT opt_name, opt_value FROM options " +
"WHERE opt_name IN ('username', 'password_verification_hash', 'encrypted_data_key', 'protected_session_timeout', 'history_snapshot_time_interval')");
} }
(async () => { (async () => {

13
sql.js
View File

@ -24,6 +24,18 @@ async function getResults(db, query, params = []) {
return await wrap(db, async db => db.all(query, ...params)); return await wrap(db, async db => db.all(query, ...params));
} }
async function getIndexed(db, column, query, params = []) {
const results = await getResults(db, query, params);
const map = {};
for (const row of results) {
map[row[column]] = row;
}
return map;
}
async function getMap(db, query, params = []) { async function getMap(db, query, params = []) {
const map = {}; const map = {};
const results = await getResults(db, query, params); const results = await getResults(db, query, params);
@ -70,6 +82,7 @@ module.exports = {
getSingleResult, getSingleResult,
getSingleResultOrNull, getSingleResultOrNull,
getResults, getResults,
getIndexed,
getMap, getMap,
getFlattenedResults, getFlattenedResults,
execute execute