Jayden/AFFiNE-Mirror
0
0
Fork 0
mirror of https://github.com/toeverything/AFFiNE.git synced 2026-07-25 14:28:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(server): online and storage statistics (#14792)

Browse Source 
#### PR Dependency Tree


* **PR #14792** 👈

This tree was auto-generated by
[Charcoal](https://github.com/danerwilliams/charcoal)

<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit

* **New Features**
* Admin dashboard returns more accurate sync and storage timelines with
carry‑forwarded minute buckets and corrected current totals.

* **Bug Fixes**
* Active-user flushes are debounced/scheduled to prevent overlapping
writes and reduce stale counts.
* Snapshot writes now retry and will skip gracefully when lock
contention prevents completion, avoiding partial snapshots.

* **Tests**
* New e2e tests cover carry‑forward behavior, no backfill outside
requested windows, and storage history accuracy.
<!-- end of auto-generated comment: release notes by coderabbit.ai -->
This commit is contained in:
DarkSky
2026-04-07 02:08:13 +08:00
committed by GitHub
parent 193ec14ad3
commit 5806ad8a3a
4 changed files with 332 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/backend/server/src/models/workspace-analytics.ts
+36 -11
View File
@@ -349,7 +349,7 @@ export class WorkspaceAnalyticsModel extends BaseModel {
(
SELECT active_users
FROM sync_active_users_minutely
WHERE minute_ts <= ${syncTo}
WHERE minute_ts BETWEEN ${syncFrom} AND ${syncTo}
ORDER BY minute_ts DESC
LIMIT 1
),
@@ -362,9 +362,15 @@ export class WorkspaceAnalyticsModel extends BaseModel {
)
SELECT
minutes.minute_ts AS minute,
COALESCE(s.active_users, 0)::integer AS "activeUsers"
COALESCE(sample.active_users, 0)::integer AS "activeUsers"
FROM minutes
LEFT JOIN sync_active_users_minutely s ON s.minute_ts = minutes.minute_ts
LEFT JOIN LATERAL (
SELECT active_users
FROM sync_active_users_minutely
WHERE minute_ts BETWEEN ${syncFrom} AND minutes.minute_ts
ORDER BY minute_ts DESC
LIMIT 1
) sample ON TRUE
ORDER BY minute ASC
`,
this.db.$queryRaw<
@@ -394,15 +400,23 @@ export class WorkspaceAnalyticsModel extends BaseModel {
COALESCE(SUM(snapshot_size), 0) AS workspace_storage_bytes,
COALESCE(SUM(blob_size), 0) AS blob_storage_bytes
FROM workspace_admin_stats_daily
WHERE date BETWEEN ${storageFrom}::date AND ${currentDay}::date
WHERE date <= ${currentDay}::date
GROUP BY date
)
SELECT
days.day AS date,
COALESCE(grouped.workspace_storage_bytes, 0) AS "workspaceStorageBytes",
COALESCE(grouped.blob_storage_bytes, 0) AS "blobStorageBytes"
COALESCE(snapshot.workspace_storage_bytes, 0) AS "workspaceStorageBytes",
COALESCE(snapshot.blob_storage_bytes, 0) AS "blobStorageBytes"
FROM days
LEFT JOIN grouped ON grouped.date = days.day
LEFT JOIN LATERAL (
SELECT
workspace_storage_bytes,
blob_storage_bytes
FROM grouped
WHERE date <= days.day
ORDER BY date DESC
LIMIT 1
) snapshot ON TRUE
ORDER BY date ASC
`,
this.db.$queryRaw<{ conversations: bigint | number }[]>`
@@ -415,11 +429,24 @@ export class WorkspaceAnalyticsModel extends BaseModel {
topSharedLinksPromise,
]);
const currentWorkspaceStorageBytes = Number(
storageCurrent[0]?.workspaceStorageBytes ?? 0
);
const currentBlobStorageBytes = Number(
storageCurrent[0]?.blobStorageBytes ?? 0
);
const storageHistorySeries = storageHistory.map(row => ({
date: row.date,
workspaceStorageBytes: Number(row.workspaceStorageBytes ?? 0),
blobStorageBytes: Number(row.blobStorageBytes ?? 0),
}));
if (storageHistorySeries.length > 0) {
const lastPoint = storageHistorySeries[storageHistorySeries.length - 1];
if (asDateOnlyString(lastPoint.date) === asDateOnlyString(currentDay)) {
lastPoint.workspaceStorageBytes = currentWorkspaceStorageBytes;
lastPoint.blobStorageBytes = currentBlobStorageBytes;
}
}
return {
syncActiveUsers: Number(syncCurrent[0]?.activeUsers ?? 0),
@@ -436,10 +463,8 @@ export class WorkspaceAnalyticsModel extends BaseModel {
effectiveSize: syncHistoryHours,
},
copilotConversations: Number(copilotCount[0]?.conversations ?? 0),
workspaceStorageBytes: Number(
storageCurrent[0]?.workspaceStorageBytes ?? 0
),
blobStorageBytes: Number(storageCurrent[0]?.blobStorageBytes ?? 0),
workspaceStorageBytes: currentWorkspaceStorageBytes,
blobStorageBytes: currentBlobStorageBytes,
workspaceStorageHistory: storageHistorySeries.map(row => ({
date: row.date,
value: row.workspaceStorageBytes,