Работа над проектом

server/config/base.js

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

server/config/index.js

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

server/core/DbCreator.js

@@ -41,37 +41,46 @@ class DbCreator {
         let recsLoaded = 0;
         let id = 0;
         let chunkNum = 0;
+
+        const splitAuthor = (author) => {
+            if (!author) {
+                author = 'Автор не указан';
+            }
+
+            const result = author.split(',');
+            if (result.length > 1)
+                result.push(author);
+
+            return result;
+        }
+
         const parsedCallback = async(chunk) => {
             for (const rec of chunk) {
                 rec.id = ++id;
 
-                if (!rec.del)
+                if (!rec.del) {
                     bookCount++;
-                else 
-                    bookDelCount++;
-
-                if (!rec.author) {
-                    if (!rec.del)
+                    if (!rec.author)
                         noAuthorBookCount++;
-                    rec.author = 'Автор не указан';
+                } else {
+                    bookDelCount++;
                 }
 
                 //авторы
-                const author = rec.author.split(',');
-                if (author.length > 1)
-                    author.push(rec.author);
+                const author = splitAuthor(rec.author);
 
                 for (let i = 0; i < author.length; i++) {
                     const a = author[i];
+                    const value = a.toLowerCase();
 
                     let authorRec;                    
-                    if (authorMap.has(a)) {
-                        const authorTmpId = authorMap.get(a);
+                    if (authorMap.has(value)) {
+                        const authorTmpId = authorMap.get(value);
                         authorRec = authorArr[authorTmpId];
                     } else {
-                        authorRec = {tmpId: authorArr.length, author: a, value: a.toLowerCase(), bookId: []};
+                        authorRec = {tmpId: authorArr.length, author: a, value, bookId: []};
                         authorArr.push(authorRec);
-                        authorMap.set(a, authorRec.tmpId);
+                        authorMap.set(value, authorRec.tmpId);
 
                         if (author.length == 1 || i < author.length - 1) //без соавторов
                             authorCount++;
@@ -112,17 +121,29 @@ class DbCreator {
         utils.freeMemory();
 
         //теперь можно создавать остальные поисковые таблицы
-        const parseBookRec = (rec) => {
-            //авторы
-            if (!rec.author) {
-                if (!rec.del)
-                    noAuthorBookCount++;
-                rec.author = 'Автор не указан';
+        const parseField = (fieldValue, fieldMap, fieldArr, authorIds) => {
+            if (fieldValue) {
+                const value = fieldValue.toLowerCase();
+
+                let fieldRec;
+                if (fieldMap.has(value)) {
+                    const fieldId = fieldMap.get(value);
+                    fieldRec = fieldArr[fieldId];
+                } else {
+                    fieldRec = {id: fieldArr.length, value, authorId: new Set()};
+                    fieldArr.push(fieldRec);
+                    fieldMap.set(value, fieldRec.id);
+                }
+
+                for (const id of authorIds) {
+                    fieldRec.authorId.add(id);
+                }
             }
+        };
 
-            const author = rec.author.split(',');
-            if (author.length > 1)
-                author.push(rec.author);
+        const parseBookRec = (rec) => {
+            //авторы
+            const author = splitAuthor(rec.author);
 
             const authorIds = [];
             for (const a of author) {
@@ -133,42 +154,10 @@ class DbCreator {
             }
 
             //серии
-            if (rec.series) {
-                const series = rec.series;
-
-                let seriesRec;
-                if (seriesMap.has(series)) {
-                    const seriesId = seriesMap.get(series);
-                    seriesRec = seriesArr[seriesId];
-                } else {
-                    seriesRec = {id: seriesArr.length, value: series.toLowerCase(), authorId: new Set()};
-                    seriesArr.push(seriesRec);
-                    seriesMap.set(series, seriesRec.id);
-                }
-
-                for (const id of authorIds) {
-                    seriesRec.authorId.add(id);
-                }
-            }
+            parseField(rec.series, seriesMap, seriesArr, authorIds);
 
             //названия
-            if (rec.title) {
-                const title = rec.title;
-
-                let titleRec;
-                if (titleMap.has(title)) {
-                    const titleId = titleMap.get(title);
-                    titleRec = titleArr[titleId];
-                } else {
-                    titleRec = {id: titleArr.length, value: title.toLowerCase(), authorId: new Set()};
-                    titleArr.push(titleRec);
-                    titleMap.set(title, titleRec.id);
-                }
-
-                for (const id of authorIds) {
-                    titleRec.authorId.add(id);
-                }
-            }
+            parseField(rec.title, titleMap, titleArr, authorIds);
 
             //жанры
             if (rec.genre) {
@@ -192,23 +181,7 @@ class DbCreator {
             }
 
             //языки
-            if (rec.lang) {
-                const lang = rec.lang;
-
-                let langRec;
-                if (langMap.has(lang)) {
-                    const langId = langMap.get(lang);
-                    langRec = langArr[langId];
-                } else {
-                    langRec = {id: langArr.length, value: lang, authorId: new Set()};
-                    langArr.push(langRec);
-                    langMap.set(lang, langRec.id);
-                }
-
-                for (const id of authorIds) {
-                    langRec.authorId.add(id);
-                }
-            }
+            parseField(rec.lang, langMap, langArr, authorIds);
         }
 
         callback({job: 'search tables create', jobMessage: 'Создание поисковых таблиц'});
@@ -287,93 +260,53 @@ class DbCreator {
         //сохраним поисковые таблицы
         const chunkSize = 10000;
 
-        //author
-        callback({job: 'author save', jobMessage: 'Сохранение авторов книг'});
-        await db.create({
-            table: 'author',
-            index: {field: 'value', depth: config.indexDepth},
-        });
+        const saveTable = async(table, arr, nullArr, authorIdToArray = true) => {
+            
+            arr.sort((a, b) => a.value.localeCompare(b.value));
 
-        //вставка в БД по кусочкам, экономим память
-        for (let i = 0; i < authorArr.length; i += chunkSize) {
-            const chunk = authorArr.slice(i, i + chunkSize);
+            await db.create({
+                table,
+                index: {field: 'value', unique: true, depth: 1000000},
+            });
 
-            await db.insert({table: 'author', rows: chunk});
-        }
+            //вставка в БД по кусочкам, экономим память
+            for (let i = 0; i < arr.length; i += chunkSize) {
+                const chunk = arr.slice(i, i + chunkSize);
+                
+                if (authorIdToArray) {
+                    for (const rec of chunk)
+                        rec.authorId = Array.from(rec.authorId);
+                }
 
-        authorArr = null;
-        await db.close({table: 'author'});
-        utils.freeMemory();
+                await db.insert({table, rows: chunk});
 
-        //series
-        callback({job: 'series save', jobMessage: 'Сохранение серий книг'});
-        await db.create({
-            table: 'series',
-            index: {field: 'value', depth: config.indexDepth},
-        });
+                await utils.sleep(100);
+            }
 
-        //вставка в БД по кусочкам, экономим память
-        for (let i = 0; i < seriesArr.length; i += chunkSize) {
-            const chunk = seriesArr.slice(i, i + chunkSize);
-            for (const rec of chunk)
-                rec.authorId = Array.from(rec.authorId);
+            nullArr();
+            await db.close({table});
+            utils.freeMemory();
+        };
 
-            await db.insert({table: 'series', rows: chunk});
-        }
+        //author
+        callback({job: 'author save', jobMessage: 'Сохранение авторов книг'});
+        await saveTable('author', authorArr, () => {authorArr = null}, false);
 
-        seriesArr = null;
-        await db.close({table: 'series'});
-        utils.freeMemory();
+        //series
+        callback({job: 'series save', jobMessage: 'Сохранение серий книг'});
+        await saveTable('series', seriesArr, () => {seriesArr = null});
 
         //title
         callback({job: 'title save', jobMessage: 'Сохранение названий книг'});
-        await db.create({
-            table: 'title',
-            index: {field: 'value', depth: config.indexDepth},
-        });
-
-        //вставка в БД по кусочкам, экономим память
-        let j = 0;
-        for (let i = 0; i < titleArr.length; i += chunkSize) {
-            const chunk = titleArr.slice(i, i + chunkSize);
-            for (const rec of chunk)
-                rec.authorId = Array.from(rec.authorId);
-
-            await db.insert({table: 'title', rows: chunk});
-            if (j++ % 10 == 0)
-                utils.freeMemory();
-            await utils.sleep(100);
-        }
-
-        titleArr = null;
-        await db.close({table: 'title'});
-        utils.freeMemory();
+        await saveTable('title', titleArr, () => {titleArr = null});
 
         //genre
         callback({job: 'genre save', jobMessage: 'Сохранение жанров'});
-        await db.create({
-            table: 'genre',
-            index: {field: 'value', depth: config.indexDepth},
-        });
-
-        await db.insert({table: 'genre', rows: genreArr});
-
-        genreArr = null;
-        await db.close({table: 'genre'});
-        utils.freeMemory();
+        await saveTable('genre', genreArr, () => {genreArr = null});
 
         //lang
         callback({job: 'lang save', jobMessage: 'Сохранение языков'});
-        await db.create({
-            table: 'lang',
-            index: {field: 'value', depth: config.indexDepth},
-        });
-
-        await db.insert({table: 'lang', rows: langArr});
-
-        langArr = null;
-        await db.close({table: 'lang'});
-        utils.freeMemory();
+        await saveTable('lang', langArr, () => {langArr = null});
 
         //кэш-таблицы запросов
         await db.create({table: 'query_cache'});

server/core/DbSearcher.js

@@ -3,8 +3,15 @@
 const utils = require('./utils');
 
 class DbSearcher {
-    constructor(db) {
+    constructor(config, db) {
+        this.config = config;
         this.db = db;
+
+        this.searchFlag = 0;
+        this.timer = null;
+        this.closed = false;
+
+        this.periodicCleanCache();//no await
     }
 
     async selectAuthorIds(query) {
@@ -83,6 +90,7 @@ class DbSearcher {
             const key = JSON.stringify(keyArr);
 
             const rows = await db.select({table: 'query_cache', where: `@@id(${db.esc(key)})`});
+
             if (rows.length) {//нашли в кеше
                 await db.insert({
                     table: 'query_time',
@@ -111,31 +119,88 @@ class DbSearcher {
     }
 
     async search(query) {
-        const db = this.db;
+        if (this.closed)
+            throw new Error('DbSearcher closed');
 
-        const authorIds = await this.getAuthorIds(query);
-
-        const totalFound = authorIds.length;
-        const limit = (query.limit ? query.limit : 1000);
-
-        //выборка найденных авторов
-        let result = await db.select({
-            table: 'author',
-            map: `(r) => ({id: r.id, author: r.author})`,
-            where: `
-                const all = @all();
-                const ids = new Set();
-                let n = 0;
-                for (const id of all) {
-                    if (++n > ${db.esc(limit)})
-                        break;
-                    ids.add(id);
-                }
-                return ids;
-            `
-        });
+        this.searchFlag++;
+
+        try {
+            const db = this.db;
+
+            const authorIds = await this.getAuthorIds(query);
+
+            const totalFound = authorIds.length;
+            const limit = (query.limit ? query.limit : 1000);
+
+            //выборка найденных авторов
+            let result = await db.select({
+                table: 'author',
+                map: `(r) => ({id: r.id, author: r.author})`,
+                where: `
+                    const all = @all();
+                    const ids = new Set();
+                    let n = 0;
+                    for (const id of all) {
+                        if (++n > ${db.esc(limit)})
+                            break;
+                        ids.add(id);
+                    }
+                    return ids;
+                `
+            });
+
+            return {result, totalFound};
+        } finally {
+            this.searchFlag--;
+        }
+    }
+
+    async periodicCleanCache() {
+        this.timer = null;
+        const cleanInterval = 5*1000;//this.config.cacheCleanInterval*60*1000;
+
+        try {
+            const db = this.db;
+
+            const oldThres = Date.now() - cleanInterval;
+
+            //выберем всех кандидатов удаление
+            const rows = await db.select({
+                table: 'query_time',
+                where: `
+                    @@iter(@all(), (r) => (r.time < ${db.esc(oldThres)}));
+                `
+            });
+
+            const ids = [];
+            for (const row of rows)
+                ids.push(row.id);
+
+            //удаляем
+            await db.delete({table: 'query_cache', where: `@@id(${db.esc(ids)})`});
+            await db.delete({table: 'query_time', where: `@@id(${db.esc(ids)})`});
+            
+            console.log('Cache clean', ids);
+        } catch(e) {
+            console.error(e.message);
+        } finally {
+            if (!this.closed) {
+                this.timer = setTimeout(() => { this.periodicCleanCache(); }, cleanInterval);
+            }
+        }
+    }
+
+    async close() {
+        while (this.searchFlag > 0) {
+            await utils.sleep(50);
+        }
+
+        if (this.timer) {
+            clearTimeout(this.timer);
+            this.timer = null;
+        }
 
-        return {result, totalFound};
+        this.closed = true;
     }
 }
 

server/core/WebWorker.js

@@ -87,7 +87,6 @@ class WebWorker {
         });
 
         try {
-            log('  start INPX import');
             const dbCreator = new DbCreator(config);        
 
             await dbCreator.run(db, (state) => {
@@ -101,10 +100,9 @@ class WebWorker {
                     log(`  ${state.job}`);
             });
 
-            log('  finish INPX import');
+            log('Searcher DB successfully created');
         } finally {
             await db.unlock();
-            log('Searcher DB successfully created');
         }
     }
 
@@ -141,11 +139,7 @@ class WebWorker {
             //открываем все таблицы
             await db.openAll();
 
-            //закроем title для экономии памяти, откроем при необходимости
-            await db.close({table: 'title'});
-            this.titleOpen = false;
-
-            this.dbSearcher = new DbSearcher(db);
+            this.dbSearcher = new DbSearcher(config, db);
 
             db.wwCache = {};            
             this.db = db;
@@ -159,6 +153,19 @@ class WebWorker {
         }
     }
 
+    async recreateDb() {
+        this.setMyState(ssDbCreating);
+
+        if (this.dbSearcher) {
+            await this.dbSearcher.close();
+            this.dbSearcher = null;
+        }
+
+        await this.closeDb();
+
+        await this.loadOrCreateDb(true);
+    }
+
     async dbConfig() {
         this.checkMyState();
 

server/index.js

@@ -96,9 +96,6 @@ async function init() {
 
     config.recreateDb = argv.recreate || false;
 
-    //TODO as cli param?
-    config.indexDepth = 1000;
-
     //app
     const appDir = `${config.publicDir}/app`;
     const appNewDir = `${config.publicDir}/app_new`;