From 3b690f54564a06ee6a53e1e738a9bcdcefa93782 Mon Sep 17 00:00:00 2001
From: zadam <zadam.apps@gmail.com>
Date: Sun, 1 Dec 2019 15:01:09 +0100
Subject: [PATCH] mini optimizations

---
 src/services/consistency_checks.js | 12 ++++++------
 src/services/sync.js               |  6 +++---
 src/services/sync_table.js         |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/services/consistency_checks.js b/src/services/consistency_checks.js
index ae9d5010c..b587e9f93 100644
--- a/src/services/consistency_checks.js
+++ b/src/services/consistency_checks.js
@@ -264,7 +264,7 @@ async function findExistencyIssues() {
         branches.parentNoteId,
         branches.noteId
       HAVING
-        COUNT(*) > 1`,
+        COUNT(1) > 1`,
     async ({noteId, parentNoteId}, autoFix) => {
         if (autoFix) {
             const branches = await repository.getEntities(
@@ -636,11 +636,11 @@ async function showEntityStat(name, query) {
 }
 
 async function runDbDiagnostics() {
-    await showEntityStat("Notes", `SELECT isDeleted, count(noteId) FROM notes GROUP BY isDeleted`);
-    await showEntityStat("Note revisions", `SELECT isErased, count(noteRevisionId) FROM note_revisions GROUP BY isErased`);
-    await showEntityStat("Branches", `SELECT isDeleted, count(branchId) FROM branches GROUP BY isDeleted`);
-    await showEntityStat("Attributes", `SELECT isDeleted, count(attributeId) FROM attributes GROUP BY isDeleted`);
-    await showEntityStat("API tokens", `SELECT isDeleted, count(apiTokenId) FROM api_tokens GROUP BY isDeleted`);
+    await showEntityStat("Notes", `SELECT isDeleted, count(1) FROM notes GROUP BY isDeleted`);
+    await showEntityStat("Note revisions", `SELECT isErased, count(1) FROM note_revisions GROUP BY isErased`);
+    await showEntityStat("Branches", `SELECT isDeleted, count(1) FROM branches GROUP BY isDeleted`);
+    await showEntityStat("Attributes", `SELECT isDeleted, count(1) FROM attributes GROUP BY isDeleted`);
+    await showEntityStat("API tokens", `SELECT isDeleted, count(1) FROM api_tokens GROUP BY isDeleted`);
 }
 
 async function runChecks() {
diff --git a/src/services/sync.js b/src/services/sync.js
index b730e2db4..6eb5896a1 100644
--- a/src/services/sync.js
+++ b/src/services/sync.js
@@ -228,9 +228,9 @@ async function checkContentHash(syncContext) {
         return;
     }
 
-    const notPushedSyncs = await sql.getValue("SELECT COUNT(*) FROM sync WHERE id > ?", [await getLastSyncedPush()]);
+    const notPushedSyncs = await sql.getValue("SELECT EXISTS(SELECT 1 FROM sync WHERE id > ?)", [await getLastSyncedPush()]);
 
-    if (notPushedSyncs > 0) {
+    if (notPushedSyncs) {
         log.info(`There's ${notPushedSyncs} outstanding pushes, skipping content check.`);
 
         return;
@@ -333,7 +333,7 @@ async function updatePushStats() {
     if (await syncOptions.isSyncSetup()) {
         const lastSyncedPush = await optionService.getOption('lastSyncedPush');
 
-        stats.outstandingPushes = await sql.getValue("SELECT COUNT(*) FROM sync WHERE id > ?", [lastSyncedPush]);
+        stats.outstandingPushes = await sql.getValue("SELECT COUNT(1) FROM sync WHERE id > ?", [lastSyncedPush]);
     }
 }
 
diff --git a/src/services/sync_table.js b/src/services/sync_table.js
index 79a20d7fe..90ac3a6ba 100644
--- a/src/services/sync_table.js
+++ b/src/services/sync_table.js
@@ -31,7 +31,7 @@ async function fillSyncRows(entityName, entityKey, condition = '') {
         let createdCount = 0;
 
         for (const entityId of entityIds) {
-            const existingRows = await sql.getValue("SELECT COUNT(id) FROM sync WHERE entityName = ? AND entityId = ?", [entityName, entityId]);
+            const existingRows = await sql.getValue("SELECT COUNT(1) FROM sync WHERE entityName = ? AND entityId = ?", [entityName, entityId]);
 
             // we don't want to replace existing entities (which would effectively cause full resync)
             if (existingRows === 0) {