Добавлен параметр "queryCacheEnabled" в конфиг

server/config/base.js

@@ -18,6 +18,7 @@ module.exports = {
     loggingEnabled: true,
 
     maxFilesDirSize: 1024*1024*1024,//1Gb
+    queryCacheEnabled: true,
     cacheCleanInterval: 60,//minutes
 
     webConfigParams: ['name', 'version', 'branch'],

server/config/index.js

@@ -6,6 +6,7 @@ const branchFilename = __dirname + '/application_env';
 const propsToSave = [
     'loggingEnabled',
     'maxFilesDirSize',
+    'queryCacheEnabled',
     'cacheCleanInterval',
     'server',    
 ];

server/core/DbSearcher.js

@@ -76,9 +76,7 @@ class DbSearcher {
                     db.searchCache.authorIdsAll.push(row.id);
                 }
             } else {//оптимизация
-                for (const id of db.searchCache.authorIdsAll) {
+                authorIds = new Set(db.searchCache.authorIdsAll);
-                    authorIds.add(id);
-                }
             }
         }
 
@@ -202,8 +200,8 @@ class DbSearcher {
                 result = await this.selectAuthorIds(query);
 
         } else {//непустой запрос
+            if (this.config.queryCacheEnabled) {
                 const key = JSON.stringify(keyArr);
-
                 const rows = await db.select({table: 'query_cache', where: `@@id(${db.esc(key)})`});
 
                 if (rows.length) {//нашли в кеше
@@ -228,6 +226,9 @@ class DbSearcher {
                         rows: [{id: key, time: Date.now()}],
                     });
                 }
+            } else {
+                result = await this.selectAuthorIds(query);
+            }
         }
 
         return result;
@@ -262,31 +263,9 @@ class DbSearcher {
         }
     }
 
-    async getBookList(authorId) {
+    async selectBookList(authorId) {
-        if (this.closed)
-            throw new Error('DbSearcher closed');
-
-        this.searchFlag++;
-
-        try {
         const db = this.db;
 
-            let result;
-
-            const key = `author_books-${authorId}`;
-
-            const rows = await db.select({table: 'query_cache', where: `@@id(${db.esc(key)})`});
-
-            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_book',
@@ -301,7 +280,34 @@ class DbSearcher {
             books = rows[0].books;
         }
 
-                result = {author, books};
+        return {author, books};
+    }
+
+    async getBookList(authorId) {
+        if (this.closed)
+            throw new Error('DbSearcher closed');
+
+        this.searchFlag++;
+
+        try {
+            const db = this.db;
+
+            let result;
+
+            if (this.config.queryCacheEnabled) {
+                const key = `author_books-${authorId}`;
+                const rows = await db.select({table: 'query_cache', where: `@@id(${db.esc(key)})`});
+
+                if (rows.length) {//нашли в кеше
+                    await db.insert({
+                        table: 'query_time',
+                        replace: true,
+                        rows: [{id: key, time: Date.now()}],
+                    });
+
+                    result = rows[0].value;
+                } else {//не нашли в кеше
+                    result = await this.selectBookList(authorId);
 
                     //кладем в кеш
                     await db.insert({
@@ -315,6 +321,9 @@ class DbSearcher {
                         rows: [{id: key, time: Date.now()}],
                     });
                 }
+            } else {
+                result = await this.selectBookList(authorId);
+            }
 
             return result;
         } finally {
@@ -324,7 +333,7 @@ class DbSearcher {
 
     async periodicCleanCache() {
         this.timer = null;
-        const cleanInterval = 5*1000;//this.config.cacheCleanInterval*60*1000;
+        const cleanInterval = this.config.cacheCleanInterval*60*1000;
 
         try {
             const db = this.db;