Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-31 18:36:30 +01:00
Code Issues Packages Projects Releases Activity

separate DB connection for each transaction (just for the record, will be reverted probably)

Browse Source
This commit is contained in:
azivner
2017-11-28 17:04:47 -05:00
parent 4d95eb0762
commit fd764f6163
21 changed files with 326 additions and 429 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
services/sync_update.js
View File

@@ -10,71 +10,71 @@ async function updateNote(entity, links, sourceId) {
const origNote = await sql.getSingleResult("SELECT * FROM notes WHERE note_id = ?", [entity.note_id]);
if (!origNote || origNote.date_modified <= entity.date_modified) {
await sql.doInTransaction(async () => {
await sql.replace("notes", entity);
await sql.doInTransaction(async db => {
await sql.replace(db, "notes", entity);
await sql.remove("links", entity.note_id);
await sql.remove(db, "links", entity.note_id);
for (const link of links) {
delete link['lnk_id'];
//await sql.insert('link', link);
//await sql.insert(db, 'link', link);
}
await sync_table.addNoteSync(entity.note_id, sourceId);
await eventLog.addNoteEvent(entity.note_id, "Synced note <note>");
await sync_table.addNoteSync(db, entity.note_id, sourceId);
await eventLog.addNoteEvent(db, entity.note_id, "Synced note <note>");
});
log.info("Update/sync note " + entity.note_id);
}
else {
await eventLog.addNoteEvent(entity.note_id, "Sync conflict in note <note>, " + utils.formatTwoTimestamps(origNote.date_modified, entity.date_modified));
await eventLog.addNoteEvent(db, entity.note_id, "Sync conflict in note <note>, " + utils.formatTwoTimestamps(origNote.date_modified, entity.date_modified));
}
}
async function updateNoteTree(entity, sourceId) {
const orig = await sql.getSingleResultOrNull("SELECT * FROM notes_tree WHERE note_tree_id = ?", [entity.note_tree_id]);
if (orig === null || orig.date_modified < entity.date_modified) {
await sql.doInTransaction(async () => {
await sql.doInTransaction(async db => {
if (orig === null || orig.date_modified < entity.date_modified) {
delete entity.is_expanded;
await sql.replace('notes_tree', entity);
await sql.replace(db, 'notes_tree', entity);
await sync_table.addNoteTreeSync(entity.note_tree_id, sourceId);
});
await sync_table.addNoteTreeSync(db, entity.note_tree_id, sourceId);
log.info("Update/sync note tree " + entity.note_tree_id);
}
else {
await eventLog.addNoteEvent(entity.note_tree_id, "Sync conflict in note tree <note>, " + utils.formatTwoTimestamps(orig.date_modified, entity.date_modified));
}
log.info("Update/sync note tree " + entity.note_tree_id);
}
else {
await eventLog.addNoteEvent(db, entity.note_tree_id, "Sync conflict in note tree <note>, " + utils.formatTwoTimestamps(orig.date_modified, entity.date_modified));
}
});
}
async function updateNoteHistory(entity, sourceId) {
const orig = await sql.getSingleResultOrNull("SELECT * FROM notes_history WHERE note_history_id = ?", [entity.note_history_id]);
if (orig === null || orig.date_modified_to < entity.date_modified_to) {
await sql.doInTransaction(async () => {
await sql.replace('notes_history', entity);
await sql.doInTransaction(async db => {
if (orig === null || orig.date_modified_to < entity.date_modified_to) {
await sql.replace(db, 'notes_history', entity);
await sync_table.addNoteHistorySync(entity.note_history_id, sourceId);
});
await sync_table.addNoteHistorySync(db, entity.note_history_id, sourceId);
log.info("Update/sync note history " + entity.note_history_id);
}
else {
await eventLog.addNoteEvent(entity.note_id, "Sync conflict in note history for <note>, " + utils.formatTwoTimestamps(orig.date_modified_to, entity.date_modified_to));
}
log.info("Update/sync note history " + entity.note_history_id);
}
else {
await eventLog.addNoteEvent(db, entity.note_id, "Sync conflict in note history for <note>, " + utils.formatTwoTimestamps(orig.date_modified_to, entity.date_modified_to));
}
});
}
async function updateNoteReordering(entity, sourceId) {
await sql.doInTransaction(async () => {
await sql.doInTransaction(async db => {
Object.keys(entity.ordering).forEach(async key => {
await sql.execute("UPDATE notes_tree SET note_pos = ? WHERE note_tree_id = ?", [entity.ordering[key], key]);
await sql.execute(db, "UPDATE notes_tree SET note_pos = ? WHERE note_tree_id = ?", [entity.ordering[key], key]);
});
await sync_table.addNoteReorderingSync(entity.note_pid, sourceId);
await sync_table.addNoteReorderingSync(db, entity.note_pid, sourceId);
});
}
@@ -85,28 +85,28 @@ async function updateOptions(entity, sourceId) {
const orig = await sql.getSingleResultOrNull("SELECT * FROM options WHERE opt_name = ?", [entity.opt_name]);
if (orig === null || orig.date_modified < entity.date_modified) {
await sql.doInTransaction(async () => {
await sql.replace('options', entity);
await sql.doInTransaction(async db => {
if (orig === null || orig.date_modified < entity.date_modified) {
await sql.replace(db, 'options', entity);
await sync_table.addOptionsSync(entity.opt_name, sourceId);
});
await sync_table.addOptionsSync(db, entity.opt_name, sourceId);
await eventLog.addEvent("Synced option " + entity.opt_name);
}
else {
await eventLog.addEvent("Sync conflict in options for " + entity.opt_name + ", " + utils.formatTwoTimestamps(orig.date_modified, entity.date_modified));
}
await eventLog.addEvent(db, "Synced option " + entity.opt_name);
}
else {
await eventLog.addEvent(db, "Sync conflict in options for " + entity.opt_name + ", " + utils.formatTwoTimestamps(orig.date_modified, entity.date_modified));
}
});
}
async function updateRecentNotes(entity, sourceId) {
const orig = await sql.getSingleResultOrNull("SELECT * FROM recent_notes WHERE note_path = ?", [entity.note_path]);
if (orig === null || orig.date_accessed < entity.date_accessed) {
await sql.doInTransaction(async () => {
await sql.replace('recent_notes', entity);
await sql.doInTransaction(async db => {
await sql.replace(db, 'recent_notes', entity);
await sync_table.addRecentNoteSync(entity.note_path, sourceId);
await sync_table.addRecentNoteSync(db, entity.note_path, sourceId);
});
}
}