Merge pull request #227 from powersync-ja/improve-diagnostics-app

Diagnostics app improvements
powersync-ja · Jul 16, 2024 · c4a31ca · c4a31ca
2 parents 9f35b78 + 1b2b207
commit c4a31ca
Show file tree

Hide file tree

Showing 4 changed files with 121 additions and 62 deletions.
diff --git a/.changeset/happy-gifts-sort.md b/.changeset/happy-gifts-sort.md
@@ -0,0 +1,5 @@
+---
+'diagnostics-app': minor
+---
+
+Faster initial sync and other fixes
diff --git a/tools/diagnostics-app/src/app/views/sync-diagnostics.tsx b/tools/diagnostics-app/src/app/views/sync-diagnostics.tsx
@@ -1,5 +1,5 @@
 import { NavigationPage } from '@/components/navigation/NavigationPage';
-import { clearData, syncErrorTracker } from '@/library/powersync/ConnectionManager';
+import { clearData, db, syncErrorTracker } from '@/library/powersync/ConnectionManager';
 import {
   Box,
   Button,
@@ -15,7 +15,6 @@ import {
   styled
 } from '@mui/material';
 import { DataGrid, GridColDef } from '@mui/x-data-grid';
-import { useQuery } from '@powersync/react';
 import React from 'react';
 
 const BUCKETS_QUERY = `
@@ -24,9 +23,9 @@ WITH
     (SELECT
       bucket,
       row_type,
-      sum(length(data)) as data_size,
+      sum(case when op = 3 and superseded = 0 then length(data) else 0 end) as data_size,
       sum(length(row_type) + length(row_id) + length(bucket) + length(key) + 40) as metadata_size,
-      count() as row_count
+      sum(case when op = 3 and superseded = 0 then 1 else 0 end) as row_count
     FROM ps_oplog GROUP BY bucket, row_type),
 
   oplog_stats AS
@@ -51,23 +50,65 @@ FROM local_bucket_data local
 LEFT JOIN oplog_stats stats ON stats.name = local.id`;
 
 const TABLES_QUERY = `
-SELECT row_type as name, count() as count, sum(length(data)) as size FROM ps_oplog GROUP BY row_type
+SELECT row_type as name, count() as count, sum(length(data)) as size FROM ps_oplog WHERE superseded = 0 and op = 3 GROUP BY row_type
 `;
 
-export default function SyncDiagnosticsPage() {
-  const { data: bucketRows, isLoading: bucketRowsLoading } = useQuery(BUCKETS_QUERY, undefined, {
-    rawTableNames: true,
-    tables: ['ps_oplog', 'ps_data_local__local_bucket_data'],
-    throttleMs: 500
-  });
-  const { data: tableRows, isLoading: tableRowsLoading } = useQuery(TABLES_QUERY, undefined, {
-    rawTableNames: true,
-    tables: ['ps_oplog', 'ps_data_local__local_bucket_data'],
-    throttleMs: 500
-  });
+const BUCKETS_QUERY_FAST = `
+SELECT
+  local.id as name,
+  '[]' as tables,
+  0 as data_size,
+  0 as metadata_size,
+  0 as row_count,
+  local.download_size,
+  local.total_operations,
+  local.downloading
+FROM local_bucket_data local`;
 
+export default function SyncDiagnosticsPage() {
+  const [bucketRows, setBucketRows] = React.useState<null | any[]>(null);
+  const [tableRows, setTableRows] = React.useState<null | any[]>(null);
   const [syncError, setSyncError] = React.useState<Error | null>(syncErrorTracker.lastSyncError);
 
+  const bucketRowsLoading = bucketRows == null;
+  const tableRowsLoading = tableRows == null;
+
+  const refreshStats = async () => {
+    // Similar to db.currentState.hasSynced, but synchronized to the onChange events
+    const hasSynced = await db.getOptional('SELECT 1 FROM ps_buckets WHERE last_applied_op > 0 LIMIT 1');
+    if (hasSynced != null) {
+      // These are potentially expensive queries - do not run during initial sync
+      const bucketRows = await db.getAll(BUCKETS_QUERY);
+      const tableRows = await db.getAll(TABLES_QUERY);
+      setBucketRows(bucketRows);
+      setTableRows(tableRows);
+    } else {
+      // Fast query to show progress during initial sync
+      const bucketRows = await db.getAll(BUCKETS_QUERY_FAST);
+      setBucketRows(bucketRows);
+      setTableRows(null);
+    }
+  };
+
+  React.useEffect(() => {
+    const controller = new AbortController();
+
+    db.onChangeWithCallback(
+      {
+        async onChange(event) {
+          await refreshStats();
+        }
+      },
+      { rawTableNames: true, tables: ['ps_oplog', 'ps_buckets', 'ps_data_local__local_bucket_data'], throttleMs: 500 }
+    );
+
+    refreshStats();
+
+    return () => {
+      controller.abort();
+    };
+  }, []);
+
   React.useEffect(() => {
     const l = syncErrorTracker.registerListener({
       lastErrorUpdated(error) {
@@ -111,7 +152,7 @@ export default function SyncDiagnosticsPage() {
     }
   ];
 
-  const rows = bucketRows.map((r) => {
+  const rows = (bucketRows ?? []).map((r) => {
     return {
       id: r.name,
       name: r.name,
@@ -146,7 +187,7 @@ export default function SyncDiagnosticsPage() {
     }
   ];
 
-  const tablesRows = tableRows.map((r) => {
+  const tablesRows = (tableRows ?? []).map((r) => {
     return {
       id: r.name,
       ...r
@@ -181,50 +222,40 @@ export default function SyncDiagnosticsPage() {
   );
 
   const tablesTable = (
-    <S.QueryResultContainer>
-      <Typography variant="h4" gutterBottom>
-        Tables
-      </Typography>
-      <DataGrid
-        autoHeight={true}
-        rows={tablesRows}
-        columns={tablesColumns}
-        initialState={{
-          pagination: {
-            paginationModel: {
-              pageSize: 10
-            }
+    <DataGrid
+      autoHeight={true}
+      rows={tablesRows}
+      columns={tablesColumns}
+      initialState={{
+        pagination: {
+          paginationModel: {
+            pageSize: 10
           }
-        }}
-        pageSizeOptions={[10, 50, 100]}
-        disableRowSelectionOnClick
-      />
-    </S.QueryResultContainer>
+        }
+      }}
+      pageSizeOptions={[10, 50, 100]}
+      disableRowSelectionOnClick
+    />
   );
 
   const bucketsTable = (
-    <S.QueryResultContainer>
-      <Typography variant="h4" gutterBottom>
-        Buckets
-      </Typography>
-      <DataGrid
-        autoHeight={true}
-        rows={rows}
-        columns={columns}
-        initialState={{
-          pagination: {
-            paginationModel: {
-              pageSize: 50
-            }
-          },
-          sorting: {
-            sortModel: [{ field: 'total_operations', sort: 'desc' }]
+    <DataGrid
+      autoHeight={true}
+      rows={rows}
+      columns={columns}
+      initialState={{
+        pagination: {
+          paginationModel: {
+            pageSize: 50
           }
-        }}
-        pageSizeOptions={[10, 50, 100]}
-        disableRowSelectionOnClick
-      />
-    </S.QueryResultContainer>
+        },
+        sorting: {
+          sortModel: [{ field: 'total_operations', sort: 'desc' }]
+        }
+      }}
+      pageSizeOptions={[10, 50, 100]}
+      disableRowSelectionOnClick
+    />
   );
 
   return (
@@ -239,8 +270,18 @@ export default function SyncDiagnosticsPage() {
           }}>
           Clear & Redownload
         </Button>
-        {tableRowsLoading ? <CircularProgress /> : tablesTable}
-        {bucketRowsLoading ? <CircularProgress /> : bucketsTable}
+        <S.QueryResultContainer>
+          <Typography variant="h4" gutterBottom>
+            Tables
+          </Typography>
+          {tableRowsLoading ? <CircularProgress /> : tablesTable}
+        </S.QueryResultContainer>
+        <S.QueryResultContainer>
+          <Typography variant="h4" gutterBottom>
+            Buckets
+          </Typography>
+          {bucketRowsLoading ? <CircularProgress /> : bucketsTable}
+        </S.QueryResultContainer>
       </S.MainContainer>
     </NavigationPage>
   );

diff --git a/tools/diagnostics-app/src/library/powersync/ConnectionManager.ts b/tools/diagnostics-app/src/library/powersync/ConnectionManager.ts
@@ -2,6 +2,7 @@ import {
   BaseListener,
   BaseObserver,
   PowerSyncDatabase,
+  SyncStreamConnectionMethod,
   WebRemote,
   WebStreamingSyncImplementation,
   WebStreamingSyncImplementationOptions
@@ -11,6 +12,12 @@ import { DynamicSchemaManager } from './DynamicSchemaManager';
 import { RecordingStorageAdapter } from './RecordingStorageAdapter';
 import { TokenConnector } from './TokenConnector';
 
+import { Buffer } from 'buffer';
+
+if (typeof self.Buffer == 'undefined') {
+  self.Buffer = Buffer;
+}
+
 Logger.useDefaults();
 Logger.setLevel(Logger.DEBUG);
 
@@ -22,6 +29,8 @@ export const db = new PowerSyncDatabase({
   },
   schema: schemaManager.buildSchema()
 });
+db.execute('PRAGMA cache_size=-50000');
+
 export const connector = new TokenConnector();
 
 const remote = new WebRemote(connector);
@@ -71,7 +80,7 @@ if (connector.hasCredentials()) {
 }
 
 export async function connect() {
-  await sync.connect();
+  await sync.connect({ connectionMethod: SyncStreamConnectionMethod.WEB_SOCKET });
   if (!sync.syncStatus.connected) {
     // Disconnect but don't wait for it
     sync.disconnect();
@@ -87,7 +96,7 @@ export async function clearData() {
   await schemaManager.clear();
   await schemaManager.refreshSchema(db.database);
   if (connector.hasCredentials()) {
-    await sync.connect();
+    await sync.connect({ connectionMethod: SyncStreamConnectionMethod.WEB_SOCKET });
   }
 }
 

diff --git a/tools/diagnostics-app/src/library/powersync/RecordingStorageAdapter.ts b/tools/diagnostics-app/src/library/powersync/RecordingStorageAdapter.ts
@@ -42,7 +42,11 @@ export class RecordingStorageAdapter extends SqliteBucketStorage {
 
   async syncLocalDatabase(checkpoint: Checkpoint) {
     const r = await super.syncLocalDatabase(checkpoint);
-    await this.schemaManager.refreshSchema(this.rdb);
+    // Refresh schema asynchronously, to allow us to better measure
+    // performance of initial sync.
+    setTimeout(() => {
+      this.schemaManager.refreshSchema(this.rdb);
+    }, 60);
     if (r.checkpointValid) {
       await this.rdb.execute('UPDATE local_bucket_data SET downloading = FALSE');
     }