From 8ea58d0fdcea8599b1c0ccf6edb88707cfef4f3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Moreau?= <cem.moreau@gmail.com>
Date: Sun, 10 Jun 2018 18:06:51 +0200
Subject: [PATCH] [enh] remaining non-monitored loki/sqlite accesses
---
app/lib/dal/indexDAL/loki/LokiBIndex.ts | 6 ++----
app/lib/dal/sqliteDAL/AbstractSQLite.ts | 12 ++----------
2 files changed, 4 insertions(+), 14 deletions(-)
diff --git a/app/lib/dal/indexDAL/loki/LokiBIndex.ts b/app/lib/dal/indexDAL/loki/LokiBIndex.ts
index 912cf11bc..255743c2d 100644
--- a/app/lib/dal/indexDAL/loki/LokiBIndex.ts
+++ b/app/lib/dal/indexDAL/loki/LokiBIndex.ts
@@ -84,11 +84,9 @@ export class LokiBIndex extends LokiIndex<DBHead> implements BIndexDAO {
.remove()
}
+ @MonitorLokiExecutionTime(true)
async getWrittenOn(blockstamp: string): Promise<DBHead[]> {
- const now = getMicrosecondsTime()
const criterion:any = { number: parseInt(blockstamp) }
- const res = this.collection.find(criterion)
- logger.trace('[loki][%s][getWrittenOn] %sµs', this.collectionName, getDurationInMicroSeconds(now), blockstamp)
- return res
+ return this.collection.find(criterion)
}
}
diff --git a/app/lib/dal/sqliteDAL/AbstractSQLite.ts b/app/lib/dal/sqliteDAL/AbstractSQLite.ts
index 4a2d0ec59..264952042 100644
--- a/app/lib/dal/sqliteDAL/AbstractSQLite.ts
+++ b/app/lib/dal/sqliteDAL/AbstractSQLite.ts
@@ -13,7 +13,6 @@
import {SQLiteDriver} from "../drivers/SQLiteDriver"
import {Initiable} from "./Initiable"
-import {getDurationInMicroSeconds, getMicrosecondsTime} from "../../../ProcessCpuProfiler"
import {Underscore} from "../../common-libs/underscore"
import {NewLogger} from "../../logger"
import {MonitorSQLExecutionTime} from "../../debug/MonitorSQLExecutionTime"
@@ -130,16 +129,9 @@ export abstract class AbstractSQLite<T> extends Initiable {
await this.query('DELETE FROM ' + this.table + ' WHERE ' + conditions, condValues)
}
+ @MonitorSQLExecutionTime()
async exec(sql:string) {
- try {
- const start = getMicrosecondsTime()
- await this.driver.executeSql(sql);
- const duration = getDurationInMicroSeconds(start)
- logger.trace('[sqlite][exec] %s %sµs', sql.substring(0, 50) + '...', duration)
- } catch (e) {
- //console.error('ERROR >> %s', sql);
- throw e;
- }
+ await this.driver.executeSql(sql)
}
getInsertQuery(): string {
--
GitLab