diff options
author | Asher Gomez <ashersaupingomez@gmail.com> | 2024-09-12 05:06:11 +1000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-09-11 19:06:11 +0000 |
commit | 5e0b2aa47314d1b90e33407866b977f9470fdbbb (patch) | |
tree | 7f37a9f824e198bfd486a1525b5b78a1ef35b289 | |
parent | 1463a4ad5805b1b29f33b695ce19d4c42b671790 (diff) |
chore: remove `prevent_v8_code_cache` from `CliModuleLoaderInner` (#25566)
-rw-r--r-- | cli/cache/code_cache.rs | 13 | ||||
-rw-r--r-- | cli/module_loader.rs | 28 |
2 files changed, 0 insertions, 41 deletions
diff --git a/cli/cache/code_cache.rs b/cli/cache/code_cache.rs index d9e951af6..abcd0d46a 100644 --- a/cli/cache/code_cache.rs +++ b/cli/cache/code_cache.rs @@ -80,10 +80,6 @@ impl CodeCache { data, )); } - - pub fn remove_code_cache(&self, specifier: &str) { - Self::ensure_ok(self.inner.remove_code_cache(specifier)) - } } impl code_cache::CodeCache for CodeCache { @@ -162,15 +158,6 @@ impl CodeCacheInner { self.conn.execute(sql, params)?; Ok(()) } - - pub fn remove_code_cache(&self, specifier: &str) -> Result<(), AnyError> { - let sql = " - DELETE FROM codecache - WHERE specifier=$1;"; - let params = params![specifier]; - self.conn.execute(sql, params)?; - Ok(()) - } } fn serialize_code_cache_type( diff --git a/cli/module_loader.rs b/cli/module_loader.rs index 186eb0210..a35e60090 100644 --- a/cli/module_loader.rs +++ b/cli/module_loader.rs @@ -2,7 +2,6 @@ use std::borrow::Cow; use std::cell::RefCell; -use std::collections::HashSet; use std::path::PathBuf; use std::pin::Pin; use std::rc::Rc; @@ -44,7 +43,6 @@ use deno_core::error::generic_error; use deno_core::error::AnyError; use deno_core::futures::future::FutureExt; use deno_core::futures::Future; -use deno_core::parking_lot::Mutex; use deno_core::resolve_url; use deno_core::ModuleCodeString; use deno_core::ModuleLoader; @@ -244,7 +242,6 @@ impl CliModuleLoaderFactory { emitter: self.shared.emitter.clone(), parsed_source_cache: self.shared.parsed_source_cache.clone(), shared: self.shared.clone(), - prevent_v8_code_cache: Default::default(), }))); ModuleLoaderAndSourceMapGetter { module_loader: loader, @@ -296,10 +293,6 @@ struct CliModuleLoaderInner<TGraphContainer: ModuleGraphContainer> { emitter: Arc<Emitter>, parsed_source_cache: Arc<ParsedSourceCache>, graph_container: TGraphContainer, - // NOTE(bartlomieju): this is temporary, for deprecated import assertions. - // Should be removed in Deno 2. - // Modules stored here should not be V8 code-cached. - prevent_v8_code_cache: Arc<Mutex<HashSet<String>>>, } impl<TGraphContainer: ModuleGraphContainer> @@ -785,14 +778,6 @@ impl<TGraphContainer: ModuleGraphContainer> ModuleLoader code_cache: &[u8], ) -> Pin<Box<dyn Future<Output = ()>>> { if let Some(cache) = self.0.shared.code_cache.as_ref() { - if self - .0 - .prevent_v8_code_cache - .lock() - .contains(specifier.as_str()) - { - return std::future::ready(()).boxed_local(); - } // This log line is also used by tests. log::debug!( "Updating V8 code cache for ES module: {specifier}, [{source_hash:?}]" @@ -807,19 +792,6 @@ impl<TGraphContainer: ModuleGraphContainer> ModuleLoader std::future::ready(()).boxed_local() } - fn purge_and_prevent_code_cache(&self, specifier: &str) { - if let Some(cache) = self.0.shared.code_cache.as_ref() { - // This log line is also used by tests. - log::debug!("Remove V8 code cache for ES module: {specifier}"); - cache.remove_code_cache(specifier); - self - .0 - .prevent_v8_code_cache - .lock() - .insert(specifier.to_string()); - } - } - fn get_source_map(&self, file_name: &str) -> Option<Vec<u8>> { let specifier = resolve_url(file_name).ok()?; match specifier.scheme() { |