1 files changed, 2 insertions, 104 deletions

diff --git a/cli/cache/node.rs b/cli/cache/node.rs
index 825bdfef4..1637cbc78 100644
--- a/cli/cache/node.rs
+++ b/cli/cache/node.rs
@@ -12,26 +12,12 @@ use super::FastInsecureHasher;
 
 pub static NODE_ANALYSIS_CACHE_DB: CacheDBConfiguration =
   CacheDBConfiguration {
-    table_initializer: concat!(
-      "CREATE TABLE IF NOT EXISTS cjsanalysiscache (
+    table_initializer: "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;",
-    ),
+    on_version_change: "DELETE FROM cjsanalysiscache;",
     preheat_queries: &[],
     on_failure: CacheFailure::InMemory,
   };
@@ -91,29 +77,6 @@ impl NodeAnalysisCache {
       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)]
@@ -172,54 +135,6 @@ impl NodeAnalysisCacheInner {
     )?;
     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)]
@@ -245,23 +160,10 @@ mod test {
     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");
@@ -270,14 +172,10 @@ mod test {
       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());
   }
 }