chore: last minute cleanups

Agoric · Mar 10, 2023 · 45df6b2 · 45df6b2
1 parent 052b00f
commit 45df6b2
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 31 deletions.
diff --git a/packages/SwingSet/src/kernel/state/kernelKeeper.js b/packages/SwingSet/src/kernel/state/kernelKeeper.js
@@ -784,7 +784,7 @@ export default function makeKernelKeeper(kernelStorage, kernelSlog) {
     const promisePrefix = `${vatID}.c.p`;
     const kernelPromisesToReject = [];
 
-    vatKeeper.removeSnapshotAndTranscript();
+    vatKeeper.deleteSnapshotsAndTranscript();
 
     // Note: ASCII order is "+,-./", and we rely upon this to split the
     // keyspace into the various o+NN/o-NN/etc spaces. If we were using a

diff --git a/packages/SwingSet/src/kernel/state/vatKeeper.js b/packages/SwingSet/src/kernel/state/vatKeeper.js
@@ -542,19 +542,17 @@ export function makeVatKeeper(
     return true;
   }
 
-  function deleteSnapshots() {
+  function deleteSnapshotsAndTranscript() {
     if (snapStore) {
       snapStore.deleteVatSnapshots(vatID);
     }
-  }
-
-  function removeSnapshotAndTranscript() {
-    deleteSnapshots();
     transcriptStore.deleteVatTranscripts(vatID);
   }
 
-  function removeSnapshotAndResetTranscript() {
-    deleteSnapshots();
+  function dropSnapshotAndResetTranscript() {
+    if (snapStore) {
+      snapStore.stopUsingLastSnapshot(vatID);
+    }
     transcriptStore.rolloverSpan(vatID);
   }
 
@@ -627,9 +625,8 @@ export function makeVatKeeper(
     vatStats,
     dumpState,
     saveSnapshot,
-    deleteSnapshots,
     getSnapshotInfo,
-    removeSnapshotAndTranscript,
-    removeSnapshotAndResetTranscript,
+    deleteSnapshotsAndTranscript,
+    dropSnapshotAndResetTranscript,
   });
 }
diff --git a/packages/SwingSet/src/kernel/vat-warehouse.js b/packages/SwingSet/src/kernel/vat-warehouse.js
@@ -382,7 +382,7 @@ export function makeVatWarehouse(kernelKeeper, vatLoader, policyOptions) {
   async function resetWorker(vatID) {
     await evict(vatID);
     const vatKeeper = kernelKeeper.provideVatKeeper(vatID);
-    vatKeeper.removeSnapshotAndResetTranscript();
+    vatKeeper.dropSnapshotAndResetTranscript();
   }
 
   /**

diff --git a/packages/swing-store/src/snapStore.js b/packages/swing-store/src/snapStore.js
@@ -33,6 +33,7 @@ import { fsStreamReady } from '@agoric/internal/src/fs-stream.js';
  *   saveSnapshot: (vatID: string, endPos: number, saveRaw: (filePath: string) => Promise<void>) => Promise<SnapshotResult>,
  *   deleteAllUnusedSnapshots: () => void,
  *   deleteVatSnapshots: (vatID: string) => void,
+ *   stopUsingLastSnapshot: (vatID: string) => void,
  *   getSnapshotInfo: (vatID: string) => SnapshotInfo,
  * }} SnapStore
  *
@@ -179,9 +180,22 @@ export function makeSnapStore(
     WHERE inUse = 1 AND vatID = ?
   `);
 
+  function stopUsingLastSnapshot(vatID) {
+    const oldInfo = sqlGetPriorSnapshotInfo.get(vatID);
+    if (oldInfo) {
+      const rec = snapshotRec(vatID, oldInfo.endPos, oldInfo.hash, 0);
+      noteExport(snapshotMetadataKey(rec), JSON.stringify(rec));
+      if (keepSnapshots) {
+        sqlStopUsingLastSnapshot.run(vatID);
+      } else {
+        sqlClearLastSnapshot.run(vatID);
+      }
+    }
+  }
+
   const sqlSaveSnapshot = db.prepare(`
     INSERT OR REPLACE INTO snapshots
-      (vatID, endPos, hash, uncompressedSize, compressedSize, compressedSnapshot, inUse)
+      (vatID, endPos, inUse, hash, uncompressedSize, compressedSize, compressedSnapshot)
     VALUES (?, ?, ?, ?, ?, ?, ?)
   `);
 
@@ -229,25 +243,16 @@ export function makeSnapStore(
             await finished(snapReader);
 
             const h = hashStream.digest('hex');
-            const oldInfo = sqlGetPriorSnapshotInfo.get(vatID);
-            if (oldInfo) {
-              const rec = snapshotRec(vatID, oldInfo.endPos, oldInfo.hash, 0);
-              noteExport(snapshotMetadataKey(rec), JSON.stringify(rec));
-              if (keepSnapshots) {
-                sqlStopUsingLastSnapshot.run(vatID);
-              } else {
-                sqlClearLastSnapshot.run(vatID);
-              }
-            }
+            stopUsingLastSnapshot(vatID);
             compressedSize = compressedSnapshot.length;
             sqlSaveSnapshot.run(
               vatID,
               endPos,
+              1,
               h,
               uncompressedSize,
               compressedSize,
               compressedSnapshot,
-              1,
             );
             const rec = snapshotRec(vatID, endPos, h, 1);
             const exportKey = snapshotMetadataKey(rec);
@@ -318,9 +323,7 @@ export function makeSnapStore(
   const sqlLoadSnapshot = db.prepare(`
     SELECT hash, compressedSnapshot
     FROM snapshots
-    WHERE vatID = ?
-    ORDER BY endPos DESC
-    LIMIT 1
+    WHERE vatID = ? AND inUse = 1
   `);
 
   /**
@@ -337,6 +340,7 @@ export function makeSnapStore(
         const loadInfo = sqlLoadSnapshot.get(vatID);
         loadInfo || Fail`no snapshot available for vat ${q(vatID)}`;
         const { hash, compressedSnapshot } = loadInfo;
+        compressedSnapshot || Fail`no snapshot available for vat ${q(vatID)}`;
         const gzReader = Readable.from(compressedSnapshot);
         cleanup.push(() => gzReader.destroy());
         const snapReader = gzReader.pipe(createGunzip());
@@ -383,6 +387,7 @@ export function makeSnapStore(
     SELECT endPos
     FROM snapshots
     WHERE vatID = ?
+    ORDER BY endPos
   `);
 
   /**
@@ -402,9 +407,7 @@ export function makeSnapStore(
   const sqlGetSnapshotInfo = db.prepare(`
     SELECT endPos, hash, uncompressedSize, compressedSize
     FROM snapshots
-    WHERE vatID = ?
-    ORDER BY endPos DESC
-    LIMIT 1
+    WHERE vatID = ? AND inUse = 1
   `);
 
   /**
@@ -549,11 +552,11 @@ export function makeSnapStore(
     sqlSaveSnapshot.run(
       vatID,
       endPos,
+      info.inUse,
       info.hash,
       size,
       compressedArtifact.length,
       compressedArtifact,
-      info.inUse,
     );
   }
 
@@ -595,6 +598,7 @@ export function makeSnapStore(
     loadSnapshot,
     deleteAllUnusedSnapshots,
     deleteVatSnapshots,
+    stopUsingLastSnapshot,
     getSnapshotInfo,
     getExportRecords,
     getArtifactNames,

diff --git a/packages/swing-store/src/swingStore.js b/packages/swing-store/src/swingStore.js
@@ -817,6 +817,7 @@ function makeSwingStore(dirPath, forceReset, options = {}) {
     saveSnapshot: snapStore.saveSnapshot,
     deleteAllUnusedSnapshots: snapStore.deleteAllUnusedSnapshots,
     deleteVatSnapshots: snapStore.deleteVatSnapshots,
+    stopUsingLastSnapshot: snapStore.stopUsingLastSnapshot,
     getSnapshotInfo: snapStore.getSnapshotInfo,
   };
 

diff --git a/packages/swing-store/src/transcriptStore.js b/packages/swing-store/src/transcriptStore.js
@@ -251,6 +251,7 @@ export function makeTranscriptStore(
     SELECT startPos
     FROM transcriptSpans
     WHERE vatID = ?
+    ORDER BY startPos
   `);
   sqlGetVatSpans.pluck(true);