mirror of
https://github.com/benjamin-wilson/public-pool.git
synced 2026-09-29 09:05:06 -07:00
Reduce dashboard Timescale query load
This commit is contained in:
@@ -3,7 +3,6 @@ import { InjectRepository } from '@nestjs/typeorm';
|
||||
import { Repository } from 'typeorm';
|
||||
|
||||
import { ClientEntity } from '../../client/client.entity';
|
||||
import { ShareAccountingService } from '../../share-accounting/share-accounting.service';
|
||||
import { UserAgentReportView } from './user-agent-report.view';
|
||||
import { RedisMessagingService } from '../../../services/redis-messaging.service';
|
||||
|
||||
@@ -16,16 +15,12 @@ export class UserAgentReportService {
|
||||
@InjectRepository(ClientEntity)
|
||||
private clientRepository: Repository<ClientEntity>,
|
||||
private redisMessagingService: RedisMessagingService,
|
||||
private shareAccountingService: ShareAccountingService,
|
||||
) {
|
||||
|
||||
}
|
||||
|
||||
public async getReport() {
|
||||
const presences = await this.redisMessagingService.getAllClientPresence();
|
||||
const shareSummaries = await this.shareAccountingService.getSessionSummaries(
|
||||
presences.map(presence => presence.clientId),
|
||||
);
|
||||
const rows = new Map<string, {
|
||||
userAgent: string;
|
||||
count: number;
|
||||
@@ -43,14 +38,12 @@ export class UserAgentReportService {
|
||||
bestDifficulty: 0,
|
||||
totalHashRate: 0,
|
||||
};
|
||||
const shareSummary = shareSummaries.get(presence.clientId);
|
||||
row.count++;
|
||||
row.bestDifficulty = Math.max(
|
||||
row.bestDifficulty,
|
||||
Number(presence.bestDifficulty ?? 0),
|
||||
Number(shareSummary?.bestSubmissionDifficulty ?? 0),
|
||||
);
|
||||
row.totalHashRate += Number(shareSummary?.hashRateLast10Minutes ?? presence.hashRate ?? 0);
|
||||
row.totalHashRate += Number(presence.hashRate ?? 0);
|
||||
rows.set(userAgent, row);
|
||||
});
|
||||
|
||||
|
||||
@@ -6,7 +6,6 @@ const HASHES_PER_DIFFICULTY = 4294967296;
|
||||
const CHART_BUCKET_SECONDS = 600;
|
||||
const CHART_WINDOW = '24 hours';
|
||||
const SITE_CHART_WINDOW = '7 days';
|
||||
const REALTIME_WINDOW = '20 minutes';
|
||||
|
||||
@Injectable()
|
||||
export class ClientStatisticsService {
|
||||
@@ -67,7 +66,7 @@ export class ClientStatisticsService {
|
||||
WITH bounds AS (
|
||||
SELECT
|
||||
NOW() - INTERVAL '${windowSql}' AS since,
|
||||
time_bucket(INTERVAL '10 minutes', NOW() - INTERVAL '${REALTIME_WINDOW}') AS realtime_start
|
||||
time_bucket(INTERVAL '10 minutes', NOW()) AS realtime_start
|
||||
),
|
||||
aggregate_rows AS (
|
||||
SELECT
|
||||
|
||||
@@ -187,7 +187,6 @@ describe('TimescaleDB and Redis integration', () => {
|
||||
dataSource.getRepository(UserAgentReportView),
|
||||
repository,
|
||||
redisMessagingService,
|
||||
new ShareAccountingService(dataSource.getRepository(AcceptedShareEntity)),
|
||||
);
|
||||
|
||||
const activeClient = await repository.save({
|
||||
|
||||
Reference in New Issue
Block a user