From 102e5848502397fca4c485b303909d97e600f07e Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Tue, 23 Aug 2022 20:14:20 +0700
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=BE=20=D0=BA=D0=B5=D1=88=D0=B8=D1=80=D0=BE=D0=B2=D0=B0?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=B7=D0=B0=D0=BF=D1=80=D0=BE=D1=81=D0=BE?=
 =?UTF-8?q?=D0=B2=20getBookList?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/core/DbSearcher.js | 63 +++++++++++++++++++++++++++++----------
 server/core/WebWorker.js  |  2 +-
 2 files changed, 48 insertions(+), 17 deletions(-)

diff --git a/server/core/DbSearcher.js b/server/core/DbSearcher.js
index 713001d..d1a5228 100644
--- a/server/core/DbSearcher.js
+++ b/server/core/DbSearcher.js
@@ -271,28 +271,59 @@ class DbSearcher {
         try {
             const db = this.db;
 
-            //выборка автора по authorId
-            const rows = await db.select({
-                table: 'author',
-                map: `(r) => ({author: r.author, bookId: r.bookId})`,
-                where: `@@id(${db.esc(authorId)})`
-            });
+            let result;
 
-            let author = '';
-            let result = [];
+            const key = `author_books-${authorId}`;
 
-            if (rows.length) {
-                author = rows[0].author;
+            const rows = await db.select({table: 'query_cache', where: `@@id(${db.esc(key)})`});
 
-                //выборка книг по bookId
-                result = await db.select({
-                    table: 'book',
-                    //map: `(r) => ({})`,
-                    where: `@@id(${db.esc(rows[0].bookId)})`,
+            if (rows.length) {//нашли в кеше
+                await db.insert({
+                    table: 'query_time',
+                    replace: true,
+                    rows: [{id: key, time: Date.now()}],
+                });
+
+                result = rows[0].value;
+            } else {//не нашли в кеше
+
+                //выборка автора по authorId
+                const rows = await db.select({
+                    table: 'author',
+                    map: `(r) => ({author: r.author, bookId: r.bookId})`,
+                    where: `@@id(${db.esc(authorId)})`
+                });
+
+                let author = '';
+                let books = [];
+
+                if (rows.length) {
+                    author = rows[0].author;
+
+                    //выборка книг по bookId
+                    books = await db.select({
+                        table: 'book',
+                        //map: `(r) => ({})`,
+                        where: `@@id(${db.esc(rows[0].bookId)})`,
+                    });
+                }
+
+                result = {author, books};
+
+                //кладем в кеш
+                await db.insert({
+                    table: 'query_cache',
+                    replace: true,
+                    rows: [{id: key, value: result}],
+                });
+                await db.insert({
+                    table: 'query_time',
+                    replace: true,
+                    rows: [{id: key, time: Date.now()}],
                 });
             }
 
-            return {author, books: result};
+            return result;
         } finally {
             this.searchFlag--;
         }
diff --git a/server/core/WebWorker.js b/server/core/WebWorker.js
index 714fb89..46e45c7 100644
--- a/server/core/WebWorker.js
+++ b/server/core/WebWorker.js
@@ -119,7 +119,7 @@ class WebWorker {
 
             if (!await fs.pathExists(dbPath)) {
                 await this.createDb(dbPath);
-                await utils.freeMemory();
+                utils.freeMemory();
             }
 
             //загружаем БД