mirror of
https://github.com/denoland/deno.git
synced 2024-11-30 16:40:57 -05:00
d23579fe6d
This gets SQLite off the flamegraph and reduces initialization time by somewhere between 0.2ms and 0.5ms. In addition, I took the opportunity to move all the cache management code to a single place and reduce duplication. While the PR has a net gain of lines, much of that is just being a bit more deliberate with how we're recovering from errors. The existing caches had various policies for dealing with cache corruption, so I've unified them and tried to isolate the decisions we make for recovery in a single place (see `open_connection` in `CacheDB`). The policy I chose was: 1. Retry twice to open on-disk caches 2. If that fails, try to delete the file and recreate it on-disk 3. If we fail to delete the file or re-create a new cache, use a fallback strategy that can be chosen per-cache: InMemory (temporary cache for the process run), BlackHole (ignore writes, return empty reads), or Error (fail on every operation). The caches all use the same general code now, and share the cache failure recovery policy. In addition, it cleans up a TODO in the `NodeAnalysisCache`.
294 lines
7.5 KiB
Rust
294 lines
7.5 KiB
Rust
// Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
|
|
|
|
use deno_ast::CjsAnalysis;
|
|
use deno_core::error::AnyError;
|
|
use deno_core::serde_json;
|
|
use deno_runtime::deno_webstorage::rusqlite::params;
|
|
|
|
use super::cache_db::CacheDB;
|
|
use super::cache_db::CacheDBConfiguration;
|
|
use super::cache_db::CacheFailure;
|
|
use super::FastInsecureHasher;
|
|
|
|
pub static NODE_ANALYSIS_CACHE_DB: CacheDBConfiguration =
|
|
CacheDBConfiguration {
|
|
table_initializer: concat!(
|
|
"CREATE TABLE IF NOT EXISTS cjsanalysiscache (
|
|
specifier TEXT PRIMARY KEY,
|
|
source_hash TEXT NOT NULL,
|
|
data TEXT NOT NULL
|
|
);",
|
|
"CREATE UNIQUE INDEX IF NOT EXISTS cjsanalysiscacheidx
|
|
ON cjsanalysiscache(specifier);",
|
|
"CREATE TABLE IF NOT EXISTS esmglobalscache (
|
|
specifier TEXT PRIMARY KEY,
|
|
source_hash TEXT NOT NULL,
|
|
data TEXT NOT NULL
|
|
);",
|
|
"CREATE UNIQUE INDEX IF NOT EXISTS esmglobalscacheidx
|
|
ON esmglobalscache(specifier);",
|
|
),
|
|
on_version_change: concat!(
|
|
"DELETE FROM cjsanalysiscache;",
|
|
"DELETE FROM esmglobalscache;",
|
|
),
|
|
preheat_queries: &[],
|
|
on_failure: CacheFailure::InMemory,
|
|
};
|
|
|
|
#[derive(Clone)]
|
|
pub struct NodeAnalysisCache {
|
|
inner: NodeAnalysisCacheInner,
|
|
}
|
|
|
|
impl NodeAnalysisCache {
|
|
#[cfg(test)]
|
|
pub fn new_in_memory() -> Self {
|
|
Self::new(CacheDB::in_memory(
|
|
&NODE_ANALYSIS_CACHE_DB,
|
|
crate::version::deno(),
|
|
))
|
|
}
|
|
|
|
pub fn new(db: CacheDB) -> Self {
|
|
Self {
|
|
inner: NodeAnalysisCacheInner::new(db),
|
|
}
|
|
}
|
|
|
|
pub fn compute_source_hash(text: &str) -> String {
|
|
FastInsecureHasher::new()
|
|
.write_str(text)
|
|
.finish()
|
|
.to_string()
|
|
}
|
|
|
|
fn ensure_ok<T: Default>(res: Result<T, AnyError>) -> T {
|
|
match res {
|
|
Ok(x) => x,
|
|
Err(err) => {
|
|
// TODO(mmastrac): This behavior was inherited from before the refactoring but it probably makes sense to move it into the cache
|
|
// at some point.
|
|
// should never error here, but if it ever does don't fail
|
|
if cfg!(debug_assertions) {
|
|
panic!("Error using esm analysis: {err:#}");
|
|
} else {
|
|
log::debug!("Error using esm analysis: {:#}", err);
|
|
}
|
|
T::default()
|
|
}
|
|
}
|
|
}
|
|
|
|
pub fn get_cjs_analysis(
|
|
&self,
|
|
specifier: &str,
|
|
expected_source_hash: &str,
|
|
) -> Option<CjsAnalysis> {
|
|
Self::ensure_ok(
|
|
self.inner.get_cjs_analysis(specifier, expected_source_hash),
|
|
)
|
|
}
|
|
|
|
pub fn set_cjs_analysis(
|
|
&self,
|
|
specifier: &str,
|
|
source_hash: &str,
|
|
cjs_analysis: &CjsAnalysis,
|
|
) {
|
|
Self::ensure_ok(self.inner.set_cjs_analysis(
|
|
specifier,
|
|
source_hash,
|
|
cjs_analysis,
|
|
));
|
|
}
|
|
|
|
pub fn get_esm_analysis(
|
|
&self,
|
|
specifier: &str,
|
|
expected_source_hash: &str,
|
|
) -> Option<Vec<String>> {
|
|
Self::ensure_ok(
|
|
self.inner.get_esm_analysis(specifier, expected_source_hash),
|
|
)
|
|
}
|
|
|
|
pub fn set_esm_analysis(
|
|
&self,
|
|
specifier: &str,
|
|
source_hash: &str,
|
|
top_level_decls: &Vec<String>,
|
|
) {
|
|
Self::ensure_ok(self.inner.set_esm_analysis(
|
|
specifier,
|
|
source_hash,
|
|
top_level_decls,
|
|
))
|
|
}
|
|
}
|
|
|
|
#[derive(Clone)]
|
|
struct NodeAnalysisCacheInner {
|
|
conn: CacheDB,
|
|
}
|
|
|
|
impl NodeAnalysisCacheInner {
|
|
pub fn new(conn: CacheDB) -> Self {
|
|
Self { conn }
|
|
}
|
|
|
|
pub fn get_cjs_analysis(
|
|
&self,
|
|
specifier: &str,
|
|
expected_source_hash: &str,
|
|
) -> Result<Option<CjsAnalysis>, AnyError> {
|
|
let query = "
|
|
SELECT
|
|
data
|
|
FROM
|
|
cjsanalysiscache
|
|
WHERE
|
|
specifier=?1
|
|
AND source_hash=?2
|
|
LIMIT 1";
|
|
let res = self.conn.query_row(
|
|
query,
|
|
params![specifier, &expected_source_hash],
|
|
|row| {
|
|
let analysis_info: String = row.get(0)?;
|
|
Ok(serde_json::from_str(&analysis_info)?)
|
|
},
|
|
)?;
|
|
Ok(res)
|
|
}
|
|
|
|
pub fn set_cjs_analysis(
|
|
&self,
|
|
specifier: &str,
|
|
source_hash: &str,
|
|
cjs_analysis: &CjsAnalysis,
|
|
) -> Result<(), AnyError> {
|
|
let sql = "
|
|
INSERT OR REPLACE INTO
|
|
cjsanalysiscache (specifier, source_hash, data)
|
|
VALUES
|
|
(?1, ?2, ?3)";
|
|
self.conn.execute(
|
|
sql,
|
|
params![
|
|
specifier,
|
|
&source_hash.to_string(),
|
|
&serde_json::to_string(&cjs_analysis)?,
|
|
],
|
|
)?;
|
|
Ok(())
|
|
}
|
|
|
|
pub fn get_esm_analysis(
|
|
&self,
|
|
specifier: &str,
|
|
expected_source_hash: &str,
|
|
) -> Result<Option<Vec<String>>, AnyError> {
|
|
let query = "
|
|
SELECT
|
|
data
|
|
FROM
|
|
esmglobalscache
|
|
WHERE
|
|
specifier=?1
|
|
AND source_hash=?2
|
|
LIMIT 1";
|
|
let res = self.conn.query_row(
|
|
query,
|
|
params![specifier, &expected_source_hash],
|
|
|row| {
|
|
let top_level_decls: String = row.get(0)?;
|
|
let decls: Vec<String> = serde_json::from_str(&top_level_decls)?;
|
|
Ok(decls)
|
|
},
|
|
)?;
|
|
Ok(res)
|
|
}
|
|
|
|
pub fn set_esm_analysis(
|
|
&self,
|
|
specifier: &str,
|
|
source_hash: &str,
|
|
top_level_decls: &Vec<String>,
|
|
) -> Result<(), AnyError> {
|
|
let sql = "
|
|
INSERT OR REPLACE INTO
|
|
esmglobalscache (specifier, source_hash, data)
|
|
VALUES
|
|
(?1, ?2, ?3)";
|
|
self.conn.execute(
|
|
sql,
|
|
params![
|
|
specifier,
|
|
&source_hash,
|
|
&serde_json::to_string(top_level_decls)?,
|
|
],
|
|
)?;
|
|
Ok(())
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod test {
|
|
use super::*;
|
|
|
|
#[test]
|
|
pub fn node_analysis_cache_general_use() {
|
|
let conn = CacheDB::in_memory(&NODE_ANALYSIS_CACHE_DB, "1.0.0");
|
|
let cache = NodeAnalysisCacheInner::new(conn);
|
|
|
|
assert!(cache.get_cjs_analysis("file.js", "2").unwrap().is_none());
|
|
let cjs_analysis = CjsAnalysis {
|
|
exports: vec!["export1".to_string()],
|
|
reexports: vec!["re-export1".to_string()],
|
|
};
|
|
cache
|
|
.set_cjs_analysis("file.js", "2", &cjs_analysis)
|
|
.unwrap();
|
|
assert!(cache.get_cjs_analysis("file.js", "3").unwrap().is_none()); // different hash
|
|
let actual_cjs_analysis =
|
|
cache.get_cjs_analysis("file.js", "2").unwrap().unwrap();
|
|
assert_eq!(actual_cjs_analysis.exports, cjs_analysis.exports);
|
|
assert_eq!(actual_cjs_analysis.reexports, cjs_analysis.reexports);
|
|
|
|
assert!(cache.get_esm_analysis("file.js", "2").unwrap().is_none());
|
|
let esm_analysis = vec!["esm1".to_string()];
|
|
cache
|
|
.set_esm_analysis("file.js", "2", &esm_analysis)
|
|
.unwrap();
|
|
assert!(cache.get_esm_analysis("file.js", "3").unwrap().is_none()); // different hash
|
|
let actual_esm_analysis =
|
|
cache.get_esm_analysis("file.js", "2").unwrap().unwrap();
|
|
assert_eq!(actual_esm_analysis, esm_analysis);
|
|
|
|
// adding when already exists should not cause issue
|
|
cache
|
|
.set_cjs_analysis("file.js", "2", &cjs_analysis)
|
|
.unwrap();
|
|
cache
|
|
.set_esm_analysis("file.js", "2", &esm_analysis)
|
|
.unwrap();
|
|
|
|
// recreating with same cli version should still have it
|
|
let conn = cache.conn.recreate_with_version("1.0.0");
|
|
let cache = NodeAnalysisCacheInner::new(conn);
|
|
let actual_analysis =
|
|
cache.get_cjs_analysis("file.js", "2").unwrap().unwrap();
|
|
assert_eq!(actual_analysis.exports, cjs_analysis.exports);
|
|
assert_eq!(actual_analysis.reexports, cjs_analysis.reexports);
|
|
let actual_esm_analysis =
|
|
cache.get_esm_analysis("file.js", "2").unwrap().unwrap();
|
|
assert_eq!(actual_esm_analysis, esm_analysis);
|
|
|
|
// now changing the cli version should clear it
|
|
let conn = cache.conn.recreate_with_version("2.0.0");
|
|
let cache = NodeAnalysisCacheInner::new(conn);
|
|
assert!(cache.get_cjs_analysis("file.js", "2").unwrap().is_none());
|
|
assert!(cache.get_esm_analysis("file.js", "2").unwrap().is_none());
|
|
}
|
|
}
|