Changes to enable download of snapshot in validator.

cloudflare · Oct 4, 2024 · f0cb6fd · f0cb6fd
1 parent 2178684
commit f0cb6fd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 15 deletions.
diff --git a/src/workerd/api/pyodide/pyodide.c++ b/src/workerd/api/pyodide/pyodide.c++
@@ -300,13 +300,7 @@ kj::Array<kj::String> ArtifactBundler::parsePythonScriptImports(kj::Array<kj::St
  }
  }
 
- // XXX: jsg doesn't support kj::Vector return types, so this seems to be the only way to do this.
- auto builder = kj::heapArrayBuilder<kj::String>(result.size());
- for (auto i = 0; i < result.size(); i++) {
- builder.add(kj::mv(result[i]));
- }
-
- return builder.finish();
+ return result.releaseAsArray();
 }
 
 jsg::Ref<PyodideMetadataReader> makePyodideMetadataReader(

diff --git a/src/workerd/api/pyodide/pyodide.h b/src/workerd/api/pyodide/pyodide.h
@@ -224,16 +224,11 @@ class ArtifactBundler: public jsg::Object {
  kj::Maybe<MemorySnapshotResult> storedSnapshot;
 
  ArtifactBundler(kj::Maybe<const PyodidePackageManager&> packageManager,
- kj::Maybe<kj::Array<kj::byte>> existingSnapshot)
+ kj::Maybe<kj::Array<const kj::byte>> existingSnapshot,
+ bool isValidating = false)
  : packageManager(packageManager),
  storedSnapshot(kj::none),
  existingSnapshot(kj::mv(existingSnapshot)),
- isValidating(false) {};
-
- ArtifactBundler(bool isValidating = false)
- : packageManager(kj::none),
- storedSnapshot(kj::none),
- existingSnapshot(kj::none),
  isValidating(isValidating) {};
 
  void storeMemorySnapshot(jsg::Lock& js, MemorySnapshotResult snapshot) {
@@ -322,7 +317,7 @@ class ArtifactBundler: public jsg::Object {
 private:
  // A memory snapshot of the state of the Python interpreter after initialisation. Used to speed
  // up cold starts.
- kj::Maybe<kj::Array<kj::byte>> existingSnapshot;
+ kj::Maybe<kj::Array<const kj::byte>> existingSnapshot;
  bool isValidating;
 };